]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: dts: imx28-tx28: use GPIO flags
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 9 Sep 2014 11:26:01 +0000 (13:26 +0200)
committerShawn Guo <shawn.guo@freescale.com>
Tue, 16 Sep 2014 02:27:18 +0000 (10:27 +0800)
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
arch/arm/boot/dts/imx28-tx28.dts

index 4e790c24ab3005bd2344587eff59b0145fca3494..cfe6b3148dcc79389e5493104920d3239f47175b 100644 (file)
@@ -37,7 +37,7 @@
 
        onewire {
                compatible = "w1-gpio";
-               gpios = <&gpio2 7 0>;
+               gpios = <&gpio2 7 GPIO_ACTIVE_HIGH>;
                status = "disabled";
        };
 
@@ -52,7 +52,7 @@
                        regulator-name = "usb0_vbus";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio0 18 0>;
+                       gpio = <&gpio0 18 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
 
@@ -62,7 +62,7 @@
                        regulator-name = "usb1_vbus";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio3 27 0>;
+                       gpio = <&gpio3 27 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
 
@@ -90,7 +90,7 @@
                        regulator-name = "CAN XCVR";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio1 0 0>;
+                       gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&tx28_flexcan_xcvr_pins>;
                };
                        regulator-name = "LCD POWER";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio1 31 0>;
+                       gpio = <&gpio1 31 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
 
                        regulator-name = "LCD RESET";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio3 30 0>;
+                       gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>;
                        startup-delay-us = <300000>;
                        enable-active-high;
                        regulator-always-on;
 
                user_led: user {
                        label = "Heartbeat";
-                       gpios = <&gpio4 10 0>;
+                       gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
        };
        matrix_keypad: matrix-keypad@0 {
                compatible = "gpio-matrix-keypad";
                col-gpios = <
-                       &gpio5 0 0
-                       &gpio5 1 0
-                       &gpio5 2 0
-                       &gpio5 3 0
+                       &gpio5 0 GPIO_ACTIVE_HIGH
+                       &gpio5 1 GPIO_ACTIVE_HIGH
+                       &gpio5 2 GPIO_ACTIVE_HIGH
+                       &gpio5 3 GPIO_ACTIVE_HIGH
                >;
                row-gpios = <
-                       &gpio5 4 0
-                       &gpio5 5 0
-                       &gpio5 6 0
-                       &gpio5 7 0
+                       &gpio5 4 GPIO_ACTIVE_HIGH
+                       &gpio5 5 GPIO_ACTIVE_HIGH
+                       &gpio5 6 GPIO_ACTIVE_HIGH
+                       &gpio5 7 GPIO_ACTIVE_HIGH
                >;
                /* sample keymap */
                linux,keymap = <
                pinctrl-0 = <&tx28_edt_ft5x06_pins>;
                interrupt-parent = <&gpio2>;
                interrupts = <5 0>;
-               reset-gpios = <&gpio2 6 1>;
-               wake-gpios = <&gpio4 9 0>;
+               reset-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
+               wake-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;
        };
 
        touchscreen: tsc2007@48 {
                pinctrl-0 = <&tx28_tsc2007_pins>;
                interrupt-parent = <&gpio3>;
                interrupts = <20 0>;
-               pendown-gpio = <&gpio3 20 1>;
+               pendown-gpio = <&gpio3 20 GPIO_ACTIVE_LOW>;
                ti,x-plate-ohms = /bits/ 16 <660>;
        };