Skip to content

Commit

Permalink
ARM: dts: imx: ventana: use gpio constants
Browse files Browse the repository at this point in the history 
Use the gpio contants defined in bindings for active high/low

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
  • Loading branch information
Tim Harvey authored and Shawn Guo committed Sep 16, 2014
1 parent e32ba7a commit 326cdb1
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 47 deletions.
23 changes: 12 additions & 11 deletions arch/arm/boot/dts/imx6q-gw5400-a.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "imx6q.dtsi"

/ {
Expand Down Expand Up @@ -40,20 +41,20 @@

led0: user1 {
label = "user1";
gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* 102 -> MX6_PANLEDG */
default-state = "on";
linux,default-trigger = "heartbeat";
};

led1: user2 {
label = "user2";
gpios = <&gpio4 10 0>; /* 106 -> MX6_PANLEDR */
gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>; /* 106 -> MX6_PANLEDR */
default-state = "off";
};

led2: user3 {
label = "user3";
gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* 111 -> MX6_LOCLED# */
default-state = "off";
};
};
Expand All @@ -64,7 +65,7 @@

pps {
compatible = "pps-gpio";
gpios = <&gpio1 5 0>;
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
status = "okay";
};

Expand Down Expand Up @@ -106,7 +107,7 @@
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
Expand Down Expand Up @@ -134,7 +135,7 @@

&ecspi1 {
fsl,spi-num-chipselects = <1>;
cs-gpios = <&gpio3 19 0>;
cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";
Expand All @@ -150,7 +151,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 30 0>;
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
status = "okay";
};

Expand Down Expand Up @@ -331,8 +332,8 @@
compatible = "eeti,egalax_ts";
reg = <0x04>;
interrupt-parent = <&gpio7>;
interrupts = <12 2>; /* gpio7_12 active low */
wakeup-gpios = <&gpio7 12 0>;
interrupts = <12 2>;
wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
};
};

Expand Down Expand Up @@ -462,7 +463,7 @@
};

&pcie {
reset-gpio = <&gpio1 29 0>;
reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>;
status = "okay";

eth1: sky2@8 { /* MAC/PHY on bus 8 */
Expand Down Expand Up @@ -508,7 +509,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
cd-gpios = <&gpio7 0 0>;
cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
vmmc-supply = <&reg_3p3v>;
status = "okay";
};
14 changes: 8 additions & 6 deletions arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/

#include <dt-bindings/gpio/gpio.h>

/ {
/* these are used by bootloader for disabling nodes */
aliases {
Expand All @@ -28,14 +30,14 @@

led0: user1 {
label = "user1";
gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
default-state = "on";
linux,default-trigger = "heartbeat";
};

led1: user2 {
label = "user2";
gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
default-state = "off";
};
};
Expand All @@ -46,7 +48,7 @@

pps {
compatible = "pps-gpio";
gpios = <&gpio1 26 0>;
gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
status = "okay";
};

Expand Down Expand Up @@ -79,7 +81,7 @@
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
Expand All @@ -89,7 +91,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 30 0>;
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
status = "okay";
};

Expand Down Expand Up @@ -279,7 +281,7 @@
};

&pcie {
reset-gpio = <&gpio1 0 0>;
reset-gpio = <&gpio1 0 GPIO_ACTIVE_LOW>;
status = "okay";
};

Expand Down
22 changes: 12 additions & 10 deletions arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/

#include <dt-bindings/gpio/gpio.h>

/ {
/* these are used by bootloader for disabling nodes */
aliases {
Expand Down Expand Up @@ -37,20 +39,20 @@

led0: user1 {
label = "user1";
gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
default-state = "on";
linux,default-trigger = "heartbeat";
};

led1: user2 {
label = "user2";
gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
default-state = "off";
};

led2: user3 {
label = "user3";
gpios = <&gpio4 15 1>; /* 111 - MX6_LOCLED# */
gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
default-state = "off";
};
};
Expand All @@ -61,7 +63,7 @@

pps {
compatible = "pps-gpio";
gpios = <&gpio1 26 0>;
gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
status = "okay";
};

Expand Down Expand Up @@ -113,7 +115,7 @@
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
Expand Down Expand Up @@ -143,7 +145,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 30 0>;
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
status = "okay";
};

Expand Down Expand Up @@ -226,8 +228,8 @@
compatible = "eeti,egalax_ts";
reg = <0x04>;
interrupt-parent = <&gpio7>;
interrupts = <12 2>; /* gpio7_12 active low */
wakeup-gpios = <&gpio7 12 0>;
interrupts = <12 2>;
wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
};
};

Expand Down Expand Up @@ -402,7 +404,7 @@
};

&pcie {
reset-gpio = <&gpio1 29 0>;
reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>;
status = "okay";
};

Expand Down Expand Up @@ -449,7 +451,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
cd-gpios = <&gpio7 0 0>;
cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
vmmc-supply = <&reg_3p3v>;
status = "okay";
};
22 changes: 12 additions & 10 deletions arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/

#include <dt-bindings/gpio/gpio.h>

/ {
/* these are used by bootloader for disabling nodes */
aliases {
Expand Down Expand Up @@ -38,20 +40,20 @@

led0: user1 {
label = "user1";
gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
default-state = "on";
linux,default-trigger = "heartbeat";
};

led1: user2 {
label = "user2";
gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
default-state = "off";
};

led2: user3 {
label = "user3";
gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
default-state = "off";
};
};
Expand All @@ -62,7 +64,7 @@

pps {
compatible = "pps-gpio";
gpios = <&gpio1 26 0>;
gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
status = "okay";
};

Expand Down Expand Up @@ -114,7 +116,7 @@
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
Expand Down Expand Up @@ -150,7 +152,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 30 0>;
phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
status = "okay";
};

Expand Down Expand Up @@ -233,8 +235,8 @@
compatible = "eeti,egalax_ts";
reg = <0x04>;
interrupt-parent = <&gpio1>;
interrupts = <11 2>; /* gpio1_11 active low */
wakeup-gpios = <&gpio1 11 0>;
interrupts = <11 2>;
wakeup-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
};

Expand Down Expand Up @@ -418,7 +420,7 @@
};

&pcie {
reset-gpio = <&gpio1 29 0>;
reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>;
status = "okay";

eth1: sky2@8 { /* MAC/PHY on bus 8 */
Expand Down Expand Up @@ -470,7 +472,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
cd-gpios = <&gpio7 0 0>;
cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
vmmc-supply = <&reg_3p3v>;
status = "okay";
};
Loading

0 comments on commit 326cdb1

Please sign in to comment.