diff options
Diffstat (limited to 'arch/arm')
30 files changed, 145 insertions, 87 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index 3bb636978582..532ab3bd9735 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun4i-a10.dtsi" | 51 | #include "sun4i-a10.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "Mele A1000"; | 57 | model = "Mele A1000"; |
56 | compatible = "mele,a1000", "allwinner,sun4i-a10"; | 58 | compatible = "mele,a1000", "allwinner,sun4i-a10"; |
@@ -77,7 +79,7 @@ | |||
77 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 79 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
78 | vmmc-supply = <®_vcc3v3>; | 80 | vmmc-supply = <®_vcc3v3>; |
79 | bus-width = <4>; | 81 | bus-width = <4>; |
80 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 82 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
81 | cd-inverted; | 83 | cd-inverted; |
82 | status = "okay"; | 84 | status = "okay"; |
83 | }; | 85 | }; |
@@ -159,12 +161,12 @@ | |||
159 | 161 | ||
160 | red { | 162 | red { |
161 | label = "a1000:red:usr"; | 163 | label = "a1000:red:usr"; |
162 | gpios = <&pio 7 10 0>; | 164 | gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; |
163 | }; | 165 | }; |
164 | 166 | ||
165 | blue { | 167 | blue { |
166 | label = "a1000:blue:usr"; | 168 | label = "a1000:blue:usr"; |
167 | gpios = <&pio 7 20 0>; | 169 | gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; |
168 | }; | 170 | }; |
169 | }; | 171 | }; |
170 | 172 | ||
@@ -176,7 +178,7 @@ | |||
176 | regulator-min-microvolt = <3300000>; | 178 | regulator-min-microvolt = <3300000>; |
177 | regulator-max-microvolt = <3300000>; | 179 | regulator-max-microvolt = <3300000>; |
178 | enable-active-high; | 180 | enable-active-high; |
179 | gpio = <&pio 7 15 0>; | 181 | gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>; |
180 | }; | 182 | }; |
181 | 183 | ||
182 | reg_usb1_vbus: usb1-vbus { | 184 | reg_usb1_vbus: usb1-vbus { |
diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts index b2b45c4f7915..490b77c9bb36 100644 --- a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts +++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | |||
@@ -49,6 +49,8 @@ | |||
49 | #include "sun4i-a10.dtsi" | 49 | #include "sun4i-a10.dtsi" |
50 | #include "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | #include <dt-bindings/gpio/gpio.h> | ||
53 | |||
52 | / { | 54 | / { |
53 | model = "BA10 tvbox"; | 55 | model = "BA10 tvbox"; |
54 | compatible = "allwinner,ba10-tvbox", "allwinner,sun4i-a10"; | 56 | compatible = "allwinner,ba10-tvbox", "allwinner,sun4i-a10"; |
@@ -74,7 +76,7 @@ | |||
74 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 76 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
75 | vmmc-supply = <®_vcc3v3>; | 77 | vmmc-supply = <®_vcc3v3>; |
76 | bus-width = <4>; | 78 | bus-width = <4>; |
77 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 79 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
78 | cd-inverted; | 80 | cd-inverted; |
79 | status = "okay"; | 81 | status = "okay"; |
80 | }; | 82 | }; |
@@ -140,7 +142,7 @@ | |||
140 | }; | 142 | }; |
141 | 143 | ||
142 | reg_usb2_vbus: usb2-vbus { | 144 | reg_usb2_vbus: usb2-vbus { |
143 | gpio = <&pio 7 12 0>; | 145 | gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; |
144 | status = "okay"; | 146 | status = "okay"; |
145 | }; | 147 | }; |
146 | }; | 148 | }; |
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index b9202716fbdb..53f12b71e837 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts | |||
@@ -50,6 +50,8 @@ | |||
50 | #include "sun4i-a10.dtsi" | 50 | #include "sun4i-a10.dtsi" |
51 | #include "sunxi-common-regulators.dtsi" | 51 | #include "sunxi-common-regulators.dtsi" |
52 | 52 | ||
53 | #include <dt-bindings/gpio/gpio.h> | ||
54 | |||
53 | / { | 55 | / { |
54 | model = "Cubietech Cubieboard"; | 56 | model = "Cubietech Cubieboard"; |
55 | compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10"; | 57 | compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10"; |
@@ -75,7 +77,7 @@ | |||
75 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 77 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
76 | vmmc-supply = <®_vcc3v3>; | 78 | vmmc-supply = <®_vcc3v3>; |
77 | bus-width = <4>; | 79 | bus-width = <4>; |
78 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 80 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
79 | cd-inverted; | 81 | cd-inverted; |
80 | status = "okay"; | 82 | status = "okay"; |
81 | }; | 83 | }; |
@@ -163,12 +165,12 @@ | |||
163 | 165 | ||
164 | blue { | 166 | blue { |
165 | label = "cubieboard:blue:usr"; | 167 | label = "cubieboard:blue:usr"; |
166 | gpios = <&pio 7 21 0>; /* LED1 */ | 168 | gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; /* LED1 */ |
167 | }; | 169 | }; |
168 | 170 | ||
169 | green { | 171 | green { |
170 | label = "cubieboard:green:usr"; | 172 | label = "cubieboard:green:usr"; |
171 | gpios = <&pio 7 20 0>; /* LED2 */ | 173 | gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* LED2 */ |
172 | linux,default-trigger = "heartbeat"; | 174 | linux,default-trigger = "heartbeat"; |
173 | }; | 175 | }; |
174 | }; | 176 | }; |
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index 0c6c81a6b61b..be1f29e50811 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun4i-a10.dtsi" | 51 | #include "sun4i-a10.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "Miniand Hackberry"; | 57 | model = "Miniand Hackberry"; |
56 | compatible = "miniand,hackberry", "allwinner,sun4i-a10"; | 58 | compatible = "miniand,hackberry", "allwinner,sun4i-a10"; |
@@ -77,7 +79,7 @@ | |||
77 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 79 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
78 | vmmc-supply = <®_vcc3v3>; | 80 | vmmc-supply = <®_vcc3v3>; |
79 | bus-width = <4>; | 81 | bus-width = <4>; |
80 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 82 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
81 | cd-inverted; | 83 | cd-inverted; |
82 | status = "okay"; | 84 | status = "okay"; |
83 | }; | 85 | }; |
@@ -157,7 +159,7 @@ | |||
157 | regulator-min-microvolt = <3300000>; | 159 | regulator-min-microvolt = <3300000>; |
158 | regulator-max-microvolt = <3300000>; | 160 | regulator-max-microvolt = <3300000>; |
159 | enable-active-high; | 161 | enable-active-high; |
160 | gpio = <&pio 7 19 0>; | 162 | gpio = <&pio 7 19 GPIO_ACTIVE_HIGH>; |
161 | }; | 163 | }; |
162 | 164 | ||
163 | reg_usb1_vbus: usb1-vbus { | 165 | reg_usb1_vbus: usb1-vbus { |
@@ -166,7 +168,7 @@ | |||
166 | 168 | ||
167 | reg_usb2_vbus: usb2-vbus { | 169 | reg_usb2_vbus: usb2-vbus { |
168 | pinctrl-0 = <&usb2_vbus_pin_hackberry>; | 170 | pinctrl-0 = <&usb2_vbus_pin_hackberry>; |
169 | gpio = <&pio 7 12 0>; | 171 | gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; |
170 | status = "okay"; | 172 | status = "okay"; |
171 | }; | 173 | }; |
172 | }; | 174 | }; |
diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts index 5980ad0e69e3..482914333bba 100644 --- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun4i-a10.dtsi" | 51 | #include "sun4i-a10.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "INet-97F Rev 02"; | 57 | model = "INet-97F Rev 02"; |
56 | compatible = "primux,inet97fv2", "allwinner,sun4i-a10"; | 58 | compatible = "primux,inet97fv2", "allwinner,sun4i-a10"; |
@@ -65,7 +67,7 @@ | |||
65 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 67 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
66 | vmmc-supply = <®_vcc3v3>; | 68 | vmmc-supply = <®_vcc3v3>; |
67 | bus-width = <4>; | 69 | bus-width = <4>; |
68 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 70 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
69 | cd-inverted; | 71 | cd-inverted; |
70 | status = "okay"; | 72 | status = "okay"; |
71 | }; | 73 | }; |
diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts index e55639988e5d..1db02eb3796c 100644 --- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts +++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun4i-a10.dtsi" | 51 | #include "sun4i-a10.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "PineRiver Mini X-Plus"; | 57 | model = "PineRiver Mini X-Plus"; |
56 | compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10"; | 58 | compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10"; |
@@ -61,7 +63,7 @@ | |||
61 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 63 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
62 | vmmc-supply = <®_vcc3v3>; | 64 | vmmc-supply = <®_vcc3v3>; |
63 | bus-width = <4>; | 65 | bus-width = <4>; |
64 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 66 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
65 | cd-inverted; | 67 | cd-inverted; |
66 | status = "okay"; | 68 | status = "okay"; |
67 | }; | 69 | }; |
diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts index 3f607946abad..5d9b86839f16 100644 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | |||
@@ -49,6 +49,8 @@ | |||
49 | #include "sun4i-a10.dtsi" | 49 | #include "sun4i-a10.dtsi" |
50 | #include "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | #include <dt-bindings/gpio/gpio.h> | ||
53 | |||
52 | / { | 54 | / { |
53 | model = "Olimex A10-OLinuXino-LIME"; | 55 | model = "Olimex A10-OLinuXino-LIME"; |
54 | compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10"; | 56 | compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10"; |
@@ -74,7 +76,7 @@ | |||
74 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 76 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
75 | vmmc-supply = <®_vcc3v3>; | 77 | vmmc-supply = <®_vcc3v3>; |
76 | bus-width = <4>; | 78 | bus-width = <4>; |
77 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 79 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
78 | cd-inverted; | 80 | cd-inverted; |
79 | status = "okay"; | 81 | status = "okay"; |
80 | }; | 82 | }; |
@@ -151,14 +153,14 @@ | |||
151 | 153 | ||
152 | green { | 154 | green { |
153 | label = "a10-olinuxino-lime:green:usr"; | 155 | label = "a10-olinuxino-lime:green:usr"; |
154 | gpios = <&pio 7 2 0>; | 156 | gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; |
155 | default-state = "on"; | 157 | default-state = "on"; |
156 | }; | 158 | }; |
157 | }; | 159 | }; |
158 | 160 | ||
159 | reg_ahci_5v: ahci-5v { | 161 | reg_ahci_5v: ahci-5v { |
160 | pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; | 162 | pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; |
161 | gpio = <&pio 2 3 0>; | 163 | gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; |
162 | status = "okay"; | 164 | status = "okay"; |
163 | }; | 165 | }; |
164 | 166 | ||
diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts index 7367eff79dea..48161adfb32c 100644 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts | |||
@@ -50,6 +50,8 @@ | |||
50 | #include "sun4i-a10.dtsi" | 50 | #include "sun4i-a10.dtsi" |
51 | #include "sunxi-common-regulators.dtsi" | 51 | #include "sunxi-common-regulators.dtsi" |
52 | 52 | ||
53 | #include <dt-bindings/gpio/gpio.h> | ||
54 | |||
53 | / { | 55 | / { |
54 | model = "LinkSprite pcDuino"; | 56 | model = "LinkSprite pcDuino"; |
55 | compatible = "linksprite,a10-pcduino", "allwinner,sun4i-a10"; | 57 | compatible = "linksprite,a10-pcduino", "allwinner,sun4i-a10"; |
@@ -75,7 +77,7 @@ | |||
75 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 77 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
76 | vmmc-supply = <®_vcc3v3>; | 78 | vmmc-supply = <®_vcc3v3>; |
77 | bus-width = <4>; | 79 | bus-width = <4>; |
78 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 80 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
79 | cd-inverted; | 81 | cd-inverted; |
80 | status = "okay"; | 82 | status = "okay"; |
81 | }; | 83 | }; |
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts index dac9d493c205..f80d2facc158 100644 --- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | |||
@@ -50,6 +50,8 @@ | |||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | #include "sun5i-a10s.dtsi" | 51 | #include "sun5i-a10s.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | |||
54 | #include <dt-bindings/gpio/gpio.h> | ||
53 | #include <dt-bindings/input/input.h> | 55 | #include <dt-bindings/input/input.h> |
54 | 56 | ||
55 | / { | 57 | / { |
@@ -77,7 +79,7 @@ | |||
77 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>; | 79 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>; |
78 | vmmc-supply = <®_vcc3v3>; | 80 | vmmc-supply = <®_vcc3v3>; |
79 | bus-width = <4>; | 81 | bus-width = <4>; |
80 | cd-gpios = <&pio 6 1 0>; /* PG1 */ | 82 | cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ |
81 | cd-inverted; | 83 | cd-inverted; |
82 | status = "okay"; | 84 | status = "okay"; |
83 | }; | 85 | }; |
@@ -87,7 +89,7 @@ | |||
87 | pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>; | 89 | pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>; |
88 | vmmc-supply = <®_vcc3v3>; | 90 | vmmc-supply = <®_vcc3v3>; |
89 | bus-width = <4>; | 91 | bus-width = <4>; |
90 | cd-gpios = <&pio 6 13 0>; /* PG13 */ | 92 | cd-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */ |
91 | cd-inverted; | 93 | cd-inverted; |
92 | status = "okay"; | 94 | status = "okay"; |
93 | }; | 95 | }; |
@@ -226,14 +228,14 @@ | |||
226 | 228 | ||
227 | green { | 229 | green { |
228 | label = "a10s-olinuxino-micro:green:usr"; | 230 | label = "a10s-olinuxino-micro:green:usr"; |
229 | gpios = <&pio 4 3 0>; | 231 | gpios = <&pio 4 3 GPIO_ACTIVE_HIGH>; |
230 | default-state = "on"; | 232 | default-state = "on"; |
231 | }; | 233 | }; |
232 | }; | 234 | }; |
233 | 235 | ||
234 | reg_usb1_vbus: usb1-vbus { | 236 | reg_usb1_vbus: usb1-vbus { |
235 | pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>; | 237 | pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>; |
236 | gpio = <&pio 1 10 0>; | 238 | gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; |
237 | status = "okay"; | 239 | status = "okay"; |
238 | }; | 240 | }; |
239 | }; | 241 | }; |
diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts index 3a0d9dc39914..da2d2535b1bc 100644 --- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts +++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | |||
@@ -49,6 +49,8 @@ | |||
49 | #include "sun5i-a10s.dtsi" | 49 | #include "sun5i-a10s.dtsi" |
50 | #include "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | #include <dt-bindings/gpio/gpio.h> | ||
53 | |||
52 | / { | 54 | / { |
53 | model = "R7 A10s hdmi tv-stick"; | 55 | model = "R7 A10s hdmi tv-stick"; |
54 | compatible = "allwinner,r7-tv-dongle", "allwinner,sun5i-a10s"; | 56 | compatible = "allwinner,r7-tv-dongle", "allwinner,sun5i-a10s"; |
@@ -59,7 +61,7 @@ | |||
59 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_r7>; | 61 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_r7>; |
60 | vmmc-supply = <®_vcc3v3>; | 62 | vmmc-supply = <®_vcc3v3>; |
61 | bus-width = <4>; | 63 | bus-width = <4>; |
62 | cd-gpios = <&pio 6 1 0>; /* PG1 */ | 64 | cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ |
63 | cd-inverted; | 65 | cd-inverted; |
64 | status = "okay"; | 66 | status = "okay"; |
65 | }; | 67 | }; |
@@ -123,14 +125,14 @@ | |||
123 | 125 | ||
124 | green { | 126 | green { |
125 | label = "r7-tv-dongle:green:usr"; | 127 | label = "r7-tv-dongle:green:usr"; |
126 | gpios = <&pio 1 2 0>; | 128 | gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; |
127 | default-state = "on"; | 129 | default-state = "on"; |
128 | }; | 130 | }; |
129 | }; | 131 | }; |
130 | 132 | ||
131 | reg_usb1_vbus: usb1-vbus { | 133 | reg_usb1_vbus: usb1-vbus { |
132 | pinctrl-0 = <&usb1_vbus_pin_r7>; | 134 | pinctrl-0 = <&usb1_vbus_pin_r7>; |
133 | gpio = <&pio 6 13 0>; | 135 | gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>; |
134 | status = "okay"; | 136 | status = "okay"; |
135 | }; | 137 | }; |
136 | }; | 138 | }; |
diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts index ca6b6dd30e47..bccc1bcaa868 100644 --- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts +++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | |||
@@ -49,6 +49,8 @@ | |||
49 | #include "sun5i-a13.dtsi" | 49 | #include "sun5i-a13.dtsi" |
50 | #include "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | #include <dt-bindings/gpio/gpio.h> | ||
53 | |||
52 | / { | 54 | / { |
53 | model = "HSG H702"; | 55 | model = "HSG H702"; |
54 | compatible = "hsg,h702", "allwinner,sun5i-a13"; | 56 | compatible = "hsg,h702", "allwinner,sun5i-a13"; |
@@ -59,7 +61,7 @@ | |||
59 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>; | 61 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>; |
60 | vmmc-supply = <®_vcc3v3>; | 62 | vmmc-supply = <®_vcc3v3>; |
61 | bus-width = <4>; | 63 | bus-width = <4>; |
62 | cd-gpios = <&pio 6 0 0>; /* PG0 */ | 64 | cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */ |
63 | cd-inverted; | 65 | cd-inverted; |
64 | status = "okay"; | 66 | status = "okay"; |
65 | }; | 67 | }; |
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts index 729f02daf605..c30180794c54 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | |||
@@ -50,6 +50,8 @@ | |||
50 | #include "sun5i-a13.dtsi" | 50 | #include "sun5i-a13.dtsi" |
51 | #include "sunxi-common-regulators.dtsi" | 51 | #include "sunxi-common-regulators.dtsi" |
52 | 52 | ||
53 | #include <dt-bindings/gpio/gpio.h> | ||
54 | |||
53 | / { | 55 | / { |
54 | model = "Olimex A13-Olinuxino Micro"; | 56 | model = "Olimex A13-Olinuxino Micro"; |
55 | compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13"; | 57 | compatible = "olimex,a13-olinuxino-micro", "allwinner,sun5i-a13"; |
@@ -60,7 +62,7 @@ | |||
60 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>; | 62 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>; |
61 | vmmc-supply = <®_vcc3v3>; | 63 | vmmc-supply = <®_vcc3v3>; |
62 | bus-width = <4>; | 64 | bus-width = <4>; |
63 | cd-gpios = <&pio 6 0 0>; /* PG0 */ | 65 | cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */ |
64 | cd-inverted; | 66 | cd-inverted; |
65 | status = "okay"; | 67 | status = "okay"; |
66 | }; | 68 | }; |
@@ -133,14 +135,14 @@ | |||
133 | 135 | ||
134 | power { | 136 | power { |
135 | label = "a13-olinuxino-micro:green:power"; | 137 | label = "a13-olinuxino-micro:green:power"; |
136 | gpios = <&pio 6 9 0>; | 138 | gpios = <&pio 6 9 GPIO_ACTIVE_HIGH>; |
137 | default-state = "on"; | 139 | default-state = "on"; |
138 | }; | 140 | }; |
139 | }; | 141 | }; |
140 | 142 | ||
141 | reg_usb1_vbus: usb1-vbus { | 143 | reg_usb1_vbus: usb1-vbus { |
142 | pinctrl-0 = <&usb1_vbus_pin_olinuxinom>; | 144 | pinctrl-0 = <&usb1_vbus_pin_olinuxinom>; |
143 | gpio = <&pio 6 11 0>; | 145 | gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; |
144 | status = "okay"; | 146 | status = "okay"; |
145 | }; | 147 | }; |
146 | }; | 148 | }; |
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts index 529ff27dbb9f..e28a0765429a 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts | |||
@@ -50,6 +50,8 @@ | |||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | #include "sun5i-a13.dtsi" | 51 | #include "sun5i-a13.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | |||
54 | #include <dt-bindings/gpio/gpio.h> | ||
53 | #include <dt-bindings/input/input.h> | 55 | #include <dt-bindings/input/input.h> |
54 | 56 | ||
55 | / { | 57 | / { |
@@ -62,7 +64,7 @@ | |||
62 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>; | 64 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>; |
63 | vmmc-supply = <®_vcc3v3>; | 65 | vmmc-supply = <®_vcc3v3>; |
64 | bus-width = <4>; | 66 | bus-width = <4>; |
65 | cd-gpios = <&pio 6 0 0>; /* PG0 */ | 67 | cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */ |
66 | cd-inverted; | 68 | cd-inverted; |
67 | status = "okay"; | 69 | status = "okay"; |
68 | }; | 70 | }; |
@@ -174,14 +176,14 @@ | |||
174 | pinctrl-0 = <&led_pins_olinuxino>; | 176 | pinctrl-0 = <&led_pins_olinuxino>; |
175 | 177 | ||
176 | power { | 178 | power { |
177 | gpios = <&pio 6 9 0>; | 179 | gpios = <&pio 6 9 GPIO_ACTIVE_HIGH>; |
178 | default-state = "on"; | 180 | default-state = "on"; |
179 | }; | 181 | }; |
180 | }; | 182 | }; |
181 | 183 | ||
182 | reg_usb1_vbus: usb1-vbus { | 184 | reg_usb1_vbus: usb1-vbus { |
183 | pinctrl-0 = <&usb1_vbus_pin_olinuxino>; | 185 | pinctrl-0 = <&usb1_vbus_pin_olinuxino>; |
184 | gpio = <&pio 6 11 0>; | 186 | gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; |
185 | status = "okay"; | 187 | status = "okay"; |
186 | }; | 188 | }; |
187 | }; | 189 | }; |
diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts index 42a11f4795f7..0d86e8cb2ca2 100644 --- a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts +++ b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun6i-a31.dtsi" | 51 | #include "sun6i-a31.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "Allwinner A31 APP4 EVB1 Evaluation Board"; | 57 | model = "Allwinner A31 APP4 EVB1 Evaluation Board"; |
56 | compatible = "allwinner,app4-evb1", "allwinner,sun6i-a31"; | 58 | compatible = "allwinner,app4-evb1", "allwinner,sun6i-a31"; |
@@ -87,7 +89,7 @@ | |||
87 | 89 | ||
88 | reg_usb1_vbus: usb1-vbus { | 90 | reg_usb1_vbus: usb1-vbus { |
89 | pinctrl-0 = <&usb1_vbus_pin_a>; | 91 | pinctrl-0 = <&usb1_vbus_pin_a>; |
90 | gpio = <&pio 7 27 0>; | 92 | gpio = <&pio 7 27 GPIO_ACTIVE_HIGH>; |
91 | status = "okay"; | 93 | status = "okay"; |
92 | }; | 94 | }; |
93 | }; | 95 | }; |
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts index 2e5bcaf6e860..deab8f357ad7 100644 --- a/arch/arm/boot/dts/sun6i-a31-colombus.dts +++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun6i-a31.dtsi" | 51 | #include "sun6i-a31.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "WITS A31 Colombus Evaluation Board"; | 57 | model = "WITS A31 Colombus Evaluation Board"; |
56 | compatible = "wits,colombus", "allwinner,sun6i-a31"; | 58 | compatible = "wits,colombus", "allwinner,sun6i-a31"; |
@@ -65,7 +67,7 @@ | |||
65 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>; | 67 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>; |
66 | vmmc-supply = <®_vcc3v0>; | 68 | vmmc-supply = <®_vcc3v0>; |
67 | bus-width = <4>; | 69 | bus-width = <4>; |
68 | cd-gpios = <&pio 0 8 0>; /* PA8 */ | 70 | cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */ |
69 | cd-inverted; | 71 | cd-inverted; |
70 | status = "okay"; | 72 | status = "okay"; |
71 | }; | 73 | }; |
@@ -127,7 +129,7 @@ | |||
127 | reg_usb2_vbus: usb2-vbus { | 129 | reg_usb2_vbus: usb2-vbus { |
128 | pinctrl-names = "default"; | 130 | pinctrl-names = "default"; |
129 | pinctrl-0 = <&usb2_vbus_pin_colombus>; | 131 | pinctrl-0 = <&usb2_vbus_pin_colombus>; |
130 | gpio = <&pio 7 24 0>; | 132 | gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; |
131 | status = "okay"; | 133 | status = "okay"; |
132 | }; | 134 | }; |
133 | }; | 135 | }; |
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts index a3bf20930d50..7364d22b33dd 100644 --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun6i-a31.dtsi" | 51 | #include "sun6i-a31.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "Merrii A31 Hummingbird"; | 57 | model = "Merrii A31 Hummingbird"; |
56 | compatible = "merrii,a31-hummingbird", "allwinner,sun6i-a31"; | 58 | compatible = "merrii,a31-hummingbird", "allwinner,sun6i-a31"; |
@@ -65,7 +67,7 @@ | |||
65 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>; | 67 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>; |
66 | vmmc-supply = <®_vcc3v0>; | 68 | vmmc-supply = <®_vcc3v0>; |
67 | bus-width = <4>; | 69 | bus-width = <4>; |
68 | cd-gpios = <&pio 0 8 0>; /* PA8 */ | 70 | cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */ |
69 | cd-inverted; | 71 | cd-inverted; |
70 | status = "okay"; | 72 | status = "okay"; |
71 | }; | 73 | }; |
@@ -139,7 +141,7 @@ | |||
139 | pinctrl-0 = <&gmac_pins_rgmii_a>; | 141 | pinctrl-0 = <&gmac_pins_rgmii_a>; |
140 | phy = <&phy1>; | 142 | phy = <&phy1>; |
141 | phy-mode = "rgmii"; | 143 | phy-mode = "rgmii"; |
142 | snps,reset-gpio = <&pio 0 21 0>; | 144 | snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>; |
143 | snps,reset-active-low; | 145 | snps,reset-active-low; |
144 | snps,reset-delays-us = <0 10000 30000>; | 146 | snps,reset-delays-us = <0 10000 30000>; |
145 | status = "okay"; | 147 | status = "okay"; |
@@ -152,7 +154,7 @@ | |||
152 | 154 | ||
153 | reg_usb1_vbus: usb1-vbus { | 155 | reg_usb1_vbus: usb1-vbus { |
154 | pinctrl-0 = <&usb1_vbus_pin_a>; | 156 | pinctrl-0 = <&usb1_vbus_pin_a>; |
155 | gpio = <&pio 7 24 0>; /* PH24 */ | 157 | gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */ |
156 | status = "okay"; | 158 | status = "okay"; |
157 | }; | 159 | }; |
158 | }; | 160 | }; |
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts index 74d4a23a0bdc..8018baa6814d 100644 --- a/arch/arm/boot/dts/sun6i-a31-m9.dts +++ b/arch/arm/boot/dts/sun6i-a31-m9.dts | |||
@@ -49,6 +49,8 @@ | |||
49 | #include "sun6i-a31.dtsi" | 49 | #include "sun6i-a31.dtsi" |
50 | #include "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | #include <dt-bindings/gpio/gpio.h> | ||
53 | |||
52 | / { | 54 | / { |
53 | model = "Mele M9 / A1000G Quad top set box"; | 55 | model = "Mele M9 / A1000G Quad top set box"; |
54 | compatible = "mele,m9", "allwinner,sun6i-a31"; | 56 | compatible = "mele,m9", "allwinner,sun6i-a31"; |
@@ -63,7 +65,7 @@ | |||
63 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>; | 65 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>; |
64 | vmmc-supply = <®_vcc3v3>; | 66 | vmmc-supply = <®_vcc3v3>; |
65 | bus-width = <4>; | 67 | bus-width = <4>; |
66 | cd-gpios = <&pio 7 22 0>; /* PH22 */ | 68 | cd-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */ |
67 | cd-inverted; | 69 | cd-inverted; |
68 | status = "okay"; | 70 | status = "okay"; |
69 | }; | 71 | }; |
@@ -136,14 +138,14 @@ | |||
136 | 138 | ||
137 | blue { | 139 | blue { |
138 | label = "m9:blue:usr"; | 140 | label = "m9:blue:usr"; |
139 | gpios = <&pio 7 13 0>; | 141 | gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>; |
140 | }; | 142 | }; |
141 | }; | 143 | }; |
142 | 144 | ||
143 | reg_usb1_vbus: usb1-vbus { | 145 | reg_usb1_vbus: usb1-vbus { |
144 | pinctrl-names = "default"; | 146 | pinctrl-names = "default"; |
145 | pinctrl-0 = <&usb1_vbus_pin_m9>; | 147 | pinctrl-0 = <&usb1_vbus_pin_m9>; |
146 | gpio = <&pio 2 27 0>; | 148 | gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>; |
147 | status = "okay"; | 149 | status = "okay"; |
148 | }; | 150 | }; |
149 | }; | 151 | }; |
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts index e9e96584bedd..e273f0e0627a 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun7i-a20.dtsi" | 51 | #include "sun7i-a20.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "LeMaker Banana Pi"; | 57 | model = "LeMaker Banana Pi"; |
56 | compatible = "lemaker,bananapi", "allwinner,sun7i-a20"; | 58 | compatible = "lemaker,bananapi", "allwinner,sun7i-a20"; |
@@ -67,7 +69,7 @@ | |||
67 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>; | 69 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>; |
68 | vmmc-supply = <®_vcc3v3>; | 70 | vmmc-supply = <®_vcc3v3>; |
69 | bus-width = <4>; | 71 | bus-width = <4>; |
70 | cd-gpios = <&pio 7 10 0>; /* PH10 */ | 72 | cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */ |
71 | cd-inverted; | 73 | cd-inverted; |
72 | status = "okay"; | 74 | status = "okay"; |
73 | }; | 75 | }; |
@@ -188,7 +190,7 @@ | |||
188 | 190 | ||
189 | green { | 191 | green { |
190 | label = "bananapi:green:usr"; | 192 | label = "bananapi:green:usr"; |
191 | gpios = <&pio 7 24 0>; | 193 | gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>; |
192 | }; | 194 | }; |
193 | }; | 195 | }; |
194 | 196 | ||
@@ -209,6 +211,6 @@ | |||
209 | regulator-max-microvolt = <3300000>; | 211 | regulator-max-microvolt = <3300000>; |
210 | startup-delay-us = <100000>; | 212 | startup-delay-us = <100000>; |
211 | enable-active-high; | 213 | enable-active-high; |
212 | gpio = <&pio 7 23 0>; | 214 | gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>; |
213 | }; | 215 | }; |
214 | }; | 216 | }; |
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts index 809d448ecf30..27ca1a16ca91 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | |||
@@ -15,6 +15,8 @@ | |||
15 | #include "sun7i-a20.dtsi" | 15 | #include "sun7i-a20.dtsi" |
16 | #include "sunxi-common-regulators.dtsi" | 16 | #include "sunxi-common-regulators.dtsi" |
17 | 17 | ||
18 | #include <dt-bindings/gpio/gpio.h> | ||
19 | |||
18 | / { | 20 | / { |
19 | model = "Cubietech Cubieboard2"; | 21 | model = "Cubietech Cubieboard2"; |
20 | compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20"; | 22 | compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20"; |
@@ -25,7 +27,7 @@ | |||
25 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 27 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
26 | vmmc-supply = <®_vcc3v3>; | 28 | vmmc-supply = <®_vcc3v3>; |
27 | bus-width = <4>; | 29 | bus-width = <4>; |
28 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 30 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
29 | cd-inverted; | 31 | cd-inverted; |
30 | status = "okay"; | 32 | status = "okay"; |
31 | }; | 33 | }; |
@@ -120,12 +122,12 @@ | |||
120 | 122 | ||
121 | blue { | 123 | blue { |
122 | label = "cubieboard2:blue:usr"; | 124 | label = "cubieboard2:blue:usr"; |
123 | gpios = <&pio 7 21 0>; | 125 | gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; |
124 | }; | 126 | }; |
125 | 127 | ||
126 | green { | 128 | green { |
127 | label = "cubieboard2:green:usr"; | 129 | label = "cubieboard2:green:usr"; |
128 | gpios = <&pio 7 20 0>; | 130 | gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; |
129 | }; | 131 | }; |
130 | }; | 132 | }; |
131 | 133 | ||
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index 9812a3a34831..a6e88f8ce533 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts | |||
@@ -15,6 +15,8 @@ | |||
15 | #include "sun7i-a20.dtsi" | 15 | #include "sun7i-a20.dtsi" |
16 | #include "sunxi-common-regulators.dtsi" | 16 | #include "sunxi-common-regulators.dtsi" |
17 | 17 | ||
18 | #include <dt-bindings/gpio/gpio.h> | ||
19 | |||
18 | / { | 20 | / { |
19 | model = "Cubietech Cubietruck"; | 21 | model = "Cubietech Cubietruck"; |
20 | compatible = "cubietech,cubietruck", "allwinner,sun7i-a20"; | 22 | compatible = "cubietech,cubietruck", "allwinner,sun7i-a20"; |
@@ -25,7 +27,7 @@ | |||
25 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 27 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
26 | vmmc-supply = <®_vcc3v3>; | 28 | vmmc-supply = <®_vcc3v3>; |
27 | bus-width = <4>; | 29 | bus-width = <4>; |
28 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 30 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
29 | cd-inverted; | 31 | cd-inverted; |
30 | status = "okay"; | 32 | status = "okay"; |
31 | }; | 33 | }; |
@@ -168,34 +170,34 @@ | |||
168 | 170 | ||
169 | blue { | 171 | blue { |
170 | label = "cubietruck:blue:usr"; | 172 | label = "cubietruck:blue:usr"; |
171 | gpios = <&pio 7 21 0>; | 173 | gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; |
172 | }; | 174 | }; |
173 | 175 | ||
174 | orange { | 176 | orange { |
175 | label = "cubietruck:orange:usr"; | 177 | label = "cubietruck:orange:usr"; |
176 | gpios = <&pio 7 20 0>; | 178 | gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; |
177 | }; | 179 | }; |
178 | 180 | ||
179 | white { | 181 | white { |
180 | label = "cubietruck:white:usr"; | 182 | label = "cubietruck:white:usr"; |
181 | gpios = <&pio 7 11 0>; | 183 | gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; |
182 | }; | 184 | }; |
183 | 185 | ||
184 | green { | 186 | green { |
185 | label = "cubietruck:green:usr"; | 187 | label = "cubietruck:green:usr"; |
186 | gpios = <&pio 7 7 0>; | 188 | gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; |
187 | }; | 189 | }; |
188 | }; | 190 | }; |
189 | 191 | ||
190 | reg_ahci_5v: ahci-5v { | 192 | reg_ahci_5v: ahci-5v { |
191 | pinctrl-0 = <&ahci_pwr_pin_cubietruck>; | 193 | pinctrl-0 = <&ahci_pwr_pin_cubietruck>; |
192 | gpio = <&pio 7 12 0>; | 194 | gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; |
193 | status = "okay"; | 195 | status = "okay"; |
194 | }; | 196 | }; |
195 | 197 | ||
196 | reg_usb0_vbus: usb0-vbus { | 198 | reg_usb0_vbus: usb0-vbus { |
197 | pinctrl-0 = <&usb0_vbus_pin_a>; | 199 | pinctrl-0 = <&usb0_vbus_pin_a>; |
198 | gpio = <&pio 7 17 0>; | 200 | gpio = <&pio 7 17 GPIO_ACTIVE_HIGH>; |
199 | status = "okay"; | 201 | status = "okay"; |
200 | }; | 202 | }; |
201 | 203 | ||
@@ -215,6 +217,6 @@ | |||
215 | regulator-min-microvolt = <3300000>; | 217 | regulator-min-microvolt = <3300000>; |
216 | regulator-max-microvolt = <3300000>; | 218 | regulator-max-microvolt = <3300000>; |
217 | enable-active-high; | 219 | enable-active-high; |
218 | gpio = <&pio 7 9 0>; | 220 | gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>; |
219 | }; | 221 | }; |
220 | }; | 222 | }; |
diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts index add6d95a0246..3b8bd22296e6 100644 --- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts +++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts | |||
@@ -15,6 +15,8 @@ | |||
15 | #include "sun7i-a20.dtsi" | 15 | #include "sun7i-a20.dtsi" |
16 | #include "sunxi-common-regulators.dtsi" | 16 | #include "sunxi-common-regulators.dtsi" |
17 | 17 | ||
18 | #include <dt-bindings/gpio/gpio.h> | ||
19 | |||
18 | / { | 20 | / { |
19 | model = "Merrii A20 Hummingbird"; | 21 | model = "Merrii A20 Hummingbird"; |
20 | compatible = "merrii,a20-hummingbird", "allwinner,sun7i-a20"; | 22 | compatible = "merrii,a20-hummingbird", "allwinner,sun7i-a20"; |
@@ -25,7 +27,7 @@ | |||
25 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 27 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
26 | vmmc-supply = <®_vcc3v0>; | 28 | vmmc-supply = <®_vcc3v0>; |
27 | bus-width = <4>; | 29 | bus-width = <4>; |
28 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 30 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
29 | cd-inverted; | 31 | cd-inverted; |
30 | status = "okay"; | 32 | status = "okay"; |
31 | }; | 33 | }; |
@@ -184,7 +186,7 @@ | |||
184 | phy-mode = "rgmii"; | 186 | phy-mode = "rgmii"; |
185 | phy-supply = <®_gmac_vdd>; | 187 | phy-supply = <®_gmac_vdd>; |
186 | /* phy reset config */ | 188 | /* phy reset config */ |
187 | snps,reset-gpio = <&pio 0 17 0>; /* PA17 */ | 189 | snps,reset-gpio = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */ |
188 | snps,reset-active-low; | 190 | snps,reset-active-low; |
189 | /* wait 1s after reset, otherwise fail to read phy id */ | 191 | /* wait 1s after reset, otherwise fail to read phy id */ |
190 | snps,reset-delays-us = <0 10000 1000000>; | 192 | snps,reset-delays-us = <0 10000 1000000>; |
@@ -198,13 +200,13 @@ | |||
198 | 200 | ||
199 | reg_ahci_5v: ahci-5v { | 201 | reg_ahci_5v: ahci-5v { |
200 | pinctrl-0 = <&ahci_pwr_pin_a20_hummingbird>; | 202 | pinctrl-0 = <&ahci_pwr_pin_a20_hummingbird>; |
201 | gpio = <&pio 7 15 0>; /* PH15 */ | 203 | gpio = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ |
202 | status = "okay"; | 204 | status = "okay"; |
203 | }; | 205 | }; |
204 | 206 | ||
205 | reg_usb1_vbus: usb1-vbus { | 207 | reg_usb1_vbus: usb1-vbus { |
206 | pinctrl-0 = <&usb1_vbus_pin_a20_hummingbird>; | 208 | pinctrl-0 = <&usb1_vbus_pin_a20_hummingbird>; |
207 | gpio = <&pio 7 2 0>; /* PH2 */ | 209 | gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ |
208 | status = "okay"; | 210 | status = "okay"; |
209 | }; | 211 | }; |
210 | 212 | ||
@@ -220,7 +222,7 @@ | |||
220 | regulator-min-microvolt = <3000000>; | 222 | regulator-min-microvolt = <3000000>; |
221 | regulator-max-microvolt = <3000000>; | 223 | regulator-max-microvolt = <3000000>; |
222 | enable-active-high; | 224 | enable-active-high; |
223 | gpio = <&pio 7 9 0>; /* PH9 */ | 225 | gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ |
224 | }; | 226 | }; |
225 | 227 | ||
226 | reg_gmac_vdd: gmac_vdd { | 228 | reg_gmac_vdd: gmac_vdd { |
@@ -231,6 +233,6 @@ | |||
231 | regulator-min-microvolt = <3000000>; | 233 | regulator-min-microvolt = <3000000>; |
232 | regulator-max-microvolt = <3000000>; | 234 | regulator-max-microvolt = <3000000>; |
233 | enable-active-high; | 235 | enable-active-high; |
234 | gpio = <&pio 7 16 0>; /* PH16 */ | 236 | gpio = <&pio 7 16 GPIO_ACTIVE_HIGH>; /* PH16 */ |
235 | }; | 237 | }; |
236 | }; | 238 | }; |
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts index 780f1aa98429..a422f19a0261 100644 --- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts +++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | |||
@@ -49,6 +49,8 @@ | |||
49 | #include "sun7i-a20.dtsi" | 49 | #include "sun7i-a20.dtsi" |
50 | #include "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | #include <dt-bindings/gpio/gpio.h> | ||
53 | |||
52 | / { | 54 | / { |
53 | model = "I12 / Q5 / QT840A A20 tvbox"; | 55 | model = "I12 / Q5 / QT840A A20 tvbox"; |
54 | compatible = "allwinner,i12-tvbox", "allwinner,sun7i-a20"; | 56 | compatible = "allwinner,i12-tvbox", "allwinner,sun7i-a20"; |
@@ -59,7 +61,7 @@ | |||
59 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 61 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
60 | vmmc-supply = <®_vcc3v3>; | 62 | vmmc-supply = <®_vcc3v3>; |
61 | bus-width = <4>; | 63 | bus-width = <4>; |
62 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 64 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
63 | cd-inverted; | 65 | cd-inverted; |
64 | status = "okay"; | 66 | status = "okay"; |
65 | }; | 67 | }; |
@@ -179,12 +181,12 @@ | |||
179 | 181 | ||
180 | red { | 182 | red { |
181 | label = "i12_tvbox:red:usr"; | 183 | label = "i12_tvbox:red:usr"; |
182 | gpios = <&pio 7 9 1>; | 184 | gpios = <&pio 7 9 GPIO_ACTIVE_LOW>; |
183 | }; | 185 | }; |
184 | 186 | ||
185 | blue { | 187 | blue { |
186 | label = "i12_tvbox:blue:usr"; | 188 | label = "i12_tvbox:blue:usr"; |
187 | gpios = <&pio 7 20 0>; | 189 | gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; |
188 | }; | 190 | }; |
189 | }; | 191 | }; |
190 | 192 | ||
@@ -204,7 +206,7 @@ | |||
204 | regulator-min-microvolt = <3300000>; | 206 | regulator-min-microvolt = <3300000>; |
205 | regulator-max-microvolt = <3300000>; | 207 | regulator-max-microvolt = <3300000>; |
206 | enable-active-high; | 208 | enable-active-high; |
207 | gpio = <&pio 7 2 0>; | 209 | gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; |
208 | }; | 210 | }; |
209 | 211 | ||
210 | reg_vmmc3_io: vmmc3-io { | 212 | reg_vmmc3_io: vmmc3-io { |
@@ -217,7 +219,7 @@ | |||
217 | /* This controls VCC-PI, must be always on! */ | 219 | /* This controls VCC-PI, must be always on! */ |
218 | regulator-always-on; | 220 | regulator-always-on; |
219 | enable-active-high; | 221 | enable-active-high; |
220 | gpio = <&pio 7 12 0>; | 222 | gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; |
221 | }; | 223 | }; |
222 | 224 | ||
223 | reg_gmac_3v3: gmac-3v3 { | 225 | reg_gmac_3v3: gmac-3v3 { |
@@ -229,6 +231,6 @@ | |||
229 | regulator-max-microvolt = <3300000>; | 231 | regulator-max-microvolt = <3300000>; |
230 | startup-delay-us = <50000>; | 232 | startup-delay-us = <50000>; |
231 | enable-active-high; | 233 | enable-active-high; |
232 | gpio = <&pio 7 21 0>; | 234 | gpio = <&pio 7 21 GPIO_ACTIVE_HIGH>; |
233 | }; | 235 | }; |
234 | }; | 236 | }; |
diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts index 82046234d9e8..3e40ae74f5e2 100644 --- a/arch/arm/boot/dts/sun7i-a20-m3.dts +++ b/arch/arm/boot/dts/sun7i-a20-m3.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun7i-a20.dtsi" | 51 | #include "sun7i-a20.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "Mele M3"; | 57 | model = "Mele M3"; |
56 | compatible = "mele,m3", "allwinner,sun7i-a20"; | 58 | compatible = "mele,m3", "allwinner,sun7i-a20"; |
@@ -61,7 +63,7 @@ | |||
61 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 63 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
62 | vmmc-supply = <®_vcc3v3>; | 64 | vmmc-supply = <®_vcc3v3>; |
63 | bus-width = <4>; | 65 | bus-width = <4>; |
64 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 66 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
65 | cd-inverted; | 67 | cd-inverted; |
66 | status = "okay"; | 68 | status = "okay"; |
67 | }; | 69 | }; |
@@ -154,7 +156,7 @@ | |||
154 | 156 | ||
155 | blue { | 157 | blue { |
156 | label = "m3:blue:usr"; | 158 | label = "m3:blue:usr"; |
157 | gpios = <&pio 7 20 0>; | 159 | gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; |
158 | }; | 160 | }; |
159 | }; | 161 | }; |
160 | 162 | ||
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts index 996da8be0e44..0423b1cbb365 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | |||
@@ -52,6 +52,8 @@ | |||
52 | #include "sun7i-a20.dtsi" | 52 | #include "sun7i-a20.dtsi" |
53 | #include "sunxi-common-regulators.dtsi" | 53 | #include "sunxi-common-regulators.dtsi" |
54 | 54 | ||
55 | #include <dt-bindings/gpio/gpio.h> | ||
56 | |||
55 | / { | 57 | / { |
56 | model = "Olimex A20-OLinuXino-LIME"; | 58 | model = "Olimex A20-OLinuXino-LIME"; |
57 | compatible = "olimex,a20-olinuxino-lime", "allwinner,sun7i-a20"; | 59 | compatible = "olimex,a20-olinuxino-lime", "allwinner,sun7i-a20"; |
@@ -62,7 +64,7 @@ | |||
62 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 64 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
63 | vmmc-supply = <®_vcc3v3>; | 65 | vmmc-supply = <®_vcc3v3>; |
64 | bus-width = <4>; | 66 | bus-width = <4>; |
65 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 67 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
66 | cd-inverted; | 68 | cd-inverted; |
67 | status = "okay"; | 69 | status = "okay"; |
68 | }; | 70 | }; |
@@ -152,14 +154,14 @@ | |||
152 | 154 | ||
153 | green { | 155 | green { |
154 | label = "a20-olinuxino-lime:green:usr"; | 156 | label = "a20-olinuxino-lime:green:usr"; |
155 | gpios = <&pio 7 2 0>; | 157 | gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; |
156 | default-state = "on"; | 158 | default-state = "on"; |
157 | }; | 159 | }; |
158 | }; | 160 | }; |
159 | 161 | ||
160 | reg_ahci_5v: ahci-5v { | 162 | reg_ahci_5v: ahci-5v { |
161 | pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; | 163 | pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; |
162 | gpio = <&pio 2 3 0>; | 164 | gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; |
163 | status = "okay"; | 165 | status = "okay"; |
164 | }; | 166 | }; |
165 | 167 | ||
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts index 5fda1e02acdb..ce1e28afa2fe 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | |||
@@ -49,6 +49,8 @@ | |||
49 | #include "sun7i-a20.dtsi" | 49 | #include "sun7i-a20.dtsi" |
50 | #include "sunxi-common-regulators.dtsi" | 50 | #include "sunxi-common-regulators.dtsi" |
51 | 51 | ||
52 | #include <dt-bindings/gpio/gpio.h> | ||
53 | |||
52 | / { | 54 | / { |
53 | model = "Olimex A20-OLinuXino-LIME2"; | 55 | model = "Olimex A20-OLinuXino-LIME2"; |
54 | compatible = "olimex,a20-olinuxino-lime2", "allwinner,sun7i-a20"; | 56 | compatible = "olimex,a20-olinuxino-lime2", "allwinner,sun7i-a20"; |
@@ -59,7 +61,7 @@ | |||
59 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 61 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
60 | vmmc-supply = <®_vcc3v3>; | 62 | vmmc-supply = <®_vcc3v3>; |
61 | bus-width = <4>; | 63 | bus-width = <4>; |
62 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 64 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
63 | cd-inverted; | 65 | cd-inverted; |
64 | status = "okay"; | 66 | status = "okay"; |
65 | }; | 67 | }; |
@@ -199,14 +201,14 @@ | |||
199 | 201 | ||
200 | green { | 202 | green { |
201 | label = "a20-olinuxino-lime2:green:usr"; | 203 | label = "a20-olinuxino-lime2:green:usr"; |
202 | gpios = <&pio 7 2 0>; | 204 | gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; |
203 | default-state = "on"; | 205 | default-state = "on"; |
204 | }; | 206 | }; |
205 | }; | 207 | }; |
206 | 208 | ||
207 | reg_ahci_5v: ahci-5v { | 209 | reg_ahci_5v: ahci-5v { |
208 | pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; | 210 | pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; |
209 | gpio = <&pio 2 3 0>; | 211 | gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; |
210 | status = "okay"; | 212 | status = "okay"; |
211 | }; | 213 | }; |
212 | 214 | ||
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts index c00badd96cf9..ae3dd3953212 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | |||
@@ -14,6 +14,8 @@ | |||
14 | /dts-v1/; | 14 | /dts-v1/; |
15 | #include "sun7i-a20.dtsi" | 15 | #include "sun7i-a20.dtsi" |
16 | #include "sunxi-common-regulators.dtsi" | 16 | #include "sunxi-common-regulators.dtsi" |
17 | |||
18 | #include <dt-bindings/gpio/gpio.h> | ||
17 | #include <dt-bindings/input/input.h> | 19 | #include <dt-bindings/input/input.h> |
18 | 20 | ||
19 | / { | 21 | / { |
@@ -37,7 +39,7 @@ | |||
37 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 39 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
38 | vmmc-supply = <®_vcc3v3>; | 40 | vmmc-supply = <®_vcc3v3>; |
39 | bus-width = <4>; | 41 | bus-width = <4>; |
40 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 42 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
41 | cd-inverted; | 43 | cd-inverted; |
42 | status = "okay"; | 44 | status = "okay"; |
43 | }; | 45 | }; |
@@ -47,7 +49,7 @@ | |||
47 | pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>; | 49 | pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>; |
48 | vmmc-supply = <®_vcc3v3>; | 50 | vmmc-supply = <®_vcc3v3>; |
49 | bus-width = <4>; | 51 | bus-width = <4>; |
50 | cd-gpios = <&pio 7 11 0>; /* PH11 */ | 52 | cd-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ |
51 | cd-inverted; | 53 | cd-inverted; |
52 | status = "okay"; | 54 | status = "okay"; |
53 | }; | 55 | }; |
@@ -221,7 +223,7 @@ | |||
221 | 223 | ||
222 | green { | 224 | green { |
223 | label = "a20-olinuxino-micro:green:usr"; | 225 | label = "a20-olinuxino-micro:green:usr"; |
224 | gpios = <&pio 7 2 0>; | 226 | gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; |
225 | default-state = "on"; | 227 | default-state = "on"; |
226 | }; | 228 | }; |
227 | }; | 229 | }; |
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts index eb7b8878303d..acce93300abf 100644 --- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts | |||
@@ -63,7 +63,7 @@ | |||
63 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 63 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
64 | vmmc-supply = <®_vcc3v3>; | 64 | vmmc-supply = <®_vcc3v3>; |
65 | bus-width = <4>; | 65 | bus-width = <4>; |
66 | cd-gpios = <&pio 7 1 0>; /* PH1 */ | 66 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
67 | cd-inverted; | 67 | cd-inverted; |
68 | status = "okay"; | 68 | status = "okay"; |
69 | }; | 69 | }; |
@@ -204,7 +204,7 @@ | |||
204 | }; | 204 | }; |
205 | 205 | ||
206 | reg_ahci_5v: ahci-5v { | 206 | reg_ahci_5v: ahci-5v { |
207 | gpio = <&pio 7 2 0>; | 207 | gpio = <&pio 7 2 GPIO_ACTIVE_HIGH>; |
208 | status = "okay"; | 208 | status = "okay"; |
209 | }; | 209 | }; |
210 | }; | 210 | }; |
diff --git a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts index adc3a54b6612..72ece67258f4 100644 --- a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts +++ b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | |||
@@ -51,6 +51,8 @@ | |||
51 | #include "sun8i-a23.dtsi" | 51 | #include "sun8i-a23.dtsi" |
52 | #include "sunxi-common-regulators.dtsi" | 52 | #include "sunxi-common-regulators.dtsi" |
53 | 53 | ||
54 | #include <dt-bindings/gpio/gpio.h> | ||
55 | |||
54 | / { | 56 | / { |
55 | model = "Ippo Q8H Dual Core Tablet (v5)"; | 57 | model = "Ippo Q8H Dual Core Tablet (v5)"; |
56 | compatible = "ippo,q8h-v5", "allwinner,sun8i-a23"; | 58 | compatible = "ippo,q8h-v5", "allwinner,sun8i-a23"; |
@@ -69,7 +71,7 @@ | |||
69 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8h>; | 71 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8h>; |
70 | vmmc-supply = <®_vcc3v0>; | 72 | vmmc-supply = <®_vcc3v0>; |
71 | bus-width = <4>; | 73 | bus-width = <4>; |
72 | cd-gpios = <&pio 1 4 0>; /* PB4 */ | 74 | cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ |
73 | cd-inverted; | 75 | cd-inverted; |
74 | status = "okay"; | 76 | status = "okay"; |
75 | }; | 77 | }; |
diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts index 7fe242a8134b..8868c946e034 100644 --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts | |||
@@ -50,6 +50,8 @@ | |||
50 | /dts-v1/; | 50 | /dts-v1/; |
51 | #include "sun9i-a80.dtsi" | 51 | #include "sun9i-a80.dtsi" |
52 | 52 | ||
53 | #include <dt-bindings/gpio/gpio.h> | ||
54 | |||
53 | / { | 55 | / { |
54 | model = "Merrii A80 Optimus Board"; | 56 | model = "Merrii A80 Optimus Board"; |
55 | compatible = "merrii,a80-optimus", "allwinner,sun9i-a80"; | 57 | compatible = "merrii,a80-optimus", "allwinner,sun9i-a80"; |
@@ -106,14 +108,14 @@ | |||
106 | 108 | ||
107 | led2 { | 109 | led2 { |
108 | label = "optimus:led2:usr"; | 110 | label = "optimus:led2:usr"; |
109 | gpios = <&pio 7 1 0>; | 111 | gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; |
110 | }; | 112 | }; |
111 | 113 | ||
112 | /* led3 is on PM15, in R_PIO */ | 114 | /* led3 is on PM15, in R_PIO */ |
113 | 115 | ||
114 | led4 { | 116 | led4 { |
115 | label = "optimus:led4:usr"; | 117 | label = "optimus:led4:usr"; |
116 | gpios = <&pio 7 0 0>; | 118 | gpios = <&pio 7 0 GPIO_ACTIVE_HIGH>; |
117 | }; | 119 | }; |
118 | }; | 120 | }; |
119 | }; | 121 | }; |
diff --git a/arch/arm/boot/dts/sunxi-common-regulators.dtsi b/arch/arm/boot/dts/sunxi-common-regulators.dtsi index d8876634f965..d6b7983cf16a 100644 --- a/arch/arm/boot/dts/sunxi-common-regulators.dtsi +++ b/arch/arm/boot/dts/sunxi-common-regulators.dtsi | |||
@@ -47,6 +47,8 @@ | |||
47 | * OTHER DEALINGS IN THE SOFTWARE. | 47 | * OTHER DEALINGS IN THE SOFTWARE. |
48 | */ | 48 | */ |
49 | 49 | ||
50 | #include <dt-bindings/gpio/gpio.h> | ||
51 | |||
50 | / { | 52 | / { |
51 | soc@01c00000 { | 53 | soc@01c00000 { |
52 | pio: pinctrl@01c20800 { | 54 | pio: pinctrl@01c20800 { |
@@ -89,7 +91,7 @@ | |||
89 | regulator-max-microvolt = <5000000>; | 91 | regulator-max-microvolt = <5000000>; |
90 | regulator-boot-on; | 92 | regulator-boot-on; |
91 | enable-active-high; | 93 | enable-active-high; |
92 | gpio = <&pio 1 8 0>; | 94 | gpio = <&pio 1 8 GPIO_ACTIVE_HIGH>; |
93 | status = "disabled"; | 95 | status = "disabled"; |
94 | }; | 96 | }; |
95 | 97 | ||
@@ -101,7 +103,7 @@ | |||
101 | regulator-min-microvolt = <5000000>; | 103 | regulator-min-microvolt = <5000000>; |
102 | regulator-max-microvolt = <5000000>; | 104 | regulator-max-microvolt = <5000000>; |
103 | enable-active-high; | 105 | enable-active-high; |
104 | gpio = <&pio 1 9 0>; | 106 | gpio = <&pio 1 9 GPIO_ACTIVE_HIGH>; |
105 | status = "disabled"; | 107 | status = "disabled"; |
106 | }; | 108 | }; |
107 | 109 | ||
@@ -113,7 +115,7 @@ | |||
113 | regulator-min-microvolt = <5000000>; | 115 | regulator-min-microvolt = <5000000>; |
114 | regulator-max-microvolt = <5000000>; | 116 | regulator-max-microvolt = <5000000>; |
115 | enable-active-high; | 117 | enable-active-high; |
116 | gpio = <&pio 7 6 0>; | 118 | gpio = <&pio 7 6 GPIO_ACTIVE_HIGH>; |
117 | status = "disabled"; | 119 | status = "disabled"; |
118 | }; | 120 | }; |
119 | 121 | ||
@@ -125,7 +127,7 @@ | |||
125 | regulator-min-microvolt = <5000000>; | 127 | regulator-min-microvolt = <5000000>; |
126 | regulator-max-microvolt = <5000000>; | 128 | regulator-max-microvolt = <5000000>; |
127 | enable-active-high; | 129 | enable-active-high; |
128 | gpio = <&pio 7 3 0>; | 130 | gpio = <&pio 7 3 GPIO_ACTIVE_HIGH>; |
129 | status = "disabled"; | 131 | status = "disabled"; |
130 | }; | 132 | }; |
131 | 133 | ||