diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:54:05 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:54:05 -0400 |
commit | 3c76a8a95daeecd881718f88324041f6a5faab86 (patch) | |
tree | 89c3d5573e9dbe3a91d533c873562c57ba4b4f2f /arch/arm/boot/dts | |
parent | 513a7917b13370d9fbc41331413428dd713cb3fc (diff) | |
parent | 600468d0686096ddc1000c8a2e69475931084414 (diff) |
Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt
pulling in mvebu branches which changes armada*.dts? files for LPAE changes
mvebu fixes for v3.9 round 3
- Kirkwood
- a couple of small fixes for the Iomega ix2-200 board (ether and led)
- mvebu
- allow GPIO button to work on Mirabox when running SMP
Diffstat (limited to 'arch/arm/boot/dts')
25 files changed, 43 insertions, 36 deletions
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index 70effc617123..58ee79372206 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts | |||
@@ -91,7 +91,7 @@ | |||
91 | }; | 91 | }; |
92 | 92 | ||
93 | mvsdio@d00d4000 { | 93 | mvsdio@d00d4000 { |
94 | pinctrl-0 = <&sdio_pins2>; | 94 | pinctrl-0 = <&sdio_pins3>; |
95 | pinctrl-names = "default"; | 95 | pinctrl-names = "default"; |
96 | status = "okay"; | 96 | status = "okay"; |
97 | /* | 97 | /* |
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts index 0656c815616e..516dec31b469 100644 --- a/arch/arm/boot/dts/armada-370-rd.dts +++ b/arch/arm/boot/dts/armada-370-rd.dts | |||
@@ -64,6 +64,14 @@ | |||
64 | status = "okay"; | 64 | status = "okay"; |
65 | /* No CD or WP GPIOs */ | 65 | /* No CD or WP GPIOs */ |
66 | }; | 66 | }; |
67 | |||
68 | usb@d0050000 { | ||
69 | status = "okay"; | ||
70 | }; | ||
71 | |||
72 | usb@d0051000 { | ||
73 | status = "okay"; | ||
74 | }; | ||
67 | }; | 75 | }; |
68 | 76 | ||
69 | gpio-keys { | 77 | gpio-keys { |
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 81eb33361964..758c4ea90344 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi | |||
@@ -31,7 +31,6 @@ | |||
31 | mpic: interrupt-controller@d0020000 { | 31 | mpic: interrupt-controller@d0020000 { |
32 | compatible = "marvell,mpic"; | 32 | compatible = "marvell,mpic"; |
33 | #interrupt-cells = <1>; | 33 | #interrupt-cells = <1>; |
34 | #address-cells = <1>; | ||
35 | #size-cells = <1>; | 34 | #size-cells = <1>; |
36 | interrupt-controller; | 35 | interrupt-controller; |
37 | }; | 36 | }; |
@@ -54,7 +53,7 @@ | |||
54 | reg = <0xd0012000 0x100>; | 53 | reg = <0xd0012000 0x100>; |
55 | reg-shift = <2>; | 54 | reg-shift = <2>; |
56 | interrupts = <41>; | 55 | interrupts = <41>; |
57 | reg-io-width = <4>; | 56 | reg-io-width = <1>; |
58 | status = "disabled"; | 57 | status = "disabled"; |
59 | }; | 58 | }; |
60 | serial@d0012100 { | 59 | serial@d0012100 { |
@@ -62,7 +61,7 @@ | |||
62 | reg = <0xd0012100 0x100>; | 61 | reg = <0xd0012100 0x100>; |
63 | reg-shift = <2>; | 62 | reg-shift = <2>; |
64 | interrupts = <42>; | 63 | interrupts = <42>; |
65 | reg-io-width = <4>; | 64 | reg-io-width = <1>; |
66 | status = "disabled"; | 65 | status = "disabled"; |
67 | }; | 66 | }; |
68 | 67 | ||
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 9cf60b2ce864..18f6eb47cc50 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
@@ -59,6 +59,12 @@ | |||
59 | "mpp50", "mpp51", "mpp52"; | 59 | "mpp50", "mpp51", "mpp52"; |
60 | marvell,function = "sd0"; | 60 | marvell,function = "sd0"; |
61 | }; | 61 | }; |
62 | |||
63 | sdio_pins3: sdio-pins3 { | ||
64 | marvell,pins = "mpp48", "mpp49", "mpp50", | ||
65 | "mpp51", "mpp52", "mpp53"; | ||
66 | marvell,function = "sd0"; | ||
67 | }; | ||
62 | }; | 68 | }; |
63 | 69 | ||
64 | gpio0: gpio@d0018100 { | 70 | gpio0: gpio@d0018100 { |
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index d85fa6aa69fd..29dfeb6d4a26 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -46,7 +46,7 @@ | |||
46 | reg = <0xd0012200 0x100>; | 46 | reg = <0xd0012200 0x100>; |
47 | reg-shift = <2>; | 47 | reg-shift = <2>; |
48 | interrupts = <43>; | 48 | interrupts = <43>; |
49 | reg-io-width = <4>; | 49 | reg-io-width = <1>; |
50 | status = "disabled"; | 50 | status = "disabled"; |
51 | }; | 51 | }; |
52 | serial@d0012300 { | 52 | serial@d0012300 { |
@@ -54,7 +54,7 @@ | |||
54 | reg = <0xd0012300 0x100>; | 54 | reg = <0xd0012300 0x100>; |
55 | reg-shift = <2>; | 55 | reg-shift = <2>; |
56 | interrupts = <44>; | 56 | interrupts = <44>; |
57 | reg-io-width = <4>; | 57 | reg-io-width = <1>; |
58 | status = "disabled"; | 58 | status = "disabled"; |
59 | }; | 59 | }; |
60 | 60 | ||
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 0056214935f4..6cab46849cdb 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi | |||
@@ -202,6 +202,11 @@ | |||
202 | status = "disabled"; | 202 | status = "disabled"; |
203 | }; | 203 | }; |
204 | 204 | ||
205 | rtc@d8500 { | ||
206 | compatible = "marvell,orion-rtc"; | ||
207 | reg = <0xd8500 0x20>; | ||
208 | }; | ||
209 | |||
205 | crypto: crypto@30000 { | 210 | crypto: crypto@30000 { |
206 | compatible = "marvell,orion-crypto"; | 211 | compatible = "marvell,orion-crypto"; |
207 | reg = <0x30000 0x10000>, | 212 | reg = <0x30000 0x10000>, |
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts index 5bb0bf39d3b8..c9c44b2f62d7 100644 --- a/arch/arm/boot/dts/kirkwood-dns320.dts +++ b/arch/arm/boot/dts/kirkwood-dns320.dts | |||
@@ -42,12 +42,10 @@ | |||
42 | 42 | ||
43 | ocp@f1000000 { | 43 | ocp@f1000000 { |
44 | serial@12000 { | 44 | serial@12000 { |
45 | clock-frequency = <166666667>; | ||
46 | status = "okay"; | 45 | status = "okay"; |
47 | }; | 46 | }; |
48 | 47 | ||
49 | serial@12100 { | 48 | serial@12100 { |
50 | clock-frequency = <166666667>; | ||
51 | status = "okay"; | 49 | status = "okay"; |
52 | }; | 50 | }; |
53 | }; | 51 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts index d430713ea9b9..e4e4930dc5cf 100644 --- a/arch/arm/boot/dts/kirkwood-dns325.dts +++ b/arch/arm/boot/dts/kirkwood-dns325.dts | |||
@@ -50,7 +50,6 @@ | |||
50 | }; | 50 | }; |
51 | }; | 51 | }; |
52 | serial@12000 { | 52 | serial@12000 { |
53 | clock-frequency = <200000000>; | ||
54 | status = "okay"; | 53 | status = "okay"; |
55 | }; | 54 | }; |
56 | }; | 55 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts index 2e3dd34e21a5..0196cf6b0ef2 100644 --- a/arch/arm/boot/dts/kirkwood-dockstar.dts +++ b/arch/arm/boot/dts/kirkwood-dockstar.dts | |||
@@ -37,7 +37,6 @@ | |||
37 | }; | 37 | }; |
38 | }; | 38 | }; |
39 | serial@12000 { | 39 | serial@12000 { |
40 | clock-frequency = <200000000>; | ||
41 | status = "ok"; | 40 | status = "ok"; |
42 | }; | 41 | }; |
43 | 42 | ||
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts index ef2d8c705709..289e51d86372 100644 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts | |||
@@ -38,7 +38,6 @@ | |||
38 | }; | 38 | }; |
39 | }; | 39 | }; |
40 | serial@12000 { | 40 | serial@12000 { |
41 | clock-frequency = <200000000>; | ||
42 | status = "ok"; | 41 | status = "ok"; |
43 | }; | 42 | }; |
44 | 43 | ||
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts index 1b133e0c566e..c3573be7b92c 100644 --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts | |||
@@ -73,11 +73,11 @@ | |||
73 | }; | 73 | }; |
74 | }; | 74 | }; |
75 | serial@12000 { | 75 | serial@12000 { |
76 | clock-frequency = <200000000>; | ||
77 | status = "ok"; | 76 | status = "ok"; |
78 | }; | 77 | }; |
79 | 78 | ||
80 | nand@3000000 { | 79 | nand@3000000 { |
80 | chip-delay = <40>; | ||
81 | status = "okay"; | 81 | status = "okay"; |
82 | 82 | ||
83 | partition@0 { | 83 | partition@0 { |
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index 71902da33d63..5335b1aa8601 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts | |||
@@ -51,7 +51,6 @@ | |||
51 | }; | 51 | }; |
52 | }; | 52 | }; |
53 | serial@12000 { | 53 | serial@12000 { |
54 | clock-frequency = <200000000>; | ||
55 | status = "okay"; | 54 | status = "okay"; |
56 | }; | 55 | }; |
57 | 56 | ||
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts index 504f16be8b54..12ccf74ac3c4 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts | |||
@@ -78,7 +78,6 @@ | |||
78 | }; | 78 | }; |
79 | }; | 79 | }; |
80 | serial@12000 { | 80 | serial@12000 { |
81 | clock-frequency = <200000000>; | ||
82 | status = "ok"; | 81 | status = "ok"; |
83 | }; | 82 | }; |
84 | 83 | ||
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts index 6cae4599c4b3..3694e94f6e99 100644 --- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | |||
@@ -96,11 +96,11 @@ | |||
96 | marvell,function = "gpio"; | 96 | marvell,function = "gpio"; |
97 | }; | 97 | }; |
98 | pmx_led_rebuild_brt_ctrl_1: pmx-led-rebuild-brt-ctrl-1 { | 98 | pmx_led_rebuild_brt_ctrl_1: pmx-led-rebuild-brt-ctrl-1 { |
99 | marvell,pins = "mpp44"; | 99 | marvell,pins = "mpp46"; |
100 | marvell,function = "gpio"; | 100 | marvell,function = "gpio"; |
101 | }; | 101 | }; |
102 | pmx_led_rebuild_brt_ctrl_2: pmx-led-rebuild-brt-ctrl-2 { | 102 | pmx_led_rebuild_brt_ctrl_2: pmx-led-rebuild-brt-ctrl-2 { |
103 | marvell,pins = "mpp45"; | 103 | marvell,pins = "mpp47"; |
104 | marvell,function = "gpio"; | 104 | marvell,function = "gpio"; |
105 | }; | 105 | }; |
106 | 106 | ||
@@ -115,7 +115,6 @@ | |||
115 | }; | 115 | }; |
116 | 116 | ||
117 | serial@12000 { | 117 | serial@12000 { |
118 | clock-frequency = <200000000>; | ||
119 | status = "ok"; | 118 | status = "ok"; |
120 | }; | 119 | }; |
121 | 120 | ||
@@ -158,14 +157,14 @@ | |||
158 | gpios = <&gpio0 16 0>; | 157 | gpios = <&gpio0 16 0>; |
159 | linux,default-trigger = "default-on"; | 158 | linux,default-trigger = "default-on"; |
160 | }; | 159 | }; |
161 | health_led1 { | 160 | rebuild_led { |
161 | label = "status:white:rebuild_led"; | ||
162 | gpios = <&gpio1 4 0>; | ||
163 | }; | ||
164 | health_led { | ||
162 | label = "status:red:health_led"; | 165 | label = "status:red:health_led"; |
163 | gpios = <&gpio1 5 0>; | 166 | gpios = <&gpio1 5 0>; |
164 | }; | 167 | }; |
165 | health_led2 { | ||
166 | label = "status:white:health_led"; | ||
167 | gpios = <&gpio1 4 0>; | ||
168 | }; | ||
169 | backup_led { | 168 | backup_led { |
170 | label = "status:blue:backup_led"; | 169 | label = "status:blue:backup_led"; |
171 | gpios = <&gpio0 15 0>; | 170 | gpios = <&gpio0 15 0>; |
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts index 8db3123ac80f..5bbd0542cdd3 100644 --- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts +++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts | |||
@@ -34,7 +34,6 @@ | |||
34 | }; | 34 | }; |
35 | 35 | ||
36 | serial@12000 { | 36 | serial@12000 { |
37 | clock-frequency = <200000000>; | ||
38 | status = "ok"; | 37 | status = "ok"; |
39 | }; | 38 | }; |
40 | 39 | ||
diff --git a/arch/arm/boot/dts/kirkwood-lschlv2.dts b/arch/arm/boot/dts/kirkwood-lschlv2.dts index 9510c9ea666c..9f55d95f35f5 100644 --- a/arch/arm/boot/dts/kirkwood-lschlv2.dts +++ b/arch/arm/boot/dts/kirkwood-lschlv2.dts | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | ocp@f1000000 { | 14 | ocp@f1000000 { |
15 | serial@12000 { | 15 | serial@12000 { |
16 | clock-frequency = <166666667>; | ||
17 | status = "okay"; | 16 | status = "okay"; |
18 | }; | 17 | }; |
19 | }; | 18 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-lsxhl.dts b/arch/arm/boot/dts/kirkwood-lsxhl.dts index 739019c4cba9..5c84c118ed8d 100644 --- a/arch/arm/boot/dts/kirkwood-lsxhl.dts +++ b/arch/arm/boot/dts/kirkwood-lsxhl.dts | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | ocp@f1000000 { | 14 | ocp@f1000000 { |
15 | serial@12000 { | 15 | serial@12000 { |
16 | clock-frequency = <200000000>; | ||
17 | status = "okay"; | 16 | status = "okay"; |
18 | }; | 17 | }; |
19 | }; | 18 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts index 662dfd81b1ce..758824118a9a 100644 --- a/arch/arm/boot/dts/kirkwood-mplcec4.dts +++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts | |||
@@ -90,7 +90,6 @@ | |||
90 | }; | 90 | }; |
91 | 91 | ||
92 | serial@12000 { | 92 | serial@12000 { |
93 | clock-frequency = <200000000>; | ||
94 | status = "ok"; | 93 | status = "ok"; |
95 | }; | 94 | }; |
96 | 95 | ||
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi index e8e7ecef1650..6affd924fe11 100644 --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi | |||
@@ -23,7 +23,6 @@ | |||
23 | }; | 23 | }; |
24 | 24 | ||
25 | serial@12000 { | 25 | serial@12000 { |
26 | clock-frequency = <166666667>; | ||
27 | status = "okay"; | 26 | status = "okay"; |
28 | }; | 27 | }; |
29 | 28 | ||
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 3a178cf708d7..a7412b937a8a 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts | |||
@@ -117,7 +117,6 @@ | |||
117 | }; | 117 | }; |
118 | 118 | ||
119 | serial@12000 { | 119 | serial@12000 { |
120 | clock-frequency = <200000000>; | ||
121 | status = "ok"; | 120 | status = "ok"; |
122 | }; | 121 | }; |
123 | 122 | ||
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index ede7fe0d7a87..d27f7245f8e7 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts | |||
@@ -18,12 +18,10 @@ | |||
18 | 18 | ||
19 | ocp@f1000000 { | 19 | ocp@f1000000 { |
20 | serial@12000 { | 20 | serial@12000 { |
21 | clock-frequency = <200000000>; | ||
22 | status = "ok"; | 21 | status = "ok"; |
23 | }; | 22 | }; |
24 | 23 | ||
25 | serial@12100 { | 24 | serial@12100 { |
26 | clock-frequency = <200000000>; | ||
27 | status = "ok"; | 25 | status = "ok"; |
28 | }; | 26 | }; |
29 | 27 | ||
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts index 842ff95d60df..66eb45b00b25 100644 --- a/arch/arm/boot/dts/kirkwood-topkick.dts +++ b/arch/arm/boot/dts/kirkwood-topkick.dts | |||
@@ -108,7 +108,6 @@ | |||
108 | }; | 108 | }; |
109 | 109 | ||
110 | serial@12000 { | 110 | serial@12000 { |
111 | clock-frequency = <200000000>; | ||
112 | status = "ok"; | 111 | status = "ok"; |
113 | }; | 112 | }; |
114 | 113 | ||
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 2c738d9dc82a..fada7e6d24d8 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi | |||
@@ -38,6 +38,7 @@ | |||
38 | interrupt-controller; | 38 | interrupt-controller; |
39 | #interrupt-cells = <2>; | 39 | #interrupt-cells = <2>; |
40 | interrupts = <35>, <36>, <37>, <38>; | 40 | interrupts = <35>, <36>, <37>, <38>; |
41 | clocks = <&gate_clk 7>; | ||
41 | }; | 42 | }; |
42 | 43 | ||
43 | gpio1: gpio@10140 { | 44 | gpio1: gpio@10140 { |
@@ -49,6 +50,7 @@ | |||
49 | interrupt-controller; | 50 | interrupt-controller; |
50 | #interrupt-cells = <2>; | 51 | #interrupt-cells = <2>; |
51 | interrupts = <39>, <40>, <41>; | 52 | interrupts = <39>, <40>, <41>; |
53 | clocks = <&gate_clk 7>; | ||
52 | }; | 54 | }; |
53 | 55 | ||
54 | serial@12000 { | 56 | serial@12000 { |
@@ -57,7 +59,6 @@ | |||
57 | reg-shift = <2>; | 59 | reg-shift = <2>; |
58 | interrupts = <33>; | 60 | interrupts = <33>; |
59 | clocks = <&gate_clk 7>; | 61 | clocks = <&gate_clk 7>; |
60 | /* set clock-frequency in board dts */ | ||
61 | status = "disabled"; | 62 | status = "disabled"; |
62 | }; | 63 | }; |
63 | 64 | ||
@@ -67,7 +68,6 @@ | |||
67 | reg-shift = <2>; | 68 | reg-shift = <2>; |
68 | interrupts = <34>; | 69 | interrupts = <34>; |
69 | clocks = <&gate_clk 7>; | 70 | clocks = <&gate_clk 7>; |
70 | /* set clock-frequency in board dts */ | ||
71 | status = "disabled"; | 71 | status = "disabled"; |
72 | }; | 72 | }; |
73 | 73 | ||
@@ -75,6 +75,7 @@ | |||
75 | compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc"; | 75 | compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc"; |
76 | reg = <0x10300 0x20>; | 76 | reg = <0x10300 0x20>; |
77 | interrupts = <53>; | 77 | interrupts = <53>; |
78 | clocks = <&gate_clk 7>; | ||
78 | }; | 79 | }; |
79 | 80 | ||
80 | spi@10600 { | 81 | spi@10600 { |
diff --git a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts index 5a3a58b7e18f..0077fc8510b7 100644 --- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts +++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "LaCie Ethernet Disk mini V2"; | 13 | model = "LaCie Ethernet Disk mini V2"; |
14 | compatible = "lacie,ethernet-disk-mini-v2", "marvell-orion5x-88f5182", "marvell,orion5x"; | 14 | compatible = "lacie,ethernet-disk-mini-v2", "marvell,orion5x-88f5182", "marvell,orion5x"; |
15 | 15 | ||
16 | memory { | 16 | memory { |
17 | reg = <0x00000000 0x4000000>; /* 64 MB */ | 17 | reg = <0x00000000 0x4000000>; /* 64 MB */ |
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi index f09133fd8105..892c64e3f1e1 100644 --- a/arch/arm/boot/dts/orion5x.dtsi +++ b/arch/arm/boot/dts/orion5x.dtsi | |||
@@ -13,6 +13,9 @@ | |||
13 | compatible = "marvell,orion5x"; | 13 | compatible = "marvell,orion5x"; |
14 | interrupt-parent = <&intc>; | 14 | interrupt-parent = <&intc>; |
15 | 15 | ||
16 | aliases { | ||
17 | gpio0 = &gpio0; | ||
18 | }; | ||
16 | intc: interrupt-controller { | 19 | intc: interrupt-controller { |
17 | compatible = "marvell,orion-intc", "marvell,intc"; | 20 | compatible = "marvell,orion-intc", "marvell,intc"; |
18 | interrupt-controller; | 21 | interrupt-controller; |
@@ -32,7 +35,9 @@ | |||
32 | #gpio-cells = <2>; | 35 | #gpio-cells = <2>; |
33 | gpio-controller; | 36 | gpio-controller; |
34 | reg = <0x10100 0x40>; | 37 | reg = <0x10100 0x40>; |
35 | ngpio = <32>; | 38 | ngpios = <32>; |
39 | interrupt-controller; | ||
40 | #interrupt-cells = <2>; | ||
36 | interrupts = <6>, <7>, <8>, <9>; | 41 | interrupts = <6>, <7>, <8>, <9>; |
37 | }; | 42 | }; |
38 | 43 | ||
@@ -124,7 +129,7 @@ | |||
124 | reg = <0x90000 0x10000>, | 129 | reg = <0x90000 0x10000>, |
125 | <0xf2200000 0x800>; | 130 | <0xf2200000 0x800>; |
126 | reg-names = "regs", "sram"; | 131 | reg-names = "regs", "sram"; |
127 | interrupts = <22>; | 132 | interrupts = <28>; |
128 | status = "okay"; | 133 | status = "okay"; |
129 | }; | 134 | }; |
130 | }; | 135 | }; |