diff options
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-iconnect.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-iconnect.dts | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts index e591d5df769f..441204e8abc6 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts | |||
@@ -20,51 +20,43 @@ | |||
20 | 20 | ||
21 | ocp@f1000000 { | 21 | ocp@f1000000 { |
22 | pinctrl: pinctrl@10000 { | 22 | pinctrl: pinctrl@10000 { |
23 | 23 | pmx_button_reset: pmx-button-reset { | |
24 | pinctrl-0 = < &pmx_gpio_12 &pmx_gpio_35 | ||
25 | &pmx_gpio_41 &pmx_gpio_42 | ||
26 | &pmx_gpio_43 &pmx_gpio_44 | ||
27 | &pmx_gpio_45 &pmx_gpio_46 | ||
28 | &pmx_gpio_47 &pmx_gpio_48 >; | ||
29 | pinctrl-names = "default"; | ||
30 | |||
31 | pmx_gpio_12: pmx-gpio-12 { | ||
32 | marvell,pins = "mpp12"; | 24 | marvell,pins = "mpp12"; |
33 | marvell,function = "gpio"; | 25 | marvell,function = "gpio"; |
34 | }; | 26 | }; |
35 | pmx_gpio_35: pmx-gpio-35 { | 27 | pmx_button_otb: pmx-button-otb { |
36 | marvell,pins = "mpp35"; | 28 | marvell,pins = "mpp35"; |
37 | marvell,function = "gpio"; | 29 | marvell,function = "gpio"; |
38 | }; | 30 | }; |
39 | pmx_gpio_41: pmx-gpio-41 { | 31 | pmx_led_level: pmx-led-level { |
40 | marvell,pins = "mpp41"; | 32 | marvell,pins = "mpp41"; |
41 | marvell,function = "gpio"; | 33 | marvell,function = "gpio"; |
42 | }; | 34 | }; |
43 | pmx_gpio_42: pmx-gpio-42 { | 35 | pmx_led_power_blue: pmx-led-power-blue { |
44 | marvell,pins = "mpp42"; | 36 | marvell,pins = "mpp42"; |
45 | marvell,function = "gpio"; | 37 | marvell,function = "gpio"; |
46 | }; | 38 | }; |
47 | pmx_gpio_43: pmx-gpio-43 { | 39 | pmx_led_power_red: pmx-power-red { |
48 | marvell,pins = "mpp43"; | 40 | marvell,pins = "mpp43"; |
49 | marvell,function = "gpio"; | 41 | marvell,function = "gpio"; |
50 | }; | 42 | }; |
51 | pmx_gpio_44: pmx-gpio-44 { | 43 | pmx_led_usb1: pmx-led-usb1 { |
52 | marvell,pins = "mpp44"; | 44 | marvell,pins = "mpp44"; |
53 | marvell,function = "gpio"; | 45 | marvell,function = "gpio"; |
54 | }; | 46 | }; |
55 | pmx_gpio_45: pmx-gpio-45 { | 47 | pmx_led_usb2: pmx-led-usb2 { |
56 | marvell,pins = "mpp45"; | 48 | marvell,pins = "mpp45"; |
57 | marvell,function = "gpio"; | 49 | marvell,function = "gpio"; |
58 | }; | 50 | }; |
59 | pmx_gpio_46: pmx-gpio-46 { | 51 | pmx_led_usb3: pmx-led-usb3 { |
60 | marvell,pins = "mpp46"; | 52 | marvell,pins = "mpp46"; |
61 | marvell,function = "gpio"; | 53 | marvell,function = "gpio"; |
62 | }; | 54 | }; |
63 | pmx_gpio_47: pmx-gpio-47 { | 55 | pmx_led_usb4: pmx-led-usb4 { |
64 | marvell,pins = "mpp47"; | 56 | marvell,pins = "mpp47"; |
65 | marvell,function = "gpio"; | 57 | marvell,function = "gpio"; |
66 | }; | 58 | }; |
67 | pmx_gpio_48: pmx-gpio-48 { | 59 | pmx_led_otb: pmx-led-otb { |
68 | marvell,pins = "mpp48"; | 60 | marvell,pins = "mpp48"; |
69 | marvell,function = "gpio"; | 61 | marvell,function = "gpio"; |
70 | }; | 62 | }; |
@@ -121,6 +113,11 @@ | |||
121 | 113 | ||
122 | gpio-leds { | 114 | gpio-leds { |
123 | compatible = "gpio-leds"; | 115 | compatible = "gpio-leds"; |
116 | pinctrl-0 = < &pmx_led_level &pmx_led_power_blue | ||
117 | &pmx_led_power_red &pmx_led_usb1 | ||
118 | &pmx_led_usb2 &pmx_led_usb3 | ||
119 | &pmx_led_usb4 &pmx_led_otb >; | ||
120 | pinctrl-names = "default"; | ||
124 | 121 | ||
125 | led-level { | 122 | led-level { |
126 | label = "led_level"; | 123 | label = "led_level"; |
@@ -162,6 +159,9 @@ | |||
162 | compatible = "gpio-keys"; | 159 | compatible = "gpio-keys"; |
163 | #address-cells = <1>; | 160 | #address-cells = <1>; |
164 | #size-cells = <0>; | 161 | #size-cells = <0>; |
162 | pinctrl-0 = < &pmx_button_reset &pmx_button_otb >; | ||
163 | pinctrl-names = "default"; | ||
164 | |||
165 | button@1 { | 165 | button@1 { |
166 | label = "OTB Button"; | 166 | label = "OTB Button"; |
167 | linux,code = <133>; | 167 | linux,code = <133>; |