Skip to content

L
linux
Commit 3a637e00 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Tony Lindgren
Browse files
Options

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: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 79a4e64c
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
arch/arm/boot/dts/omap2420-n8x0-common.dtsi
View file @ 3a637e00
......@@ -9,9 +9,9 @@ memory {
ocp {
i2c@0 {
compatible = "i2c-cbus-gpio";
gpios = <&gpio3 2 0 /* gpio66 clk */
&gpio3 1 0 /* gpio65 dat */
&gpio3 0 0 /* gpio64 sel */
gpios = <&gpio3 2 GPIO_ACTIVE_HIGH /* gpio66 clk */
&gpio3 1 GPIO_ACTIVE_HIGH /* gpio65 dat */
&gpio3 0 GPIO_ACTIVE_HIGH /* gpio64 sel */
>;
#address-cells = <1>;
#size-cells = <0>;
......
arch/arm/boot/dts/omap3-beagle-xm.dts
View file @ 3a637e00
......@@ -80,7 +80,7 @@ hsusb2_power: hsusb2_power_reg {
regulator-name = "hsusb2_vbus";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&twl_gpio 18 0>; /* GPIO LEDA */
gpio = <&twl_gpio 18 GPIO_ACTIVE_HIGH>; /* GPIO LEDA */
startup-delay-us = <70000>;
};
......
arch/arm/boot/dts/omap3-beagle.dts
View file @ 3a637e00
......@@ -55,7 +55,7 @@ hsusb2_power: hsusb2_power_reg {
regulator-name = "hsusb2_vbus";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&twl_gpio 18 0>; /* GPIO LEDA */
gpio = <&twl_gpio 18 GPIO_ACTIVE_HIGH>; /* GPIO LEDA */
startup-delay-us = <70000>;
};
......
arch/arm/boot/dts/omap3-cm-t3x.dtsi
View file @ 3a637e00
......@@ -224,7 +224,7 @@ ads7846@0 {
interrupt-parent = <&gpio2>;
interrupts = <25 0>; /* gpio_57 */
pendown-gpio = <&gpio2 25 0>;
pendown-gpio = <&gpio2 25 GPIO_ACTIVE_HIGH>;
ti,x-min = /bits/ 16 <0x0>;
ti,x-max = /bits/ 16 <0x0fff>;
......
arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
View file @ 3a637e00
......@@ -54,7 +54,7 @@ ads7846@0 {
interrupt-parent = <&gpio1>;
interrupts = <27 0>; /* gpio_27 */
pendown-gpio = <&gpio1 27 0>;
pendown-gpio = <&gpio1 27 GPIO_ACTIVE_HIGH>;
ti,x-min = /bits/ 16 <0x0>;
ti,x-max = /bits/ 16 <0x0fff>;
......
arch/arm/boot/dts/omap3-evm-common.dtsi
View file @ 3a637e00
......@@ -26,7 +26,7 @@ wl12xx_vmmc: wl12xx_vmmc {
regulator-name = "vwl1271";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&gpio5 22 0>; /* gpio150 */
gpio = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* gpio150 */
startup-delay-us = <70000>;
enable-active-high;
vin-supply = <&vmmc2>;
......@@ -91,7 +91,7 @@ &mcspi1 {
tsc2046@0 {
interrupt-parent = <&gpio6>;
interrupts = <15 0>; /* gpio175 */
pendown-gpio = <&gpio6 15 0>;
pendown-gpio = <&gpio6 15 GPIO_ACTIVE_HIGH>;
};
};
......
arch/arm/boot/dts/omap3-gta04.dtsi
View file @ 3a637e00
......@@ -77,10 +77,10 @@ spi_lcd {
pinctrl-names = "default";
pinctrl-0 = <&spi_gpio_pins>;
gpio-sck = <&gpio1 12 0>;
gpio-miso = <&gpio1 18 0>;
gpio-mosi = <&gpio1 20 0>;
cs-gpios = <&gpio1 19 0>;
gpio-sck = <&gpio1 12 GPIO_ACTIVE_HIGH>;
gpio-miso = <&gpio1 18 GPIO_ACTIVE_HIGH>;
gpio-mosi = <&gpio1 20 GPIO_ACTIVE_HIGH>;
cs-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
num-chipselects = <1>;
/* lcd panel */
......@@ -118,7 +118,7 @@ tv_connector_in: endpoint {
tv_amp: opa362 {
compatible = "ti,opa362";
enable-gpios = <&gpio1 23 0>;
enable-gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
ports {
#address-cells = <1>;
......
arch/arm/boot/dts/omap3-gta04a5.dts
View file @ 3a637e00
......@@ -12,6 +12,6 @@ / {
model = "Goldelico GTA04A5";
sound {
ti,jack-det-gpio = <&twl_gpio 2 0>; /* GTA04A5 only */
ti,jack-det-gpio = <&twl_gpio 2 GPIO_ACTIVE_HIGH>; /* GTA04A5 only */
};
};
arch/arm/boot/dts/omap3-ldp.dts
View file @ 3a637e00
......@@ -200,7 +200,7 @@ &mcspi1 {
tsc2046@0 {
interrupt-parent = <&gpio2>;
interrupts = <22 0>; /* gpio54 */
pendown-gpio = <&gpio2 22 0>;
pendown-gpio = <&gpio2 22 GPIO_ACTIVE_HIGH>;
};
};
......
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
View file @ 3a637e00
......@@ -314,7 +314,7 @@ tsc2046@0 {
interrupt-parent = <&gpio1>;
interrupts = <8 0>; /* boot6 / gpio_8 */
spi-max-frequency = <1000000>;
pendown-gpio = <&gpio1 8 0>;
pendown-gpio = <&gpio1 8 GPIO_ACTIVE_HIGH>;
vcc-supply = <&reg_vcc3>;
pinctrl-names = "default";
pinctrl-0 = <&tsc2048_pins>;
......
arch/arm/boot/dts/omap3-lilly-dbb056.dts
View file @ 3a637e00
......@@ -114,8 +114,8 @@ &mmc2 {
status = "okay";
bus-width = <4>;
vmmc-supply = <&vmmc1>;
cd-gpios = <&gpio6 4 0>; /* gpio_164 */
wp-gpios = <&gpio6 3 0>; /* gpio_163 */
cd-gpios = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* gpio_164 */
wp-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* gpio_163 */
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
ti,dual-volt;
......
arch/arm/boot/dts/omap3-n950-n9.dtsi
View file @ 3a637e00
......@@ -27,7 +27,7 @@ vemmc: fixedregulator@0 {
regulator-name = "VEMMC";
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <2900000>;
gpio = <&gpio5 29 0>; /* gpio line 157 */
gpio = <&gpio5 29 GPIO_ACTIVE_HIGH>; /* gpio line 157 */
startup-delay-us = <150>;
enable-active-high;
};
......
arch/arm/boot/dts/omap3-overo-base.dtsi
View file @ 3a637e00
......@@ -35,7 +35,7 @@ hsusb2_power: hsusb2_power_reg {
regulator-name = "hsusb2_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio6 8 0>; /* gpio_168: vbus enable */
gpio = <&gpio6 8 GPIO_ACTIVE_HIGH>; /* gpio_168: vbus enable */
startup-delay-us = <70000>;
enable-active-high;
};
......
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
View file @ 3a637e00
......@@ -152,7 +152,7 @@ ads7846@0 {
interrupt-parent = <&gpio4>;
interrupts = <18 0>; /* gpio_114 */
pendown-gpio = <&gpio4 18 0>;
pendown-gpio = <&gpio4 18 GPIO_ACTIVE_HIGH>;
ti,x-min = /bits/ 16 <0x0>;
ti,x-max = /bits/ 16 <0x0fff>;
......
arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
View file @ 3a637e00
......@@ -163,7 +163,7 @@ ads7846@0 {
interrupt-parent = <&gpio4>;
interrupts = <18 0>; /* gpio_114 */
pendown-gpio = <&gpio4 18 0>;
pendown-gpio = <&gpio4 18 GPIO_ACTIVE_HIGH>;
ti,x-min = /bits/ 16 <0x0>;
ti,x-max = /bits/ 16 <0x0fff>;
......
arch/arm/boot/dts/omap3-pandora-common.dtsi
View file @ 3a637e00
......@@ -218,7 +218,7 @@ usb_host_5v: fixed-regulator-usb_host_5v {
regulator-always-on;
regulator-boot-on;
enable-active-high;
gpio = <&gpio6 4 0>; /* GPIO_164 */
gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* GPIO_164 */
};
/* wg7210 (wifi+bt module) 32k clock buffer */
......@@ -607,7 +607,7 @@ tsc2046@0 {
pinctrl-0 = <&penirq_pins>;
interrupt-parent = <&gpio3>;
interrupts = <30 0>; /* GPIO_94 */
pendown-gpio = <&gpio3 30 0>;
pendown-gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>;
vcc-supply = <&vaux4>;
ti,x-min = /bits/ 16 <0>;
......
arch/arm/boot/dts/omap3-tao3530.dtsi
View file @ 3a637e00
......@@ -37,7 +37,7 @@ hsusb2_power: hsusb2_power_reg {
regulator-name = "hsusb2_vbus";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&twl_gpio 18 0>; /* GPIO LEDA */
gpio = <&twl_gpio 18 GPIO_ACTIVE_HIGH>; /* GPIO LEDA */
startup-delay-us = <70000>;
};
......@@ -225,7 +225,7 @@ &mmc1 {
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>;
cd-gpios = <&twl_gpio 0 0>;
cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>;
bus-width = <8>;
};
......
arch/arm/boot/dts/omap3-zoom3.dts
View file @ 3a637e00
......@@ -44,7 +44,7 @@ wl12xx_vmmc: wl12xx_vmmc {
regulator-name = "vwl1271";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&gpio4 5 0>; /* gpio101 */
gpio = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */
startup-delay-us = <70000>;
enable-active-high;
};
......
arch/arm/boot/dts/omap4-panda-common.dtsi
View file @ 3a637e00
......@@ -68,7 +68,7 @@ hsusb1_power: hsusb1_power_reg {
regulator-name = "hsusb1_vbus";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio1 1 0>; /* gpio_1 */
gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>; /* gpio_1 */
startup-delay-us = <70000>;
enable-active-high;
/*
......@@ -98,7 +98,7 @@ wl12xx_vmmc: wl12xx_vmmc {
regulator-name = "vwl1271";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&gpio2 11 0>;
gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
startup-delay-us = <70000>;
enable-active-high;
};
......
arch/arm/boot/dts/omap4-sdp.dts
View file @ 3a637e00
......@@ -30,7 +30,7 @@ vdd_eth: fixedregulator-vdd-eth {
regulator-name = "VDD_ETH";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio2 16 0>; /* gpio line 48 */
gpio = <&gpio2 16 GPIO_ACTIVE_HIGH>; /* gpio line 48 */
enable-active-high;
regulator-boot-on;
};
......@@ -155,7 +155,7 @@ wl12xx_vmmc: wl12xx_vmmc {
regulator-name = "vwl1271";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&gpio2 22 0>;
gpio = <&gpio2 22 GPIO_ACTIVE_HIGH>;
startup-delay-us = <70000>;
enable-active-high;
};
......@@ -374,7 +374,7 @@ twl6040: twl@4b {
/* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */
ti,audpwron-gpio = <&gpio4 31 0>; /* gpio line 127 */
ti,audpwron-gpio = <&gpio4 31 GPIO_ACTIVE_HIGH>; /* gpio line 127 */
vio-supply = <&v1v8>;
v2v1-supply = <&v2v1>;
......
arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi
View file @ 3a637e00
......@@ -15,7 +15,7 @@ wl12xx_vmmc: wl12xx_vmmc {
regulator-name = "vwl1271";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&gpio2 11 0>; /* gpio 43 */
gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>; /* gpio 43 */
startup-delay-us = <70000>;
enable-active-high;
};
......
arch/arm/boot/dts/omap4-var-som-om44.dtsi
View file @ 3a637e00
......@@ -196,7 +196,7 @@ twl6040: twl@4b {
/* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */
ti,audpwron-gpio = <&gpio6 22 0>; /* gpio 182 */
ti,audpwron-gpio = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio 182 */
vio-supply = <&v1v8>;
v2v1-supply = <&v2v1>;
......
arch/arm/boot/dts/omap4460.dtsi
View file @ 3a637e00
......@@ -46,7 +46,7 @@ bandgap: bandgap {
0x4a002378 0x18>;
compatible = "ti,omap4460-bandgap";
interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>; /* talert */
gpios = <&gpio3 22 0>; /* tshut */
gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; /* tshut */
#thermal-sensor-cells = <0>;
};
......
arch/arm/boot/dts/omap5-cm-t54.dts
View file @ 3a637e00
......@@ -344,7 +344,7 @@ ads7846@0 {
interrupt-parent = <&gpio1>;
interrupts = <15 0>; /* gpio1_wk15 */
pendown-gpio = <&gpio1 15 0>;
pendown-gpio = <&gpio1 15 GPIO_ACTIVE_HIGH>;
ti,x-min = /bits/ 16 <0x0>;
......
arch/arm/boot/dts/omap5-uevm.dts
View file @ 3a637e00
......@@ -527,7 +527,7 @@ twl6040: twl@4b {
pinctrl-0 = <&twl6040_pins>;
interrupts = <GIC_SPI 119 IRQ_TYPE_NONE>; /* IRQ_SYS_2N cascaded to gic */
ti,audpwron-gpio = <&gpio5 13 0>; /* gpio line 141 */
ti,audpwron-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>; /* gpio line 141 */
vio-supply = <&smps7_reg>;
v2v1-supply = <&smps9_reg>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7