1 From 0bdd14471d586c546f3bfcbf062fbdbe92500aff Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Mon, 22 Jun 2015 14:21:55 +0100
4 Subject: [PATCH 089/171] BCM270X_DT: Sort nodes by bus address, and
8 arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 19 ----------
9 arch/arm/boot/dts/bcm2708-rpi-b.dts | 19 ----------
10 arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 21 -----------
11 arch/arm/boot/dts/bcm2708_common.dtsi | 63 +++++++++++++++++++++++---------
12 arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 19 ----------
13 5 files changed, 46 insertions(+), 95 deletions(-)
15 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
16 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
19 compatible = "brcm,bcm2708";
20 model = "Raspberry Pi Model B+";
43 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
44 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
47 compatible = "brcm,bcm2708";
48 model = "Raspberry Pi Model B";
71 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
72 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
74 /include/ "bcm2708.dtsi"
100 --- a/arch/arm/boot/dts/bcm2708_common.dtsi
101 +++ b/arch/arm/boot/dts/bcm2708_common.dtsi
104 interrupt-parent = <&intc>;
112 + watchdog = &watchdog;
114 + mailbox = &mailbox;
127 + thermal = &thermal;
133 compatible = "brcm,bcm2835-audio";
138 + /* External sound card */
143 compatible = "simple-bus";
144 #address-cells = <1>;
146 #interrupt-cells = <2>;
149 + mailbox: mailbox@7e00b800 {
150 + compatible = "brcm,bcm2708-vcio";
151 + reg = <0x7e00b880 0x40>;
152 + interrupts = <0 1>;
155 watchdog: watchdog@7e100000 {
156 compatible = "brcm,bcm2835-pm-wdt";
157 reg = <0x7e100000 0x28>;
162 - mailbox: mailbox@7e00b800 {
163 - compatible = "brcm,bcm2708-vcio";
164 - reg = <0x7e00b880 0x40>;
165 - interrupts = <0 1>;
169 compatible = "brcm,bcm2835-gpio";
170 reg = <0x7e200000 0xb4>;
172 #interrupt-cells = <2>;
175 - mmc: mmc@7e300000 {
176 - compatible = "brcm,bcm2835-mmc";
177 - reg = <0x7e300000 0x100>;
178 - interrupts = <2 30>;
179 - clocks = <&clk_mmc>;
182 - dma-names = "tx", "rx";
183 - status = "disabled";
186 uart0: uart@7e201000 {
187 compatible = "arm,pl011", "arm,primecell";
188 reg = <0x7e201000 0x1000>;
193 + mmc: mmc@7e300000 {
194 + compatible = "brcm,bcm2835-mmc";
195 + reg = <0x7e300000 0x100>;
196 + interrupts = <2 30>;
197 + clocks = <&clk_mmc>;
200 + dma-names = "tx", "rx";
201 + status = "disabled";
205 compatible = "brcm,bcm2708-i2c";
206 reg = <0x7e804000 0x1000>;
207 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
208 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
211 compatible = "brcm,bcm2709";
212 model = "Raspberry Pi 2 Model B";