diff options
| author | brooks <brooks@FreeBSD.org> | 2014-12-02 20:28:05 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2014-12-02 20:28:05 +0000 |
| commit | f27f3e0e8e2e4c4b6c33c5f806d6df8df9264594 (patch) | |
| tree | 9eabace9b2daf463c77bfd9ec839eb478bfe1b28 /sys/boot | |
| parent | 67bd86774ae5963e905348ea5eb7d2cee3adb02f (diff) | |
| download | FreeBSD-src-f27f3e0e8e2e4c4b6c33c5f806d6df8df9264594.zip FreeBSD-src-f27f3e0e8e2e4c4b6c33c5f806d6df8df9264594.tar.gz | |
MFC r274818:
Merge from CheriBSD (3422ebe71b6c06fe78b1be73623b240c219e08e3):
Rename beripic to beripic0.
Sponsored by: DARPA, AFRL
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/fdt/dts/mips/beri-sim.dts | 4 | ||||
| -rw-r--r-- | sys/boot/fdt/dts/mips/beripad-de4.dts | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/boot/fdt/dts/mips/beri-sim.dts b/sys/boot/fdt/dts/mips/beri-sim.dts index e4f193e..0704db86 100644 --- a/sys/boot/fdt/dts/mips/beri-sim.dts +++ b/sys/boot/fdt/dts/mips/beri-sim.dts @@ -97,7 +97,7 @@ reg = <0x0 0x4000000>; // 64M at 0x0 }; - beripic: beripic@7f804000 { + beripic0: beripic@7f804000 { compatible = "sri-cambridge,beri-pic"; interrupt-controller; #address-cells = <0>; @@ -115,7 +115,7 @@ compatible = "altera,jtag_uart-11_0"; reg = <0x7f000000 0x40>; interrupts = <0>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; serial@7f001000 { diff --git a/sys/boot/fdt/dts/mips/beripad-de4.dts b/sys/boot/fdt/dts/mips/beripad-de4.dts index 4a13622..51bbd77 100644 --- a/sys/boot/fdt/dts/mips/beripad-de4.dts +++ b/sys/boot/fdt/dts/mips/beripad-de4.dts @@ -97,7 +97,7 @@ reg = <0x0 0x40000000>; // 1G at 0x0 }; - beripic: beripic@7f804000 { + beripic0: beripic@7f804000 { compatible = "sri-cambridge,beri-pic"; interrupt-controller; #address-cells = <0>; @@ -117,14 +117,14 @@ reg-shift = <2>; clock-frequency = <50000000>; interrupts = <6>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; serial@7f000000 { compatible = "altera,jtag_uart-11_0"; reg = <0x7f000000 0x40>; interrupts = <0>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; serial@7f001000 { @@ -198,7 +198,7 @@ 0x7f007420 0x20>; // RX, TX interrupts = <1 2>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; ethernet@7f005000 { @@ -211,7 +211,7 @@ 0x7f005420 0x20>; // RX, TX interrupts = <11 12>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; touchscreen@70400000 { @@ -227,7 +227,7 @@ 0x7f140000 0x4>; // IRQ 4 is DC, IRQ 5 is HC. interrupts = <4 5>; - interrupt-parent = <&beripic>; + interrupt-parent = <&beripic0>; }; avgen@0x7f009000 { |
