diff options
-rw-r--r-- | arch/arm/boot/dts/lpc32xx.dtsi | 41 | ||||
-rw-r--r-- | arch/arm/boot/dts/phy3250.dts | 4 |
2 files changed, 4 insertions, 41 deletions
diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi index 2d696866f71c..3f5dad801a98 100644 --- a/arch/arm/boot/dts/lpc32xx.dtsi +++ b/arch/arm/boot/dts/lpc32xx.dtsi | |||
@@ -215,45 +215,8 @@ | |||
215 | gpio: gpio@40028000 { | 215 | gpio: gpio@40028000 { |
216 | compatible = "nxp,lpc3220-gpio"; | 216 | compatible = "nxp,lpc3220-gpio"; |
217 | reg = <0x40028000 0x1000>; | 217 | reg = <0x40028000 0x1000>; |
218 | /* create a private address space for enumeration */ | 218 | gpio-controller; |
219 | #address-cells = <1>; | 219 | #gpio-cells = <3>; /* bank, pin, flags */ |
220 | #size-cells = <0>; | ||
221 | |||
222 | gpio_p0: gpio-bank@0 { | ||
223 | gpio-controller; | ||
224 | #gpio-cells = <2>; | ||
225 | reg = <0>; | ||
226 | }; | ||
227 | |||
228 | gpio_p1: gpio-bank@1 { | ||
229 | gpio-controller; | ||
230 | #gpio-cells = <2>; | ||
231 | reg = <1>; | ||
232 | }; | ||
233 | |||
234 | gpio_p2: gpio-bank@2 { | ||
235 | gpio-controller; | ||
236 | #gpio-cells = <2>; | ||
237 | reg = <2>; | ||
238 | }; | ||
239 | |||
240 | gpio_p3: gpio-bank@3 { | ||
241 | gpio-controller; | ||
242 | #gpio-cells = <2>; | ||
243 | reg = <3>; | ||
244 | }; | ||
245 | |||
246 | gpi_p3: gpio-bank@4 { | ||
247 | gpio-controller; | ||
248 | #gpio-cells = <2>; | ||
249 | reg = <4>; | ||
250 | }; | ||
251 | |||
252 | gpo_p3: gpio-bank@5 { | ||
253 | gpio-controller; | ||
254 | #gpio-cells = <2>; | ||
255 | reg = <5>; | ||
256 | }; | ||
257 | }; | 220 | }; |
258 | 221 | ||
259 | watchdog@4003C000 { | 222 | watchdog@4003C000 { |
diff --git a/arch/arm/boot/dts/phy3250.dts b/arch/arm/boot/dts/phy3250.dts index 0167e86314c0..c4ff6d1a018b 100644 --- a/arch/arm/boot/dts/phy3250.dts +++ b/arch/arm/boot/dts/phy3250.dts | |||
@@ -131,13 +131,13 @@ | |||
131 | compatible = "gpio-leds"; | 131 | compatible = "gpio-leds"; |
132 | 132 | ||
133 | led0 { | 133 | led0 { |
134 | gpios = <&gpo_p3 1 1>; /* GPO_P3 1, GPIO 80, active low */ | 134 | gpios = <&gpio 5 1 1>; /* GPO_P3 1, GPIO 80, active low */ |
135 | linux,default-trigger = "heartbeat"; | 135 | linux,default-trigger = "heartbeat"; |
136 | default-state = "off"; | 136 | default-state = "off"; |
137 | }; | 137 | }; |
138 | 138 | ||
139 | led1 { | 139 | led1 { |
140 | gpios = <&gpo_p3 14 1>; /* GPO_P3 14, GPIO 93, active low */ | 140 | gpios = <&gpio 5 14 1>; /* GPO_P3 14, GPIO 93, active low */ |
141 | linux,default-trigger = "timer"; | 141 | linux,default-trigger = "timer"; |
142 | default-state = "off"; | 142 | default-state = "off"; |
143 | }; | 143 | }; |