Date: Tue, 2 Dec 2014 20:28:06 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r275426 - stable/10/sys/boot/fdt/dts/mips Message-ID: <201412022028.sB2KS6Sf024692@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Dec 2 20:28:05 2014 New Revision: 275426 URL: https://svnweb.freebsd.org/changeset/base/275426 Log: MFC r274818: Merge from CheriBSD (3422ebe71b6c06fe78b1be73623b240c219e08e3): Rename beripic to beripic0. Sponsored by: DARPA, AFRL Modified: stable/10/sys/boot/fdt/dts/mips/beri-sim.dts stable/10/sys/boot/fdt/dts/mips/beripad-de4.dts Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/boot/fdt/dts/mips/beri-sim.dts ============================================================================== --- stable/10/sys/boot/fdt/dts/mips/beri-sim.dts Tue Dec 2 20:23:10 2014 (r275425) +++ stable/10/sys/boot/fdt/dts/mips/beri-sim.dts Tue Dec 2 20:28:05 2014 (r275426) @@ -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 { Modified: stable/10/sys/boot/fdt/dts/mips/beripad-de4.dts ============================================================================== --- stable/10/sys/boot/fdt/dts/mips/beripad-de4.dts Tue Dec 2 20:23:10 2014 (r275425) +++ stable/10/sys/boot/fdt/dts/mips/beripad-de4.dts Tue Dec 2 20:28:05 2014 (r275426) @@ -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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412022028.sB2KS6Sf024692>