diff options
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-goflexnet.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-goflexnet.dts | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts index c3573be7b92c..31caa6405065 100644 --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts | |||
@@ -18,15 +18,6 @@ | |||
18 | 18 | ||
19 | ocp@f1000000 { | 19 | ocp@f1000000 { |
20 | pinctrl: pinctrl@10000 { | 20 | pinctrl: pinctrl@10000 { |
21 | |||
22 | pinctrl-0 = < &pmx_usb_power_enable &pmx_led_orange | ||
23 | &pmx_led_left_cap_0 &pmx_led_left_cap_1 | ||
24 | &pmx_led_left_cap_2 &pmx_led_left_cap_3 | ||
25 | &pmx_led_right_cap_0 &pmx_led_right_cap_1 | ||
26 | &pmx_led_right_cap_2 &pmx_led_right_cap_3 | ||
27 | >; | ||
28 | pinctrl-names = "default"; | ||
29 | |||
30 | pmx_usb_power_enable: pmx-usb-power-enable { | 21 | pmx_usb_power_enable: pmx-usb-power-enable { |
31 | marvell,pins = "mpp29"; | 22 | marvell,pins = "mpp29"; |
32 | marvell,function = "gpio"; | 23 | marvell,function = "gpio"; |
@@ -109,6 +100,13 @@ | |||
109 | }; | 100 | }; |
110 | gpio-leds { | 101 | gpio-leds { |
111 | compatible = "gpio-leds"; | 102 | compatible = "gpio-leds"; |
103 | pinctrl-0 = < &pmx_led_orange | ||
104 | &pmx_led_left_cap_0 &pmx_led_left_cap_1 | ||
105 | &pmx_led_left_cap_2 &pmx_led_left_cap_3 | ||
106 | &pmx_led_right_cap_0 &pmx_led_right_cap_1 | ||
107 | &pmx_led_right_cap_2 &pmx_led_right_cap_3 | ||
108 | >; | ||
109 | pinctrl-names = "default"; | ||
112 | 110 | ||
113 | health { | 111 | health { |
114 | label = "status:green:health"; | 112 | label = "status:green:health"; |
@@ -156,6 +154,8 @@ | |||
156 | compatible = "simple-bus"; | 154 | compatible = "simple-bus"; |
157 | #address-cells = <1>; | 155 | #address-cells = <1>; |
158 | #size-cells = <0>; | 156 | #size-cells = <0>; |
157 | pinctrl-0 = <&pmx_usb_power_enable>; | ||
158 | pinctrl-names = "default"; | ||
159 | 159 | ||
160 | usb_power: regulator@1 { | 160 | usb_power: regulator@1 { |
161 | compatible = "regulator-fixed"; | 161 | compatible = "regulator-fixed"; |