diff options
Diffstat (limited to 'arch')
33 files changed, 154 insertions, 155 deletions
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts index 17123f25e2db..bb4df405527c 100644 --- a/arch/arm/boot/dts/kirkwood-cloudbox.dts +++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts | |||
@@ -67,7 +67,7 @@ | |||
67 | button@1 { | 67 | button@1 { |
68 | label = "Power push button"; | 68 | label = "Power push button"; |
69 | linux,code = <KEY_POWER>; | 69 | linux,code = <KEY_POWER>; |
70 | gpios = <&gpio0 16 1>; | 70 | gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; |
71 | }; | 71 | }; |
72 | }; | 72 | }; |
73 | 73 | ||
@@ -76,17 +76,17 @@ | |||
76 | 76 | ||
77 | red-fail { | 77 | red-fail { |
78 | label = "cloudbox:red:fail"; | 78 | label = "cloudbox:red:fail"; |
79 | gpios = <&gpio0 14 0>; | 79 | gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; |
80 | }; | 80 | }; |
81 | blue-sata { | 81 | blue-sata { |
82 | label = "cloudbox:blue:sata"; | 82 | label = "cloudbox:blue:sata"; |
83 | gpios = <&gpio0 15 0>; | 83 | gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; |
84 | }; | 84 | }; |
85 | }; | 85 | }; |
86 | 86 | ||
87 | gpio_poweroff { | 87 | gpio_poweroff { |
88 | compatible = "gpio-poweroff"; | 88 | compatible = "gpio-poweroff"; |
89 | gpios = <&gpio0 17 0>; | 89 | gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; |
90 | }; | 90 | }; |
91 | }; | 91 | }; |
92 | 92 | ||
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi index 053aa20fb30f..afebc1570318 100644 --- a/arch/arm/boot/dts/kirkwood-db.dtsi +++ b/arch/arm/boot/dts/kirkwood-db.dtsi | |||
@@ -51,8 +51,8 @@ | |||
51 | mvsdio@90000 { | 51 | mvsdio@90000 { |
52 | pinctrl-0 = <&pmx_sdio_gpios>; | 52 | pinctrl-0 = <&pmx_sdio_gpios>; |
53 | pinctrl-names = "default"; | 53 | pinctrl-names = "default"; |
54 | wp-gpios = <&gpio1 5 0>; | 54 | wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; |
55 | cd-gpios = <&gpio1 6 0>; | 55 | cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; |
56 | status = "okay"; | 56 | status = "okay"; |
57 | }; | 57 | }; |
58 | }; | 58 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts index ff13b9397c8a..bf7fe8ab88f4 100644 --- a/arch/arm/boot/dts/kirkwood-dns320.dts +++ b/arch/arm/boot/dts/kirkwood-dns320.dts | |||
@@ -24,24 +24,24 @@ | |||
24 | 24 | ||
25 | blue-power { | 25 | blue-power { |
26 | label = "dns320:blue:power"; | 26 | label = "dns320:blue:power"; |
27 | gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */ | 27 | gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; |
28 | default-state = "keep"; | 28 | default-state = "keep"; |
29 | }; | 29 | }; |
30 | blue-usb { | 30 | blue-usb { |
31 | label = "dns320:blue:usb"; | 31 | label = "dns320:blue:usb"; |
32 | gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */ | 32 | gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; |
33 | }; | 33 | }; |
34 | orange-l_hdd { | 34 | orange-l_hdd { |
35 | label = "dns320:orange:l_hdd"; | 35 | label = "dns320:orange:l_hdd"; |
36 | gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */ | 36 | gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; |
37 | }; | 37 | }; |
38 | orange-r_hdd { | 38 | orange-r_hdd { |
39 | label = "dns320:orange:r_hdd"; | 39 | label = "dns320:orange:r_hdd"; |
40 | gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */ | 40 | gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; |
41 | }; | 41 | }; |
42 | orange-usb { | 42 | orange-usb { |
43 | label = "dns320:orange:usb"; | 43 | label = "dns320:orange:usb"; |
44 | gpios = <&gpio1 3 1>; /* GPIO 35 Active Low */ | 44 | gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; /* GPIO 35 */ |
45 | }; | 45 | }; |
46 | }; | 46 | }; |
47 | 47 | ||
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts index f4330434b6ff..cb9978c652f2 100644 --- a/arch/arm/boot/dts/kirkwood-dns325.dts +++ b/arch/arm/boot/dts/kirkwood-dns325.dts | |||
@@ -24,24 +24,24 @@ | |||
24 | 24 | ||
25 | white-power { | 25 | white-power { |
26 | label = "dns325:white:power"; | 26 | label = "dns325:white:power"; |
27 | gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */ | 27 | gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; |
28 | default-state = "keep"; | 28 | default-state = "keep"; |
29 | }; | 29 | }; |
30 | white-usb { | 30 | white-usb { |
31 | label = "dns325:white:usb"; | 31 | label = "dns325:white:usb"; |
32 | gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */ | 32 | gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* GPIO 43 */ |
33 | }; | 33 | }; |
34 | red-l_hdd { | 34 | red-l_hdd { |
35 | label = "dns325:red:l_hdd"; | 35 | label = "dns325:red:l_hdd"; |
36 | gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */ | 36 | gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; |
37 | }; | 37 | }; |
38 | red-r_hdd { | 38 | red-r_hdd { |
39 | label = "dns325:red:r_hdd"; | 39 | label = "dns325:red:r_hdd"; |
40 | gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */ | 40 | gpios = <&gpio0 27 GPIO_ACTIVE_LOW>; |
41 | }; | 41 | }; |
42 | red-usb { | 42 | red-usb { |
43 | label = "dns325:red:usb"; | 43 | label = "dns325:red:usb"; |
44 | gpios = <&gpio0 29 1>; /* GPIO 29 Active Low */ | 44 | gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; |
45 | }; | 45 | }; |
46 | }; | 46 | }; |
47 | 47 | ||
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi index 1d680d11f629..12087566ac6d 100644 --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi | |||
@@ -16,17 +16,17 @@ | |||
16 | button@1 { | 16 | button@1 { |
17 | label = "Power button"; | 17 | label = "Power button"; |
18 | linux,code = <KEY_POWER>; | 18 | linux,code = <KEY_POWER>; |
19 | gpios = <&gpio1 2 1>; | 19 | gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; |
20 | }; | 20 | }; |
21 | button@2 { | 21 | button@2 { |
22 | label = "USB unmount button"; | 22 | label = "USB unmount button"; |
23 | linux,code = <KEY_EJECTCD>; | 23 | linux,code = <KEY_EJECTCD>; |
24 | gpios = <&gpio1 15 1>; | 24 | gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; |
25 | }; | 25 | }; |
26 | button@3 { | 26 | button@3 { |
27 | label = "Reset button"; | 27 | label = "Reset button"; |
28 | linux,code = <KEY_RESTART>; | 28 | linux,code = <KEY_RESTART>; |
29 | gpios = <&gpio1 16 1>; | 29 | gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; |
30 | }; | 30 | }; |
31 | }; | 31 | }; |
32 | 32 | ||
@@ -35,8 +35,8 @@ | |||
35 | compatible = "gpio-fan"; | 35 | compatible = "gpio-fan"; |
36 | pinctrl-0 = <&pmx_fan_high_speed &pmx_fan_low_speed>; | 36 | pinctrl-0 = <&pmx_fan_high_speed &pmx_fan_low_speed>; |
37 | pinctrl-names = "default"; | 37 | pinctrl-names = "default"; |
38 | gpios = <&gpio1 14 1 | 38 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW |
39 | &gpio1 13 1>; | 39 | &gpio1 13 GPIO_ACTIVE_LOW>; |
40 | gpio-fan,speed-map = <0 0 | 40 | gpio-fan,speed-map = <0 0 |
41 | 3000 1 | 41 | 3000 1 |
42 | 6000 2>; | 42 | 6000 2>; |
@@ -46,7 +46,7 @@ | |||
46 | compatible = "gpio-poweroff"; | 46 | compatible = "gpio-poweroff"; |
47 | pinctrl-0 = <&pmx_power_off>; | 47 | pinctrl-0 = <&pmx_power_off>; |
48 | pinctrl-names = "default"; | 48 | pinctrl-names = "default"; |
49 | gpios = <&gpio1 4 0>; | 49 | gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | ocp@f1000000 { | 52 | ocp@f1000000 { |
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts index a5f1e3942f57..2a41c75c5c21 100644 --- a/arch/arm/boot/dts/kirkwood-dockstar.dts +++ b/arch/arm/boot/dts/kirkwood-dockstar.dts | |||
@@ -42,12 +42,12 @@ | |||
42 | 42 | ||
43 | health { | 43 | health { |
44 | label = "status:green:health"; | 44 | label = "status:green:health"; |
45 | gpios = <&gpio1 14 1>; | 45 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; |
46 | default-state = "keep"; | 46 | default-state = "keep"; |
47 | }; | 47 | }; |
48 | fault { | 48 | fault { |
49 | label = "status:orange:fault"; | 49 | label = "status:orange:fault"; |
50 | gpios = <&gpio1 15 1>; | 50 | gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; |
51 | }; | 51 | }; |
52 | }; | 52 | }; |
53 | regulators { | 53 | regulators { |
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts index 6f62af99c9cb..a7558375e06f 100644 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts | |||
@@ -87,15 +87,15 @@ | |||
87 | 87 | ||
88 | bluetooth { | 88 | bluetooth { |
89 | label = "dreamplug:blue:bluetooth"; | 89 | label = "dreamplug:blue:bluetooth"; |
90 | gpios = <&gpio1 15 1>; | 90 | gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; |
91 | }; | 91 | }; |
92 | wifi { | 92 | wifi { |
93 | label = "dreamplug:green:wifi"; | 93 | label = "dreamplug:green:wifi"; |
94 | gpios = <&gpio1 16 1>; | 94 | gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; |
95 | }; | 95 | }; |
96 | wifi-ap { | 96 | wifi-ap { |
97 | label = "dreamplug:green:wifi_ap"; | 97 | label = "dreamplug:green:wifi_ap"; |
98 | gpios = <&gpio1 17 1>; | 98 | gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; |
99 | }; | 99 | }; |
100 | }; | 100 | }; |
101 | }; | 101 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts index a9e98c979654..c2e512953570 100644 --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts | |||
@@ -85,44 +85,44 @@ | |||
85 | 85 | ||
86 | health { | 86 | health { |
87 | label = "status:green:health"; | 87 | label = "status:green:health"; |
88 | gpios = <&gpio1 14 1>; | 88 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; |
89 | default-state = "keep"; | 89 | default-state = "keep"; |
90 | }; | 90 | }; |
91 | fault { | 91 | fault { |
92 | label = "status:orange:fault"; | 92 | label = "status:orange:fault"; |
93 | gpios = <&gpio1 15 1>; | 93 | gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; |
94 | }; | 94 | }; |
95 | left0 { | 95 | left0 { |
96 | label = "status:white:left0"; | 96 | label = "status:white:left0"; |
97 | gpios = <&gpio1 10 0>; | 97 | gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; |
98 | }; | 98 | }; |
99 | left1 { | 99 | left1 { |
100 | label = "status:white:left1"; | 100 | label = "status:white:left1"; |
101 | gpios = <&gpio1 11 0>; | 101 | gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; |
102 | }; | 102 | }; |
103 | left2 { | 103 | left2 { |
104 | label = "status:white:left2"; | 104 | label = "status:white:left2"; |
105 | gpios = <&gpio1 12 0>; | 105 | gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; |
106 | }; | 106 | }; |
107 | left3 { | 107 | left3 { |
108 | label = "status:white:left3"; | 108 | label = "status:white:left3"; |
109 | gpios = <&gpio1 13 0>; | 109 | gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; |
110 | }; | 110 | }; |
111 | right0 { | 111 | right0 { |
112 | label = "status:white:right0"; | 112 | label = "status:white:right0"; |
113 | gpios = <&gpio1 6 0>; | 113 | gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; |
114 | }; | 114 | }; |
115 | right1 { | 115 | right1 { |
116 | label = "status:white:right1"; | 116 | label = "status:white:right1"; |
117 | gpios = <&gpio1 7 0>; | 117 | gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; |
118 | }; | 118 | }; |
119 | right2 { | 119 | right2 { |
120 | label = "status:white:right2"; | 120 | label = "status:white:right2"; |
121 | gpios = <&gpio1 8 0>; | 121 | gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; |
122 | }; | 122 | }; |
123 | right3 { | 123 | right3 { |
124 | label = "status:white:right3"; | 124 | label = "status:white:right3"; |
125 | gpios = <&gpio1 9 0>; | 125 | gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; |
126 | }; | 126 | }; |
127 | }; | 127 | }; |
128 | regulators { | 128 | regulators { |
@@ -141,7 +141,7 @@ | |||
141 | enable-active-high; | 141 | enable-active-high; |
142 | regulator-always-on; | 142 | regulator-always-on; |
143 | regulator-boot-on; | 143 | regulator-boot-on; |
144 | gpio = <&gpio0 29 0>; | 144 | gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; |
145 | }; | 145 | }; |
146 | }; | 146 | }; |
147 | }; | 147 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts index 4d2a70fcdcc4..0b557d5cb723 100644 --- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts +++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | |||
@@ -60,19 +60,19 @@ | |||
60 | 60 | ||
61 | health-r { | 61 | health-r { |
62 | label = "guruplug:red:health"; | 62 | label = "guruplug:red:health"; |
63 | gpios = <&gpio1 14 1>; | 63 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; |
64 | }; | 64 | }; |
65 | health-g { | 65 | health-g { |
66 | label = "guruplug:green:health"; | 66 | label = "guruplug:green:health"; |
67 | gpios = <&gpio1 15 1>; | 67 | gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; |
68 | }; | 68 | }; |
69 | wmode-r { | 69 | wmode-r { |
70 | label = "guruplug:red:wmode"; | 70 | label = "guruplug:red:wmode"; |
71 | gpios = <&gpio1 16 1>; | 71 | gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; |
72 | }; | 72 | }; |
73 | wmode-g { | 73 | wmode-g { |
74 | label = "guruplug:green:wmode"; | 74 | label = "guruplug:green:wmode"; |
75 | gpios = <&gpio1 17 1>; | 75 | gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; |
76 | }; | 76 | }; |
77 | }; | 77 | }; |
78 | }; | 78 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index c376b756cbf2..6ccc78866e6d 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts | |||
@@ -64,12 +64,12 @@ | |||
64 | button@1 { | 64 | button@1 { |
65 | label = "USB Copy"; | 65 | label = "USB Copy"; |
66 | linux,code = <KEY_COPY>; | 66 | linux,code = <KEY_COPY>; |
67 | gpios = <&gpio0 29 1>; | 67 | gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; |
68 | }; | 68 | }; |
69 | button@2 { | 69 | button@2 { |
70 | label = "Reset"; | 70 | label = "Reset"; |
71 | linux,code = <KEY_RESTART>; | 71 | linux,code = <KEY_RESTART>; |
72 | gpios = <&gpio0 28 1>; | 72 | gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; |
73 | }; | 73 | }; |
74 | }; | 74 | }; |
75 | 75 | ||
@@ -81,16 +81,16 @@ | |||
81 | 81 | ||
82 | green-os { | 82 | green-os { |
83 | label = "ib62x0:green:os"; | 83 | label = "ib62x0:green:os"; |
84 | gpios = <&gpio0 25 0>; | 84 | gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; |
85 | default-state = "keep"; | 85 | default-state = "keep"; |
86 | }; | 86 | }; |
87 | red-os { | 87 | red-os { |
88 | label = "ib62x0:red:os"; | 88 | label = "ib62x0:red:os"; |
89 | gpios = <&gpio0 22 0>; | 89 | gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; |
90 | }; | 90 | }; |
91 | usb-copy { | 91 | usb-copy { |
92 | label = "ib62x0:red:usb_copy"; | 92 | label = "ib62x0:red:usb_copy"; |
93 | gpios = <&gpio0 27 0>; | 93 | gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; |
94 | }; | 94 | }; |
95 | }; | 95 | }; |
96 | 96 | ||
@@ -98,7 +98,7 @@ | |||
98 | compatible = "gpio-poweroff"; | 98 | compatible = "gpio-poweroff"; |
99 | pinctrl-0 = <&pmx_power_off>; | 99 | pinctrl-0 = <&pmx_power_off>; |
100 | pinctrl-names = "default"; | 100 | pinctrl-names = "default"; |
101 | gpios = <&gpio0 24 0>; | 101 | gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>; |
102 | }; | 102 | }; |
103 | }; | 103 | }; |
104 | 104 | ||
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts index 52ed7519f647..f7636291de77 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts | |||
@@ -94,37 +94,37 @@ | |||
94 | 94 | ||
95 | led-level { | 95 | led-level { |
96 | label = "led_level"; | 96 | label = "led_level"; |
97 | gpios = <&gpio1 9 0>; | 97 | gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; |
98 | default-state = "on"; | 98 | default-state = "on"; |
99 | }; | 99 | }; |
100 | power-blue { | 100 | power-blue { |
101 | label = "power:blue"; | 101 | label = "power:blue"; |
102 | gpios = <&gpio1 10 0>; | 102 | gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; |
103 | default-state = "keep"; | 103 | default-state = "keep"; |
104 | }; | 104 | }; |
105 | power-red { | 105 | power-red { |
106 | label = "power:red"; | 106 | label = "power:red"; |
107 | gpios = <&gpio1 11 0>; | 107 | gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; |
108 | }; | 108 | }; |
109 | usb1 { | 109 | usb1 { |
110 | label = "usb1:blue"; | 110 | label = "usb1:blue"; |
111 | gpios = <&gpio1 12 0>; | 111 | gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; |
112 | }; | 112 | }; |
113 | usb2 { | 113 | usb2 { |
114 | label = "usb2:blue"; | 114 | label = "usb2:blue"; |
115 | gpios = <&gpio1 13 0>; | 115 | gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; |
116 | }; | 116 | }; |
117 | usb3 { | 117 | usb3 { |
118 | label = "usb3:blue"; | 118 | label = "usb3:blue"; |
119 | gpios = <&gpio1 14 0>; | 119 | gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; |
120 | }; | 120 | }; |
121 | usb4 { | 121 | usb4 { |
122 | label = "usb4:blue"; | 122 | label = "usb4:blue"; |
123 | gpios = <&gpio1 15 0>; | 123 | gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; |
124 | }; | 124 | }; |
125 | otb { | 125 | otb { |
126 | label = "otb:blue"; | 126 | label = "otb:blue"; |
127 | gpios = <&gpio1 16 0>; | 127 | gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; |
128 | }; | 128 | }; |
129 | }; | 129 | }; |
130 | 130 | ||
@@ -138,13 +138,13 @@ | |||
138 | button@1 { | 138 | button@1 { |
139 | label = "OTB Button"; | 139 | label = "OTB Button"; |
140 | linux,code = <KEY_COPY>; | 140 | linux,code = <KEY_COPY>; |
141 | gpios = <&gpio1 3 1>; | 141 | gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; |
142 | debounce-interval = <100>; | 142 | debounce-interval = <100>; |
143 | }; | 143 | }; |
144 | button@2 { | 144 | button@2 { |
145 | label = "Reset"; | 145 | label = "Reset"; |
146 | linux,code = <KEY_RESTART>; | 146 | linux,code = <KEY_RESTART>; |
147 | gpios = <&gpio0 12 1>; | 147 | gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; |
148 | debounce-interval = <100>; | 148 | debounce-interval = <100>; |
149 | }; | 149 | }; |
150 | }; | 150 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts index cdee76904cc4..589000631b5a 100644 --- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | |||
@@ -127,20 +127,20 @@ | |||
127 | 127 | ||
128 | power_led { | 128 | power_led { |
129 | label = "status:white:power_led"; | 129 | label = "status:white:power_led"; |
130 | gpios = <&gpio0 16 0>; | 130 | gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; |
131 | default-state = "keep"; | 131 | default-state = "keep"; |
132 | }; | 132 | }; |
133 | rebuild_led { | 133 | rebuild_led { |
134 | label = "status:white:rebuild_led"; | 134 | label = "status:white:rebuild_led"; |
135 | gpios = <&gpio1 4 0>; | 135 | gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; |
136 | }; | 136 | }; |
137 | health_led { | 137 | health_led { |
138 | label = "status:red:health_led"; | 138 | label = "status:red:health_led"; |
139 | gpios = <&gpio1 5 0>; | 139 | gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; |
140 | }; | 140 | }; |
141 | backup_led { | 141 | backup_led { |
142 | label = "status:blue:backup_led"; | 142 | label = "status:blue:backup_led"; |
143 | gpios = <&gpio0 15 0>; | 143 | gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; |
144 | }; | 144 | }; |
145 | }; | 145 | }; |
146 | gpio-keys { | 146 | gpio-keys { |
@@ -155,17 +155,17 @@ | |||
155 | Power { | 155 | Power { |
156 | label = "Power Button"; | 156 | label = "Power Button"; |
157 | linux,code = <KEY_POWER>; | 157 | linux,code = <KEY_POWER>; |
158 | gpios = <&gpio0 14 1>; | 158 | gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; |
159 | }; | 159 | }; |
160 | Reset { | 160 | Reset { |
161 | label = "Reset Button"; | 161 | label = "Reset Button"; |
162 | linux,code = <KEY_RESTART>; | 162 | linux,code = <KEY_RESTART>; |
163 | gpios = <&gpio0 12 1>; | 163 | gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; |
164 | }; | 164 | }; |
165 | OTB { | 165 | OTB { |
166 | label = "OTB Button"; | 166 | label = "OTB Button"; |
167 | linux,code = <KEY_COPY>; | 167 | linux,code = <KEY_COPY>; |
168 | gpios = <&gpio1 3 1>; | 168 | gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; |
169 | }; | 169 | }; |
170 | }; | 170 | }; |
171 | }; | 171 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts index cd44f37e54b5..5b5808ebc6e0 100644 --- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts +++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts | |||
@@ -38,8 +38,8 @@ | |||
38 | 38 | ||
39 | i2c@0 { | 39 | i2c@0 { |
40 | compatible = "i2c-gpio"; | 40 | compatible = "i2c-gpio"; |
41 | gpios = < &gpio0 8 0 /* sda */ | 41 | gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */ |
42 | &gpio0 9 0 >; /* scl */ | 42 | &gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */ |
43 | i2c-gpio,delay-us = <2>; /* ~100 kHz */ | 43 | i2c-gpio,delay-us = <2>; /* ~100 kHz */ |
44 | }; | 44 | }; |
45 | }; | 45 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index b284474a1cd1..fc1cd3b7b968 100644 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi | |||
@@ -109,19 +109,19 @@ | |||
109 | button@1 { | 109 | button@1 { |
110 | label = "Function Button"; | 110 | label = "Function Button"; |
111 | linux,code = <KEY_OPTION>; | 111 | linux,code = <KEY_OPTION>; |
112 | gpios = <&gpio1 9 1>; | 112 | gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; |
113 | }; | 113 | }; |
114 | button@2 { | 114 | button@2 { |
115 | label = "Power-on Switch"; | 115 | label = "Power-on Switch"; |
116 | linux,code = <KEY_RESERVED>; | 116 | linux,code = <KEY_RESERVED>; |
117 | linux,input-type = <5>; | 117 | linux,input-type = <5>; |
118 | gpios = <&gpio1 10 1>; | 118 | gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; |
119 | }; | 119 | }; |
120 | button@3 { | 120 | button@3 { |
121 | label = "Power-auto Switch"; | 121 | label = "Power-auto Switch"; |
122 | linux,code = <KEY_ESC>; | 122 | linux,code = <KEY_ESC>; |
123 | linux,input-type = <5>; | 123 | linux,input-type = <5>; |
124 | gpios = <&gpio1 11 1>; | 124 | gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; |
125 | }; | 125 | }; |
126 | }; | 126 | }; |
127 | 127 | ||
@@ -134,28 +134,28 @@ | |||
134 | 134 | ||
135 | led@1 { | 135 | led@1 { |
136 | label = "lsxl:blue:func"; | 136 | label = "lsxl:blue:func"; |
137 | gpios = <&gpio1 4 1>; | 137 | gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; |
138 | }; | 138 | }; |
139 | 139 | ||
140 | led@2 { | 140 | led@2 { |
141 | label = "lsxl:red:alarm"; | 141 | label = "lsxl:red:alarm"; |
142 | gpios = <&gpio1 5 1>; | 142 | gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; |
143 | }; | 143 | }; |
144 | 144 | ||
145 | led@3 { | 145 | led@3 { |
146 | label = "lsxl:amber:info"; | 146 | label = "lsxl:amber:info"; |
147 | gpios = <&gpio1 6 1>; | 147 | gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | led@4 { | 150 | led@4 { |
151 | label = "lsxl:blue:power"; | 151 | label = "lsxl:blue:power"; |
152 | gpios = <&gpio1 7 1>; | 152 | gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; |
153 | default-state = "keep"; | 153 | default-state = "keep"; |
154 | }; | 154 | }; |
155 | 155 | ||
156 | led@5 { | 156 | led@5 { |
157 | label = "lsxl:red:func"; | 157 | label = "lsxl:red:func"; |
158 | gpios = <&gpio1 16 1>; | 158 | gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; |
159 | }; | 159 | }; |
160 | }; | 160 | }; |
161 | 161 | ||
@@ -163,13 +163,13 @@ | |||
163 | compatible = "gpio-fan"; | 163 | compatible = "gpio-fan"; |
164 | pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; | 164 | pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; |
165 | pinctrl-names = "default"; | 165 | pinctrl-names = "default"; |
166 | gpios = <&gpio0 19 1 | 166 | gpios = <&gpio0 19 GPIO_ACTIVE_LOW |
167 | &gpio0 18 1>; | 167 | &gpio0 18 GPIO_ACTIVE_LOW>; |
168 | gpio-fan,speed-map = <0 3 | 168 | gpio-fan,speed-map = <0 3 |
169 | 1500 2 | 169 | 1500 2 |
170 | 3250 1 | 170 | 3250 1 |
171 | 5000 0>; | 171 | 5000 0>; |
172 | alarm-gpios = <&gpio1 8 0>; | 172 | alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; |
173 | }; | 173 | }; |
174 | 174 | ||
175 | restart_poweroff { | 175 | restart_poweroff { |
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts index 6c1ec2786e6e..c20607cd7d7c 100644 --- a/arch/arm/boot/dts/kirkwood-mplcec4.dts +++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts | |||
@@ -110,7 +110,7 @@ | |||
110 | pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>; | 110 | pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>; |
111 | pinctrl-names = "default"; | 111 | pinctrl-names = "default"; |
112 | status = "okay"; | 112 | status = "okay"; |
113 | cd-gpios = <&gpio1 15 1>; | 113 | cd-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; |
114 | /* No WP GPIO */ | 114 | /* No WP GPIO */ |
115 | }; | 115 | }; |
116 | }; | 116 | }; |
@@ -126,36 +126,36 @@ | |||
126 | 126 | ||
127 | health { | 127 | health { |
128 | label = "status:green:health"; | 128 | label = "status:green:health"; |
129 | gpios = <&gpio0 7 1>; | 129 | gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | user1o { | 132 | user1o { |
133 | label = "user1:orange"; | 133 | label = "user1:orange"; |
134 | gpios = <&gpio1 8 1>; | 134 | gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; |
135 | default-state = "on"; | 135 | default-state = "on"; |
136 | }; | 136 | }; |
137 | 137 | ||
138 | user1g { | 138 | user1g { |
139 | label = "user1:green"; | 139 | label = "user1:green"; |
140 | gpios = <&gpio1 9 1>; | 140 | gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; |
141 | default-state = "on"; | 141 | default-state = "on"; |
142 | }; | 142 | }; |
143 | 143 | ||
144 | user0o { | 144 | user0o { |
145 | label = "user0:orange"; | 145 | label = "user0:orange"; |
146 | gpios = <&gpio1 12 1>; | 146 | gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; |
147 | default-state = "on"; | 147 | default-state = "on"; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | user0g { | 150 | user0g { |
151 | label = "user0:green"; | 151 | label = "user0:green"; |
152 | gpios = <&gpio1 13 1>; | 152 | gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; |
153 | default-state = "on"; | 153 | default-state = "on"; |
154 | }; | 154 | }; |
155 | 155 | ||
156 | misc { | 156 | misc { |
157 | label = "status:orange:misc"; | 157 | label = "status:orange:misc"; |
158 | gpios = <&gpio1 14 1>; | 158 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; |
159 | default-state = "on"; | 159 | default-state = "on"; |
160 | }; | 160 | }; |
161 | 161 | ||
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts index ade432466c85..dc86429756d7 100644 --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | |||
@@ -90,17 +90,17 @@ | |||
90 | 90 | ||
91 | green-status { | 91 | green-status { |
92 | label = "gtw:green:Status"; | 92 | label = "gtw:green:Status"; |
93 | gpios = <&gpio0 20 0>; | 93 | gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; |
94 | }; | 94 | }; |
95 | 95 | ||
96 | red-status { | 96 | red-status { |
97 | label = "gtw:red:Status"; | 97 | label = "gtw:red:Status"; |
98 | gpios = <&gpio0 21 0>; | 98 | gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>; |
99 | }; | 99 | }; |
100 | 100 | ||
101 | green-usb { | 101 | green-usb { |
102 | label = "gtw:green:USB"; | 102 | label = "gtw:green:USB"; |
103 | gpios = <&gpio0 12 0>; | 103 | gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; |
104 | }; | 104 | }; |
105 | }; | 105 | }; |
106 | 106 | ||
@@ -114,12 +114,12 @@ | |||
114 | button@1 { | 114 | button@1 { |
115 | label = "SWR Button"; | 115 | label = "SWR Button"; |
116 | linux,code = <KEY_RESTART>; | 116 | linux,code = <KEY_RESTART>; |
117 | gpios = <&gpio1 15 1>; | 117 | gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; |
118 | }; | 118 | }; |
119 | button@2 { | 119 | button@2 { |
120 | label = "WPS Button"; | 120 | label = "WPS Button"; |
121 | linux,code = <KEY_WPS_BUTTON>; | 121 | linux,code = <KEY_WPS_BUTTON>; |
122 | gpios = <&gpio1 14 1>; | 122 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; |
123 | }; | 123 | }; |
124 | }; | 124 | }; |
125 | }; | 125 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts index 57e08b3003a1..4d2a8db9ab77 100644 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | 13 | ||
14 | #include <dt-bindings/gpio/gpio.h> | ||
15 | #include "kirkwood.dtsi" | 14 | #include "kirkwood.dtsi" |
16 | #include "kirkwood-6282.dtsi" | 15 | #include "kirkwood-6282.dtsi" |
17 | 16 | ||
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts index 3ce9f631b572..7c8a0d9d8d1f 100644 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | 13 | ||
14 | #include <dt-bindings/gpio/gpio.h> | ||
15 | #include "kirkwood.dtsi" | 14 | #include "kirkwood.dtsi" |
16 | #include "kirkwood-6282.dtsi" | 15 | #include "kirkwood-6282.dtsi" |
17 | 16 | ||
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi index 3101aecdcc0a..ae1ccbe41029 100644 --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi | |||
@@ -65,7 +65,7 @@ | |||
65 | button@1 { | 65 | button@1 { |
66 | label = "Power push button"; | 66 | label = "Power push button"; |
67 | linux,code = <KEY_POWER>; | 67 | linux,code = <KEY_POWER>; |
68 | gpios = <&gpio1 0 0>; | 68 | gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; |
69 | }; | 69 | }; |
70 | }; | 70 | }; |
71 | 71 | ||
@@ -74,13 +74,13 @@ | |||
74 | 74 | ||
75 | red-fail { | 75 | red-fail { |
76 | label = "ns2:red:fail"; | 76 | label = "ns2:red:fail"; |
77 | gpios = <&gpio0 12 0>; | 77 | gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; |
78 | }; | 78 | }; |
79 | }; | 79 | }; |
80 | 80 | ||
81 | gpio_poweroff { | 81 | gpio_poweroff { |
82 | compatible = "gpio-poweroff"; | 82 | compatible = "gpio-poweroff"; |
83 | gpios = <&gpio0 31 0>; | 83 | gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | }; | 86 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-ns2lite.dts b/arch/arm/boot/dts/kirkwood-ns2lite.dts index 7cea2a44719c..1f2ca60d8b3d 100644 --- a/arch/arm/boot/dts/kirkwood-ns2lite.dts +++ b/arch/arm/boot/dts/kirkwood-ns2lite.dts | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | blue-sata { | 26 | blue-sata { |
27 | label = "ns2:blue:sata"; | 27 | label = "ns2:blue:sata"; |
28 | gpios = <&gpio0 30 1>; | 28 | gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; |
29 | linux,default-trigger = "ide-disk"; | 29 | linux,default-trigger = "ide-disk"; |
30 | }; | 30 | }; |
31 | }; | 31 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-ns2max.dts b/arch/arm/boot/dts/kirkwood-ns2max.dts index defdc77fb550..72c78d0b1116 100644 --- a/arch/arm/boot/dts/kirkwood-ns2max.dts +++ b/arch/arm/boot/dts/kirkwood-ns2max.dts | |||
@@ -22,10 +22,10 @@ | |||
22 | 22 | ||
23 | gpio_fan { | 23 | gpio_fan { |
24 | compatible = "gpio-fan"; | 24 | compatible = "gpio-fan"; |
25 | gpios = <&gpio0 22 1 | 25 | gpios = <&gpio0 22 GPIO_ACTIVE_LOW |
26 | &gpio0 7 1 | 26 | &gpio0 7 GPIO_ACTIVE_LOW |
27 | &gpio1 1 1 | 27 | &gpio1 1 GPIO_ACTIVE_LOW |
28 | &gpio0 23 1>; | 28 | &gpio0 23 GPIO_ACTIVE_LOW>; |
29 | gpio-fan,speed-map = | 29 | gpio-fan,speed-map = |
30 | < 0 0 | 30 | < 0 0 |
31 | 1500 15 | 31 | 1500 15 |
@@ -36,7 +36,7 @@ | |||
36 | 3300 10 | 36 | 3300 10 |
37 | 4300 9 | 37 | 4300 9 |
38 | 5500 8>; | 38 | 5500 8>; |
39 | alarm-gpios = <&gpio0 25 1>; | 39 | alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | ns2-leds { | 42 | ns2-leds { |
diff --git a/arch/arm/boot/dts/kirkwood-ns2mini.dts b/arch/arm/boot/dts/kirkwood-ns2mini.dts index adbafdd90991..c441bf62c09f 100644 --- a/arch/arm/boot/dts/kirkwood-ns2mini.dts +++ b/arch/arm/boot/dts/kirkwood-ns2mini.dts | |||
@@ -23,10 +23,10 @@ | |||
23 | 23 | ||
24 | gpio_fan { | 24 | gpio_fan { |
25 | compatible = "gpio-fan"; | 25 | compatible = "gpio-fan"; |
26 | gpios = <&gpio0 22 1 | 26 | gpios = <&gpio0 22 GPIO_ACTIVE_LOW |
27 | &gpio0 7 1 | 27 | &gpio0 7 GPIO_ACTIVE_LOW |
28 | &gpio1 1 1 | 28 | &gpio1 1 GPIO_ACTIVE_LOW |
29 | &gpio0 23 1>; | 29 | &gpio0 23 GPIO_ACTIVE_LOW>; |
30 | gpio-fan,speed-map = | 30 | gpio-fan,speed-map = |
31 | < 0 0 | 31 | < 0 0 |
32 | 3000 15 | 32 | 3000 15 |
@@ -37,7 +37,7 @@ | |||
37 | 7140 10 | 37 | 7140 10 |
38 | 7980 9 | 38 | 7980 9 |
39 | 9200 8>; | 39 | 9200 8>; |
40 | alarm-gpios = <&gpio0 25 1>; | 40 | alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | ns2-leds { | 43 | ns2-leds { |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi index e3f915defd3d..aa78c2d11fe7 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | |||
@@ -40,7 +40,7 @@ | |||
40 | compatible = "gpio-poweroff"; | 40 | compatible = "gpio-poweroff"; |
41 | pinctrl-0 = <&pmx_pwr_off>; | 41 | pinctrl-0 = <&pmx_pwr_off>; |
42 | pinctrl-names = "default"; | 42 | pinctrl-names = "default"; |
43 | gpios = <&gpio1 16 0>; | 43 | gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | regulators { | 46 | regulators { |
@@ -58,7 +58,7 @@ | |||
58 | regulator-max-microvolt = <5000000>; | 58 | regulator-max-microvolt = <5000000>; |
59 | regulator-always-on; | 59 | regulator-always-on; |
60 | regulator-boot-on; | 60 | regulator-boot-on; |
61 | gpio = <&gpio0 21 0>; | 61 | gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; |
62 | }; | 62 | }; |
63 | }; | 63 | }; |
64 | }; | 64 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index c45a26ce8b57..03fa24cf3344 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts | |||
@@ -120,17 +120,17 @@ | |||
120 | button@1 { | 120 | button@1 { |
121 | label = "Power Button"; | 121 | label = "Power Button"; |
122 | linux,code = <KEY_POWER>; | 122 | linux,code = <KEY_POWER>; |
123 | gpios = <&gpio1 14 0>; | 123 | gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; |
124 | }; | 124 | }; |
125 | button@2 { | 125 | button@2 { |
126 | label = "Copy Button"; | 126 | label = "Copy Button"; |
127 | linux,code = <KEY_COPY>; | 127 | linux,code = <KEY_COPY>; |
128 | gpios = <&gpio1 5 1>; | 128 | gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; |
129 | }; | 129 | }; |
130 | button@3 { | 130 | button@3 { |
131 | label = "Reset Button"; | 131 | label = "Reset Button"; |
132 | linux,code = <KEY_RESTART>; | 132 | linux,code = <KEY_RESTART>; |
133 | gpios = <&gpio1 4 1>; | 133 | gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; |
134 | }; | 134 | }; |
135 | }; | 135 | }; |
136 | 136 | ||
@@ -145,43 +145,43 @@ | |||
145 | 145 | ||
146 | green-sys { | 146 | green-sys { |
147 | label = "nsa310:green:sys"; | 147 | label = "nsa310:green:sys"; |
148 | gpios = <&gpio0 28 0>; | 148 | gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; |
149 | }; | 149 | }; |
150 | red-sys { | 150 | red-sys { |
151 | label = "nsa310:red:sys"; | 151 | label = "nsa310:red:sys"; |
152 | gpios = <&gpio0 29 0>; | 152 | gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; |
153 | }; | 153 | }; |
154 | green-hdd { | 154 | green-hdd { |
155 | label = "nsa310:green:hdd"; | 155 | label = "nsa310:green:hdd"; |
156 | gpios = <&gpio1 9 0>; | 156 | gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; |
157 | }; | 157 | }; |
158 | red-hdd { | 158 | red-hdd { |
159 | label = "nsa310:red:hdd"; | 159 | label = "nsa310:red:hdd"; |
160 | gpios = <&gpio1 10 0>; | 160 | gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; |
161 | }; | 161 | }; |
162 | green-esata { | 162 | green-esata { |
163 | label = "nsa310:green:esata"; | 163 | label = "nsa310:green:esata"; |
164 | gpios = <&gpio0 12 0>; | 164 | gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; |
165 | }; | 165 | }; |
166 | red-esata { | 166 | red-esata { |
167 | label = "nsa310:red:esata"; | 167 | label = "nsa310:red:esata"; |
168 | gpios = <&gpio0 13 0>; | 168 | gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; |
169 | }; | 169 | }; |
170 | green-usb { | 170 | green-usb { |
171 | label = "nsa310:green:usb"; | 171 | label = "nsa310:green:usb"; |
172 | gpios = <&gpio0 15 0>; | 172 | gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; |
173 | }; | 173 | }; |
174 | red-usb { | 174 | red-usb { |
175 | label = "nsa310:red:usb"; | 175 | label = "nsa310:red:usb"; |
176 | gpios = <&gpio0 16 0>; | 176 | gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; |
177 | }; | 177 | }; |
178 | green-copy { | 178 | green-copy { |
179 | label = "nsa310:green:copy"; | 179 | label = "nsa310:green:copy"; |
180 | gpios = <&gpio1 7 0>; | 180 | gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; |
181 | }; | 181 | }; |
182 | red-copy { | 182 | red-copy { |
183 | label = "nsa310:red:copy"; | 183 | label = "nsa310:red:copy"; |
184 | gpios = <&gpio1 8 0>; | 184 | gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; |
185 | }; | 185 | }; |
186 | }; | 186 | }; |
187 | }; | 187 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts index 874df7d26c7c..a5e779452867 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts | |||
@@ -108,17 +108,17 @@ | |||
108 | button@1 { | 108 | button@1 { |
109 | label = "Power Button"; | 109 | label = "Power Button"; |
110 | linux,code = <KEY_POWER>; | 110 | linux,code = <KEY_POWER>; |
111 | gpios = <&gpio1 14 0>; | 111 | gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; |
112 | }; | 112 | }; |
113 | button@2 { | 113 | button@2 { |
114 | label = "Copy Button"; | 114 | label = "Copy Button"; |
115 | linux,code = <KEY_COPY>; | 115 | linux,code = <KEY_COPY>; |
116 | gpios = <&gpio1 5 1>; | 116 | gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; |
117 | }; | 117 | }; |
118 | button@3 { | 118 | button@3 { |
119 | label = "Reset Button"; | 119 | label = "Reset Button"; |
120 | linux,code = <KEY_RESTART>; | 120 | linux,code = <KEY_RESTART>; |
121 | gpios = <&gpio1 4 1>; | 121 | gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; |
122 | }; | 122 | }; |
123 | }; | 123 | }; |
124 | 124 | ||
@@ -127,39 +127,39 @@ | |||
127 | 127 | ||
128 | green-sys { | 128 | green-sys { |
129 | label = "nsa310:green:sys"; | 129 | label = "nsa310:green:sys"; |
130 | gpios = <&gpio0 28 0>; | 130 | gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; |
131 | }; | 131 | }; |
132 | red-sys { | 132 | red-sys { |
133 | label = "nsa310:red:sys"; | 133 | label = "nsa310:red:sys"; |
134 | gpios = <&gpio0 29 0>; | 134 | gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; |
135 | }; | 135 | }; |
136 | green-hdd { | 136 | green-hdd { |
137 | label = "nsa310:green:hdd"; | 137 | label = "nsa310:green:hdd"; |
138 | gpios = <&gpio1 9 0>; | 138 | gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; |
139 | }; | 139 | }; |
140 | red-hdd { | 140 | red-hdd { |
141 | label = "nsa310:red:hdd"; | 141 | label = "nsa310:red:hdd"; |
142 | gpios = <&gpio1 10 0>; | 142 | gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; |
143 | }; | 143 | }; |
144 | green-esata { | 144 | green-esata { |
145 | label = "nsa310:green:esata"; | 145 | label = "nsa310:green:esata"; |
146 | gpios = <&gpio0 12 0>; | 146 | gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; |
147 | }; | 147 | }; |
148 | red-esata { | 148 | red-esata { |
149 | label = "nsa310:red:esata"; | 149 | label = "nsa310:red:esata"; |
150 | gpios = <&gpio0 13 0>; | 150 | gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; |
151 | }; | 151 | }; |
152 | green-usb { | 152 | green-usb { |
153 | label = "nsa310:green:usb"; | 153 | label = "nsa310:green:usb"; |
154 | gpios = <&gpio0 15 0>; | 154 | gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; |
155 | }; | 155 | }; |
156 | green-copy { | 156 | green-copy { |
157 | label = "nsa310:green:copy"; | 157 | label = "nsa310:green:copy"; |
158 | gpios = <&gpio1 7 0>; | 158 | gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; |
159 | }; | 159 | }; |
160 | red-copy { | 160 | red-copy { |
161 | label = "nsa310:red:copy"; | 161 | label = "nsa310:red:copy"; |
162 | gpios = <&gpio1 8 0>; | 162 | gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; |
163 | }; | 163 | }; |
164 | }; | 164 | }; |
165 | }; | 165 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index 6c171e067b59..5c6a4f1b4e93 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts | |||
@@ -101,17 +101,17 @@ | |||
101 | 101 | ||
102 | led-red { | 102 | led-red { |
103 | label = "obsa6:red:stat"; | 103 | label = "obsa6:red:stat"; |
104 | gpios = <&gpio1 9 1>; | 104 | gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; |
105 | }; | 105 | }; |
106 | 106 | ||
107 | led-green { | 107 | led-green { |
108 | label = "obsa6:green:stat"; | 108 | label = "obsa6:green:stat"; |
109 | gpios = <&gpio1 10 1>; | 109 | gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; |
110 | }; | 110 | }; |
111 | 111 | ||
112 | led-yellow { | 112 | led-yellow { |
113 | label = "obsa6:yellow:stat"; | 113 | label = "obsa6:yellow:stat"; |
114 | gpios = <&gpio1 11 1>; | 114 | gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; |
115 | }; | 115 | }; |
116 | }; | 116 | }; |
117 | 117 | ||
@@ -125,7 +125,7 @@ | |||
125 | button@1 { | 125 | button@1 { |
126 | label = "Init Button"; | 126 | label = "Init Button"; |
127 | linux,code = <KEY_POWER>; | 127 | linux,code = <KEY_POWER>; |
128 | gpios = <&gpio1 6 0>; | 128 | gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; |
129 | }; | 129 | }; |
130 | }; | 130 | }; |
131 | }; | 131 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts index c97bad46c29c..c054ef61cff5 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts | |||
@@ -126,17 +126,17 @@ | |||
126 | 126 | ||
127 | led-red { | 127 | led-red { |
128 | label = "obsa7:red:stat"; | 128 | label = "obsa7:red:stat"; |
129 | gpios = <&gpio1 9 1>; | 129 | gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | led-green { | 132 | led-green { |
133 | label = "obsa7:green:stat"; | 133 | label = "obsa7:green:stat"; |
134 | gpios = <&gpio1 10 1>; | 134 | gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; |
135 | }; | 135 | }; |
136 | 136 | ||
137 | led-yellow { | 137 | led-yellow { |
138 | label = "obsa7:yellow:stat"; | 138 | label = "obsa7:yellow:stat"; |
139 | gpios = <&gpio1 11 1>; | 139 | gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; |
140 | }; | 140 | }; |
141 | }; | 141 | }; |
142 | 142 | ||
@@ -150,7 +150,7 @@ | |||
150 | button@1 { | 150 | button@1 { |
151 | label = "Init Button"; | 151 | label = "Init Button"; |
152 | linux,code = <KEY_POWER>; | 152 | linux,code = <KEY_POWER>; |
153 | gpios = <&gpio1 6 0>; | 153 | gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; |
154 | }; | 154 | }; |
155 | }; | 155 | }; |
156 | }; | 156 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts index ce9b3be237f9..e2b4ea4f9e10 100644 --- a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts +++ b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | |||
@@ -24,8 +24,8 @@ | |||
24 | pinctrl-0 = <&pmx_sdio &pmx_sdio_cd &pmx_sdio_wp>; | 24 | pinctrl-0 = <&pmx_sdio &pmx_sdio_cd &pmx_sdio_wp>; |
25 | pinctrl-names = "default"; | 25 | pinctrl-names = "default"; |
26 | status = "okay"; | 26 | status = "okay"; |
27 | cd-gpios = <&gpio1 12 1>; | 27 | cd-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; |
28 | wp-gpios = <&gpio1 15 0>; | 28 | wp-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; |
29 | }; | 29 | }; |
30 | }; | 30 | }; |
31 | 31 | ||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | health { | 37 | health { |
38 | label = "sheevaplug:blue:health"; | 38 | label = "sheevaplug:blue:health"; |
39 | gpios = <&gpio1 17 1>; | 39 | gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; |
40 | default-state = "keep"; | 40 | default-state = "keep"; |
41 | }; | 41 | }; |
42 | }; | 42 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug.dts b/arch/arm/boot/dts/kirkwood-sheevaplug.dts index c01f9c765aa2..82f6abf120fd 100644 --- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts +++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts | |||
@@ -31,13 +31,13 @@ | |||
31 | 31 | ||
32 | health { | 32 | health { |
33 | label = "sheevaplug:blue:health"; | 33 | label = "sheevaplug:blue:health"; |
34 | gpios = <&gpio1 17 1>; | 34 | gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; |
35 | default-state = "keep"; | 35 | default-state = "keep"; |
36 | }; | 36 | }; |
37 | 37 | ||
38 | misc { | 38 | misc { |
39 | label = "sheevaplug:red:misc"; | 39 | label = "sheevaplug:red:misc"; |
40 | gpios = <&gpio1 14 1>; | 40 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; |
41 | }; | 41 | }; |
42 | }; | 42 | }; |
43 | }; | 43 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts index 320da677b984..40d6adf678ca 100644 --- a/arch/arm/boot/dts/kirkwood-topkick.dts +++ b/arch/arm/boot/dts/kirkwood-topkick.dts | |||
@@ -131,25 +131,25 @@ | |||
131 | 131 | ||
132 | disk { | 132 | disk { |
133 | label = "topkick:yellow:disk"; | 133 | label = "topkick:yellow:disk"; |
134 | gpios = <&gpio0 21 1>; | 134 | gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; |
135 | linux,default-trigger = "ide-disk"; | 135 | linux,default-trigger = "ide-disk"; |
136 | }; | 136 | }; |
137 | system2 { | 137 | system2 { |
138 | label = "topkick:red:system"; | 138 | label = "topkick:red:system"; |
139 | gpios = <&gpio1 5 1>; | 139 | gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; |
140 | }; | 140 | }; |
141 | system { | 141 | system { |
142 | label = "topkick:blue:system"; | 142 | label = "topkick:blue:system"; |
143 | gpios = <&gpio1 6 1>; | 143 | gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; |
144 | default-state = "on"; | 144 | default-state = "on"; |
145 | }; | 145 | }; |
146 | wifi { | 146 | wifi { |
147 | label = "topkick:green:wifi"; | 147 | label = "topkick:green:wifi"; |
148 | gpios = <&gpio1 7 1>; | 148 | gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; |
149 | }; | 149 | }; |
150 | wifi2 { | 150 | wifi2 { |
151 | label = "topkick:yellow:wifi"; | 151 | label = "topkick:yellow:wifi"; |
152 | gpios = <&gpio1 16 1>; | 152 | gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; |
153 | }; | 153 | }; |
154 | }; | 154 | }; |
155 | regulators { | 155 | regulators { |
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts index 89f7094117f4..c17ae45e19be 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts | |||
@@ -42,12 +42,12 @@ | |||
42 | button@1 { | 42 | button@1 { |
43 | label = "USB Copy"; | 43 | label = "USB Copy"; |
44 | linux,code = <KEY_COPY>; | 44 | linux,code = <KEY_COPY>; |
45 | gpios = <&gpio0 15 1>; | 45 | gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; |
46 | }; | 46 | }; |
47 | button@2 { | 47 | button@2 { |
48 | label = "Reset"; | 48 | label = "Reset"; |
49 | linux,code = <KEY_RESTART>; | 49 | linux,code = <KEY_RESTART>; |
50 | gpios = <&gpio0 16 1>; | 50 | gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; |
51 | }; | 51 | }; |
52 | }; | 52 | }; |
53 | }; | 53 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts index 6976afb56605..0713d072758a 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts | |||
@@ -52,12 +52,12 @@ | |||
52 | button@1 { | 52 | button@1 { |
53 | label = "USB Copy"; | 53 | label = "USB Copy"; |
54 | linux,code = <KEY_COPY>; | 54 | linux,code = <KEY_COPY>; |
55 | gpios = <&gpio1 11 1>; | 55 | gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; |
56 | }; | 56 | }; |
57 | button@2 { | 57 | button@2 { |
58 | label = "Reset"; | 58 | label = "Reset"; |
59 | linux,code = <KEY_RESTART>; | 59 | linux,code = <KEY_RESTART>; |
60 | gpios = <&gpio1 5 1>; | 60 | gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; |
61 | }; | 61 | }; |
62 | }; | 62 | }; |
63 | }; | 63 | }; |
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 477c0b5553e8..dd58a25a4166 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi | |||
@@ -1,5 +1,6 @@ | |||
1 | /include/ "skeleton.dtsi" | 1 | /include/ "skeleton.dtsi" |
2 | #include <dt-bindings/input/input.h> | 2 | #include <dt-bindings/input/input.h> |
3 | #include <dt-bindings/gpio/gpio.h> | ||
3 | 4 | ||
4 | #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16)) | 5 | #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16)) |
5 | 6 | ||