Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: Use defined GPIO constants in flags cell for OMAP2+ boards

Many OMAP2+ DTS are not using the defined constants to express
the GPIO polarity. Replace these so the DTS are easier to read.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Javier Martinez Canillas and committed by
Tony Lindgren
3a637e00 79a4e64c

+38 -38
+3 -3
arch/arm/boot/dts/omap2420-n8x0-common.dtsi
··· 9 9 ocp { 10 10 i2c@0 { 11 11 compatible = "i2c-cbus-gpio"; 12 - gpios = <&gpio3 2 0 /* gpio66 clk */ 13 - &gpio3 1 0 /* gpio65 dat */ 14 - &gpio3 0 0 /* gpio64 sel */ 12 + gpios = <&gpio3 2 GPIO_ACTIVE_HIGH /* gpio66 clk */ 13 + &gpio3 1 GPIO_ACTIVE_HIGH /* gpio65 dat */ 14 + &gpio3 0 GPIO_ACTIVE_HIGH /* gpio64 sel */ 15 15 >; 16 16 #address-cells = <1>; 17 17 #size-cells = <0>;
+1 -1
arch/arm/boot/dts/omap3-beagle-xm.dts
··· 80 80 regulator-name = "hsusb2_vbus"; 81 81 regulator-min-microvolt = <3300000>; 82 82 regulator-max-microvolt = <3300000>; 83 - gpio = <&twl_gpio 18 0>; /* GPIO LEDA */ 83 + gpio = <&twl_gpio 18 GPIO_ACTIVE_HIGH>; /* GPIO LEDA */ 84 84 startup-delay-us = <70000>; 85 85 }; 86 86
+1 -1
arch/arm/boot/dts/omap3-beagle.dts
··· 55 55 regulator-name = "hsusb2_vbus"; 56 56 regulator-min-microvolt = <3300000>; 57 57 regulator-max-microvolt = <3300000>; 58 - gpio = <&twl_gpio 18 0>; /* GPIO LEDA */ 58 + gpio = <&twl_gpio 18 GPIO_ACTIVE_HIGH>; /* GPIO LEDA */ 59 59 startup-delay-us = <70000>; 60 60 }; 61 61
+1 -1
arch/arm/boot/dts/omap3-cm-t3x.dtsi
··· 224 224 225 225 interrupt-parent = <&gpio2>; 226 226 interrupts = <25 0>; /* gpio_57 */ 227 - pendown-gpio = <&gpio2 25 0>; 227 + pendown-gpio = <&gpio2 25 GPIO_ACTIVE_HIGH>; 228 228 229 229 ti,x-min = /bits/ 16 <0x0>; 230 230 ti,x-max = /bits/ 16 <0x0fff>;
+1 -1
arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
··· 54 54 55 55 interrupt-parent = <&gpio1>; 56 56 interrupts = <27 0>; /* gpio_27 */ 57 - pendown-gpio = <&gpio1 27 0>; 57 + pendown-gpio = <&gpio1 27 GPIO_ACTIVE_HIGH>; 58 58 59 59 ti,x-min = /bits/ 16 <0x0>; 60 60 ti,x-max = /bits/ 16 <0x0fff>;
+2 -2
arch/arm/boot/dts/omap3-evm-common.dtsi
··· 26 26 regulator-name = "vwl1271"; 27 27 regulator-min-microvolt = <1800000>; 28 28 regulator-max-microvolt = <1800000>; 29 - gpio = <&gpio5 22 0>; /* gpio150 */ 29 + gpio = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* gpio150 */ 30 30 startup-delay-us = <70000>; 31 31 enable-active-high; 32 32 vin-supply = <&vmmc2>; ··· 91 91 tsc2046@0 { 92 92 interrupt-parent = <&gpio6>; 93 93 interrupts = <15 0>; /* gpio175 */ 94 - pendown-gpio = <&gpio6 15 0>; 94 + pendown-gpio = <&gpio6 15 GPIO_ACTIVE_HIGH>; 95 95 }; 96 96 }; 97 97
+5 -5
arch/arm/boot/dts/omap3-gta04.dtsi
··· 77 77 pinctrl-names = "default"; 78 78 pinctrl-0 = <&spi_gpio_pins>; 79 79 80 - gpio-sck = <&gpio1 12 0>; 81 - gpio-miso = <&gpio1 18 0>; 82 - gpio-mosi = <&gpio1 20 0>; 83 - cs-gpios = <&gpio1 19 0>; 80 + gpio-sck = <&gpio1 12 GPIO_ACTIVE_HIGH>; 81 + gpio-miso = <&gpio1 18 GPIO_ACTIVE_HIGH>; 82 + gpio-mosi = <&gpio1 20 GPIO_ACTIVE_HIGH>; 83 + cs-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>; 84 84 num-chipselects = <1>; 85 85 86 86 /* lcd panel */ ··· 118 118 119 119 tv_amp: opa362 { 120 120 compatible = "ti,opa362"; 121 - enable-gpios = <&gpio1 23 0>; 121 + enable-gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; 122 122 123 123 ports { 124 124 #address-cells = <1>;
+1 -1
arch/arm/boot/dts/omap3-gta04a5.dts
··· 12 12 model = "Goldelico GTA04A5"; 13 13 14 14 sound { 15 - ti,jack-det-gpio = <&twl_gpio 2 0>; /* GTA04A5 only */ 15 + ti,jack-det-gpio = <&twl_gpio 2 GPIO_ACTIVE_HIGH>; /* GTA04A5 only */ 16 16 }; 17 17 };
+1 -1
arch/arm/boot/dts/omap3-ldp.dts
··· 200 200 tsc2046@0 { 201 201 interrupt-parent = <&gpio2>; 202 202 interrupts = <22 0>; /* gpio54 */ 203 - pendown-gpio = <&gpio2 22 0>; 203 + pendown-gpio = <&gpio2 22 GPIO_ACTIVE_HIGH>; 204 204 }; 205 205 }; 206 206
+1 -1
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
··· 314 314 interrupt-parent = <&gpio1>; 315 315 interrupts = <8 0>; /* boot6 / gpio_8 */ 316 316 spi-max-frequency = <1000000>; 317 - pendown-gpio = <&gpio1 8 0>; 317 + pendown-gpio = <&gpio1 8 GPIO_ACTIVE_HIGH>; 318 318 vcc-supply = <&reg_vcc3>; 319 319 pinctrl-names = "default"; 320 320 pinctrl-0 = <&tsc2048_pins>;
+2 -2
arch/arm/boot/dts/omap3-lilly-dbb056.dts
··· 114 114 status = "okay"; 115 115 bus-width = <4>; 116 116 vmmc-supply = <&vmmc1>; 117 - cd-gpios = <&gpio6 4 0>; /* gpio_164 */ 118 - wp-gpios = <&gpio6 3 0>; /* gpio_163 */ 117 + cd-gpios = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* gpio_164 */ 118 + wp-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* gpio_163 */ 119 119 pinctrl-names = "default"; 120 120 pinctrl-0 = <&mmc2_pins>; 121 121 ti,dual-volt;
+1 -1
arch/arm/boot/dts/omap3-n950-n9.dtsi
··· 27 27 regulator-name = "VEMMC"; 28 28 regulator-min-microvolt = <2900000>; 29 29 regulator-max-microvolt = <2900000>; 30 - gpio = <&gpio5 29 0>; /* gpio line 157 */ 30 + gpio = <&gpio5 29 GPIO_ACTIVE_HIGH>; /* gpio line 157 */ 31 31 startup-delay-us = <150>; 32 32 enable-active-high; 33 33 };
+1 -1
arch/arm/boot/dts/omap3-overo-base.dtsi
··· 35 35 regulator-name = "hsusb2_vbus"; 36 36 regulator-min-microvolt = <5000000>; 37 37 regulator-max-microvolt = <5000000>; 38 - gpio = <&gpio6 8 0>; /* gpio_168: vbus enable */ 38 + gpio = <&gpio6 8 GPIO_ACTIVE_HIGH>; /* gpio_168: vbus enable */ 39 39 startup-delay-us = <70000>; 40 40 enable-active-high; 41 41 };
+1 -1
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
··· 152 152 153 153 interrupt-parent = <&gpio4>; 154 154 interrupts = <18 0>; /* gpio_114 */ 155 - pendown-gpio = <&gpio4 18 0>; 155 + pendown-gpio = <&gpio4 18 GPIO_ACTIVE_HIGH>; 156 156 157 157 ti,x-min = /bits/ 16 <0x0>; 158 158 ti,x-max = /bits/ 16 <0x0fff>;
+1 -1
arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
··· 163 163 164 164 interrupt-parent = <&gpio4>; 165 165 interrupts = <18 0>; /* gpio_114 */ 166 - pendown-gpio = <&gpio4 18 0>; 166 + pendown-gpio = <&gpio4 18 GPIO_ACTIVE_HIGH>; 167 167 168 168 ti,x-min = /bits/ 16 <0x0>; 169 169 ti,x-max = /bits/ 16 <0x0fff>;
+2 -2
arch/arm/boot/dts/omap3-pandora-common.dtsi
··· 218 218 regulator-always-on; 219 219 regulator-boot-on; 220 220 enable-active-high; 221 - gpio = <&gpio6 4 0>; /* GPIO_164 */ 221 + gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* GPIO_164 */ 222 222 }; 223 223 224 224 /* wg7210 (wifi+bt module) 32k clock buffer */ ··· 607 607 pinctrl-0 = <&penirq_pins>; 608 608 interrupt-parent = <&gpio3>; 609 609 interrupts = <30 0>; /* GPIO_94 */ 610 - pendown-gpio = <&gpio3 30 0>; 610 + pendown-gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; 611 611 vcc-supply = <&vaux4>; 612 612 613 613 ti,x-min = /bits/ 16 <0>;
+2 -2
arch/arm/boot/dts/omap3-tao3530.dtsi
··· 37 37 regulator-name = "hsusb2_vbus"; 38 38 regulator-min-microvolt = <3300000>; 39 39 regulator-max-microvolt = <3300000>; 40 - gpio = <&twl_gpio 18 0>; /* GPIO LEDA */ 40 + gpio = <&twl_gpio 18 GPIO_ACTIVE_HIGH>; /* GPIO LEDA */ 41 41 startup-delay-us = <70000>; 42 42 }; 43 43 ··· 225 225 pinctrl-0 = <&mmc1_pins>; 226 226 vmmc-supply = <&vmmc1>; 227 227 vmmc_aux-supply = <&vsim>; 228 - cd-gpios = <&twl_gpio 0 0>; 228 + cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>; 229 229 bus-width = <8>; 230 230 }; 231 231
+1 -1
arch/arm/boot/dts/omap3-zoom3.dts
··· 44 44 regulator-name = "vwl1271"; 45 45 regulator-min-microvolt = <1800000>; 46 46 regulator-max-microvolt = <1800000>; 47 - gpio = <&gpio4 5 0>; /* gpio101 */ 47 + gpio = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */ 48 48 startup-delay-us = <70000>; 49 49 enable-active-high; 50 50 };
+2 -2
arch/arm/boot/dts/omap4-panda-common.dtsi
··· 68 68 regulator-name = "hsusb1_vbus"; 69 69 regulator-min-microvolt = <3300000>; 70 70 regulator-max-microvolt = <3300000>; 71 - gpio = <&gpio1 1 0>; /* gpio_1 */ 71 + gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>; /* gpio_1 */ 72 72 startup-delay-us = <70000>; 73 73 enable-active-high; 74 74 /* ··· 98 98 regulator-name = "vwl1271"; 99 99 regulator-min-microvolt = <1800000>; 100 100 regulator-max-microvolt = <1800000>; 101 - gpio = <&gpio2 11 0>; 101 + gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>; 102 102 startup-delay-us = <70000>; 103 103 enable-active-high; 104 104 };
+3 -3
arch/arm/boot/dts/omap4-sdp.dts
··· 30 30 regulator-name = "VDD_ETH"; 31 31 regulator-min-microvolt = <3300000>; 32 32 regulator-max-microvolt = <3300000>; 33 - gpio = <&gpio2 16 0>; /* gpio line 48 */ 33 + gpio = <&gpio2 16 GPIO_ACTIVE_HIGH>; /* gpio line 48 */ 34 34 enable-active-high; 35 35 regulator-boot-on; 36 36 }; ··· 155 155 regulator-name = "vwl1271"; 156 156 regulator-min-microvolt = <1800000>; 157 157 regulator-max-microvolt = <1800000>; 158 - gpio = <&gpio2 22 0>; 158 + gpio = <&gpio2 22 GPIO_ACTIVE_HIGH>; 159 159 startup-delay-us = <70000>; 160 160 enable-active-high; 161 161 }; ··· 374 374 375 375 /* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */ 376 376 interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */ 377 - ti,audpwron-gpio = <&gpio4 31 0>; /* gpio line 127 */ 377 + ti,audpwron-gpio = <&gpio4 31 GPIO_ACTIVE_HIGH>; /* gpio line 127 */ 378 378 379 379 vio-supply = <&v1v8>; 380 380 v2v1-supply = <&v2v1>;
+1 -1
arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi
··· 15 15 regulator-name = "vwl1271"; 16 16 regulator-min-microvolt = <1800000>; 17 17 regulator-max-microvolt = <1800000>; 18 - gpio = <&gpio2 11 0>; /* gpio 43 */ 18 + gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>; /* gpio 43 */ 19 19 startup-delay-us = <70000>; 20 20 enable-active-high; 21 21 };
+1 -1
arch/arm/boot/dts/omap4-var-som-om44.dtsi
··· 196 196 197 197 /* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */ 198 198 interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */ 199 - ti,audpwron-gpio = <&gpio6 22 0>; /* gpio 182 */ 199 + ti,audpwron-gpio = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio 182 */ 200 200 201 201 vio-supply = <&v1v8>; 202 202 v2v1-supply = <&v2v1>;
+1 -1
arch/arm/boot/dts/omap4460.dtsi
··· 46 46 0x4a002378 0x18>; 47 47 compatible = "ti,omap4460-bandgap"; 48 48 interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>; /* talert */ 49 - gpios = <&gpio3 22 0>; /* tshut */ 49 + gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; /* tshut */ 50 50 51 51 #thermal-sensor-cells = <0>; 52 52 };
+1 -1
arch/arm/boot/dts/omap5-cm-t54.dts
··· 344 344 345 345 interrupt-parent = <&gpio1>; 346 346 interrupts = <15 0>; /* gpio1_wk15 */ 347 - pendown-gpio = <&gpio1 15 0>; 347 + pendown-gpio = <&gpio1 15 GPIO_ACTIVE_HIGH>; 348 348 349 349 350 350 ti,x-min = /bits/ 16 <0x0>;
+1 -1
arch/arm/boot/dts/omap5-uevm.dts
··· 527 527 pinctrl-0 = <&twl6040_pins>; 528 528 529 529 interrupts = <GIC_SPI 119 IRQ_TYPE_NONE>; /* IRQ_SYS_2N cascaded to gic */ 530 - ti,audpwron-gpio = <&gpio5 13 0>; /* gpio line 141 */ 530 + ti,audpwron-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>; /* gpio line 141 */ 531 531 532 532 vio-supply = <&smps7_reg>; 533 533 v2v1-supply = <&smps9_reg>;