diff options
author | Stephen Warren <swarren@wwwdotorg.org> | 2014-02-11 23:48:47 -0500 |
---|---|---|
committer | Stephen Warren <swarren@wwwdotorg.org> | 2014-02-20 23:25:39 -0500 |
commit | 25b2f1bd0b7e060b1671c28be40b63cc9fed2b4e (patch) | |
tree | f30340c1c4a9ffe7d6a07b89418d8f9f00a9b5d3 | |
parent | ef3c690cde1e9e42baa20bb5ce9196c371593f60 (diff) |
ARM: bcm2835: node name unit address cleanup
DT nodes that contain a reg property should include a unit address in
their name. Add the missing unit addresses.
The unit address in a node name must match the value in the reg property.
Fix the cases where they don't match.
Don't fix the /clocks/* node names yet; that causes problems the clock
driver to attempt to register multiple clocks with the same name, which
fails.
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
-rw-r--r-- | arch/arm/boot/dts/bcm2835.dtsi | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index 5ceba45b884a..a2d48893230c 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi | |||
@@ -15,7 +15,7 @@ | |||
15 | #size-cells = <1>; | 15 | #size-cells = <1>; |
16 | ranges = <0x7e000000 0x20000000 0x02000000>; | 16 | ranges = <0x7e000000 0x20000000 0x02000000>; |
17 | 17 | ||
18 | timer { | 18 | timer@7e003000 { |
19 | compatible = "brcm,bcm2835-system-timer"; | 19 | compatible = "brcm,bcm2835-system-timer"; |
20 | reg = <0x7e003000 0x1000>; | 20 | reg = <0x7e003000 0x1000>; |
21 | interrupts = <1 0>, <1 1>, <1 2>, <1 3>; | 21 | interrupts = <1 0>, <1 1>, <1 2>, <1 3>; |
@@ -43,24 +43,24 @@ | |||
43 | brcm,dma-channel-mask = <0x7f35>; | 43 | brcm,dma-channel-mask = <0x7f35>; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | intc: interrupt-controller { | 46 | intc: interrupt-controller@7e00b200 { |
47 | compatible = "brcm,bcm2835-armctrl-ic"; | 47 | compatible = "brcm,bcm2835-armctrl-ic"; |
48 | reg = <0x7e00b200 0x200>; | 48 | reg = <0x7e00b200 0x200>; |
49 | interrupt-controller; | 49 | interrupt-controller; |
50 | #interrupt-cells = <2>; | 50 | #interrupt-cells = <2>; |
51 | }; | 51 | }; |
52 | 52 | ||
53 | watchdog { | 53 | watchdog@7e100000 { |
54 | compatible = "brcm,bcm2835-pm-wdt"; | 54 | compatible = "brcm,bcm2835-pm-wdt"; |
55 | reg = <0x7e100000 0x28>; | 55 | reg = <0x7e100000 0x28>; |
56 | }; | 56 | }; |
57 | 57 | ||
58 | rng { | 58 | rng@7e104000 { |
59 | compatible = "brcm,bcm2835-rng"; | 59 | compatible = "brcm,bcm2835-rng"; |
60 | reg = <0x7e104000 0x10>; | 60 | reg = <0x7e104000 0x10>; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | gpio: gpio { | 63 | gpio: gpio@7e200000 { |
64 | compatible = "brcm,bcm2835-gpio"; | 64 | compatible = "brcm,bcm2835-gpio"; |
65 | reg = <0x7e200000 0xb4>; | 65 | reg = <0x7e200000 0xb4>; |
66 | /* | 66 | /* |
@@ -83,7 +83,7 @@ | |||
83 | #interrupt-cells = <2>; | 83 | #interrupt-cells = <2>; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | uart@20201000 { | 86 | uart@7e201000 { |
87 | compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; | 87 | compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; |
88 | reg = <0x7e201000 0x1000>; | 88 | reg = <0x7e201000 0x1000>; |
89 | interrupts = <2 25>; | 89 | interrupts = <2 25>; |
@@ -101,7 +101,7 @@ | |||
101 | dma-names = "tx", "rx"; | 101 | dma-names = "tx", "rx"; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | spi: spi@20204000 { | 104 | spi: spi@7e204000 { |
105 | compatible = "brcm,bcm2835-spi"; | 105 | compatible = "brcm,bcm2835-spi"; |
106 | reg = <0x7e204000 0x1000>; | 106 | reg = <0x7e204000 0x1000>; |
107 | interrupts = <2 22>; | 107 | interrupts = <2 22>; |
@@ -121,7 +121,7 @@ | |||
121 | status = "disabled"; | 121 | status = "disabled"; |
122 | }; | 122 | }; |
123 | 123 | ||
124 | sdhci: sdhci { | 124 | sdhci: sdhci@7e300000 { |
125 | compatible = "brcm,bcm2835-sdhci"; | 125 | compatible = "brcm,bcm2835-sdhci"; |
126 | reg = <0x7e300000 0x100>; | 126 | reg = <0x7e300000 0x100>; |
127 | interrupts = <2 30>; | 127 | interrupts = <2 30>; |
@@ -129,7 +129,7 @@ | |||
129 | status = "disabled"; | 129 | status = "disabled"; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | i2c1: i2c@20804000 { | 132 | i2c1: i2c@7e804000 { |
133 | compatible = "brcm,bcm2835-i2c"; | 133 | compatible = "brcm,bcm2835-i2c"; |
134 | reg = <0x7e804000 0x1000>; | 134 | reg = <0x7e804000 0x1000>; |
135 | interrupts = <2 21>; | 135 | interrupts = <2 21>; |
@@ -139,7 +139,7 @@ | |||
139 | status = "disabled"; | 139 | status = "disabled"; |
140 | }; | 140 | }; |
141 | 141 | ||
142 | usb { | 142 | usb@7e980000 { |
143 | compatible = "brcm,bcm2835-usb"; | 143 | compatible = "brcm,bcm2835-usb"; |
144 | reg = <0x7e980000 0x10000>; | 144 | reg = <0x7e980000 0x10000>; |
145 | interrupts = <1 9>; | 145 | interrupts = <1 9>; |