Skip to content

L
linux
Commit 326cdb16 authored by Tim Harvey's avatar Tim Harvey Committed by Shawn Guo
Browse files
Options

ARM: dts: imx: ventana: use gpio constants 

Use the gpio contants defined in bindings for active high/low
Signed-off-by: default avatarTim Harvey <tharvey@gateworks.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent e32ba7a7
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 47 deletions
arch/arm/boot/dts/imx6q-gw5400-a.dts
View file @ 326cdb16
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
*/ */
/dts-v1/; /dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "imx6q.dtsi" #include "imx6q.dtsi"
/ { / {
...@@ -40,20 +41,20 @@ leds { ...@@ -40,20 +41,20 @@ leds {
led0: user1 { led0: user1 {
label = "user1"; label = "user1";
gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* 102 -> MX6_PANLEDG */
default-state = "on"; default-state = "on";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
led1: user2 { led1: user2 {
label = "user2"; label = "user2";
gpios = <&gpio4 10 0>; /* 106 -> MX6_PANLEDR */ gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>; /* 106 -> MX6_PANLEDR */
default-state = "off"; default-state = "off";
}; };
led2: user3 { led2: user3 {
label = "user3"; label = "user3";
gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */ gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* 111 -> MX6_LOCLED# */
default-state = "off"; default-state = "off";
}; };
}; };
...@@ -64,7 +65,7 @@ memory { ...@@ -64,7 +65,7 @@ memory {
pps { pps {
compatible = "pps-gpio"; compatible = "pps-gpio";
gpios = <&gpio1 5 0>; gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -106,7 +107,7 @@ reg_usb_otg_vbus: regulator@3 { ...@@ -106,7 +107,7 @@ reg_usb_otg_vbus: regulator@3 {
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
}; };
...@@ -134,7 +135,7 @@ &audmux { ...@@ -134,7 +135,7 @@ &audmux {
&ecspi1 { &ecspi1 {
fsl,spi-num-chipselects = <1>; fsl,spi-num-chipselects = <1>;
cs-gpios = <&gpio3 19 0>; cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>; pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay"; status = "okay";
...@@ -150,7 +151,7 @@ &fec { ...@@ -150,7 +151,7 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 30 0>; phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -331,8 +332,8 @@ touchscreen: egalax_ts@04 { ...@@ -331,8 +332,8 @@ touchscreen: egalax_ts@04 {
compatible = "eeti,egalax_ts"; compatible = "eeti,egalax_ts";
reg = <0x04>; reg = <0x04>;
interrupt-parent = <&gpio7>; interrupt-parent = <&gpio7>;
interrupts = <12 2>; /* gpio7_12 active low */ interrupts = <12 2>;
wakeup-gpios = <&gpio7 12 0>; wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
}; };
}; };
...@@ -462,7 +463,7 @@ &ldb { ...@@ -462,7 +463,7 @@ &ldb {
}; };
&pcie { &pcie {
reset-gpio = <&gpio1 29 0>; reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
eth1: sky2@8 { /* MAC/PHY on bus 8 */ eth1: sky2@8 { /* MAC/PHY on bus 8 */
...@@ -508,7 +509,7 @@ &usbh1 { ...@@ -508,7 +509,7 @@ &usbh1 {
&usdhc3 { &usdhc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>; pinctrl-0 = <&pinctrl_usdhc3>;
cd-gpios = <&gpio7 0 0>; cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
vmmc-supply = <&reg_3p3v>; vmmc-supply = <&reg_3p3v>;
status = "okay"; status = "okay";
}; };
arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
View file @ 326cdb16
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include <dt-bindings/gpio/gpio.h>
/ { / {
/* these are used by bootloader for disabling nodes */ /* these are used by bootloader for disabling nodes */
aliases { aliases {
...@@ -28,14 +30,14 @@ leds { ...@@ -28,14 +30,14 @@ leds {
led0: user1 { led0: user1 {
label = "user1"; label = "user1";
gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
default-state = "on"; default-state = "on";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
led1: user2 { led1: user2 {
label = "user2"; label = "user2";
gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */ gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
default-state = "off"; default-state = "off";
}; };
}; };
...@@ -46,7 +48,7 @@ memory { ...@@ -46,7 +48,7 @@ memory {
pps { pps {
compatible = "pps-gpio"; compatible = "pps-gpio";
gpios = <&gpio1 26 0>; gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -79,7 +81,7 @@ reg_usb_otg_vbus: regulator@2 { ...@@ -79,7 +81,7 @@ reg_usb_otg_vbus: regulator@2 {
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
}; };
...@@ -89,7 +91,7 @@ &fec { ...@@ -89,7 +91,7 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 30 0>; phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
...@@ -279,7 +281,7 @@ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 ...@@ -279,7 +281,7 @@ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
}; };
&pcie { &pcie {
reset-gpio = <&gpio1 0 0>; reset-gpio = <&gpio1 0 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
View file @ 326cdb16
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include <dt-bindings/gpio/gpio.h>
/ { / {
/* these are used by bootloader for disabling nodes */ /* these are used by bootloader for disabling nodes */
aliases { aliases {
...@@ -37,20 +39,20 @@ leds { ...@@ -37,20 +39,20 @@ leds {
led0: user1 { led0: user1 {
label = "user1"; label = "user1";
gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
default-state = "on"; default-state = "on";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
led1: user2 { led1: user2 {
label = "user2"; label = "user2";
gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */ gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
default-state = "off"; default-state = "off";
}; };
led2: user3 { led2: user3 {
label = "user3"; label = "user3";
gpios = <&gpio4 15 1>; /* 111 - MX6_LOCLED# */ gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
default-state = "off"; default-state = "off";
}; };
}; };
...@@ -61,7 +63,7 @@ memory { ...@@ -61,7 +63,7 @@ memory {
pps { pps {
compatible = "pps-gpio"; compatible = "pps-gpio";
gpios = <&gpio1 26 0>; gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -113,7 +115,7 @@ reg_usb_otg_vbus: regulator@4 { ...@@ -113,7 +115,7 @@ reg_usb_otg_vbus: regulator@4 {
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
}; };
...@@ -143,7 +145,7 @@ &fec { ...@@ -143,7 +145,7 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 30 0>; phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
...@@ -226,8 +228,8 @@ touchscreen: egalax_ts@04 { ...@@ -226,8 +228,8 @@ touchscreen: egalax_ts@04 {
compatible = "eeti,egalax_ts"; compatible = "eeti,egalax_ts";
reg = <0x04>; reg = <0x04>;
interrupt-parent = <&gpio7>; interrupt-parent = <&gpio7>;
interrupts = <12 2>; /* gpio7_12 active low */ interrupts = <12 2>;
wakeup-gpios = <&gpio7 12 0>; wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
}; };
}; };
...@@ -402,7 +404,7 @@ timing0: hsd100pxn1 { ...@@ -402,7 +404,7 @@ timing0: hsd100pxn1 {
}; };
&pcie { &pcie {
reset-gpio = <&gpio1 29 0>; reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
...@@ -449,7 +451,7 @@ &usbh1 { ...@@ -449,7 +451,7 @@ &usbh1 {
&usdhc3 { &usdhc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>; pinctrl-0 = <&pinctrl_usdhc3>;
cd-gpios = <&gpio7 0 0>; cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
vmmc-supply = <&reg_3p3v>; vmmc-supply = <&reg_3p3v>;
status = "okay"; status = "okay";
}; };
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
View file @ 326cdb16
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include <dt-bindings/gpio/gpio.h>
/ { / {
/* these are used by bootloader for disabling nodes */ /* these are used by bootloader for disabling nodes */
aliases { aliases {
...@@ -38,20 +40,20 @@ leds { ...@@ -38,20 +40,20 @@ leds {
led0: user1 { led0: user1 {
label = "user1"; label = "user1";
gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
default-state = "on"; default-state = "on";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
led1: user2 { led1: user2 {
label = "user2"; label = "user2";
gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */ gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
default-state = "off"; default-state = "off";
}; };
led2: user3 { led2: user3 {
label = "user3"; label = "user3";
gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */ gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
default-state = "off"; default-state = "off";
}; };
}; };
...@@ -62,7 +64,7 @@ memory { ...@@ -62,7 +64,7 @@ memory {
pps { pps {
compatible = "pps-gpio"; compatible = "pps-gpio";
gpios = <&gpio1 26 0>; gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -114,7 +116,7 @@ reg_usb_otg_vbus: regulator@4 { ...@@ -114,7 +116,7 @@ reg_usb_otg_vbus: regulator@4 {
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
}; };
...@@ -150,7 +152,7 @@ &fec { ...@@ -150,7 +152,7 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 30 0>; phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
...@@ -233,8 +235,8 @@ touchscreen: egalax_ts@04 { ...@@ -233,8 +235,8 @@ touchscreen: egalax_ts@04 {
compatible = "eeti,egalax_ts"; compatible = "eeti,egalax_ts";
reg = <0x04>; reg = <0x04>;
interrupt-parent = <&gpio1>; interrupt-parent = <&gpio1>;
interrupts = <11 2>; /* gpio1_11 active low */ interrupts = <11 2>;
wakeup-gpios = <&gpio1 11 0>; wakeup-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
}; };
}; };
...@@ -418,7 +420,7 @@ timing0: hsd100pxn1 { ...@@ -418,7 +420,7 @@ timing0: hsd100pxn1 {
}; };
&pcie { &pcie {
reset-gpio = <&gpio1 29 0>; reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
eth1: sky2@8 { /* MAC/PHY on bus 8 */ eth1: sky2@8 { /* MAC/PHY on bus 8 */
...@@ -470,7 +472,7 @@ &usbh1 { ...@@ -470,7 +472,7 @@ &usbh1 {
&usdhc3 { &usdhc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>; pinctrl-0 = <&pinctrl_usdhc3>;
cd-gpios = <&gpio7 0 0>; cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
vmmc-supply = <&reg_3p3v>; vmmc-supply = <&reg_3p3v>;
status = "okay"; status = "okay";
}; };
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
View file @ 326cdb16
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
* http://www.gnu.org/copyleft/gpl.html * http://www.gnu.org/copyleft/gpl.html
*/ */
#include <dt-bindings/gpio/gpio.h>
/ { / {
/* these are used by bootloader for disabling nodes */ /* these are used by bootloader for disabling nodes */
aliases { aliases {
...@@ -38,20 +40,20 @@ leds { ...@@ -38,20 +40,20 @@ leds {
led0: user1 { led0: user1 {
label = "user1"; label = "user1";
gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */
default-state = "on"; default-state = "on";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
led1: user2 { led1: user2 {
label = "user2"; label = "user2";
gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */ gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */
default-state = "off"; default-state = "off";
}; };
led2: user3 { led2: user3 {
label = "user3"; label = "user3";
gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */ gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */
default-state = "off"; default-state = "off";
}; };
}; };
...@@ -62,7 +64,7 @@ memory { ...@@ -62,7 +64,7 @@ memory {
pps { pps {
compatible = "pps-gpio"; compatible = "pps-gpio";
gpios = <&gpio1 26 0>; gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -104,7 +106,7 @@ reg_usb_otg_vbus: regulator@3 { ...@@ -104,7 +106,7 @@ reg_usb_otg_vbus: regulator@3 {
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
}; };
...@@ -140,7 +142,7 @@ &fec { ...@@ -140,7 +142,7 @@ &fec {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet>; pinctrl-0 = <&pinctrl_enet>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-reset-gpios = <&gpio1 30 0>; phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
...@@ -322,8 +324,8 @@ touchscreen: egalax_ts@04 { ...@@ -322,8 +324,8 @@ touchscreen: egalax_ts@04 {
compatible = "eeti,egalax_ts"; compatible = "eeti,egalax_ts";
reg = <0x04>; reg = <0x04>;
interrupt-parent = <&gpio7>; interrupt-parent = <&gpio7>;
interrupts = <12 2>; /* gpio7_12 active low */ interrupts = <12 2>;
wakeup-gpios = <&gpio7 12 0>; wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
}; };
}; };
...@@ -501,7 +503,7 @@ timing0: hsd100pxn1 { ...@@ -501,7 +503,7 @@ timing0: hsd100pxn1 {
}; };
&pcie { &pcie {
reset-gpio = <&gpio1 29 0>; reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
eth1: sky2@8 { /* MAC/PHY on bus 8 */ eth1: sky2@8 { /* MAC/PHY on bus 8 */
...@@ -557,7 +559,7 @@ &usbh1 { ...@@ -557,7 +559,7 @@ &usbh1 {
&usdhc3 { &usdhc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>; pinctrl-0 = <&pinctrl_usdhc3>;
cd-gpios = <&gpio7 0 0>; cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
vmmc-supply = <&reg_3p3v>; vmmc-supply = <&reg_3p3v>;
status = "okay"; status = "okay";
}; };
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