oxnas: use dt-bindings macros for GPIO
authorSungbo Eo <mans0n@gorani.run>
Sun, 15 Mar 2020 11:56:40 +0000 (20:56 +0900)
committerSungbo Eo <mans0n@gorani.run>
Mon, 16 Mar 2020 08:16:30 +0000 (17:16 +0900)
Signed-off-by: Sungbo Eo <mans0n@gorani.run>
target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts
target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplugpro.dts
target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg-212.dts

index c626e5789ee6a6ccccfd16c37641c21278926341..c0edc8cf842676df7f700631d8e166a9053aad41 100644 (file)
@@ -2,6 +2,7 @@
 
 #include "ox820.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
@@ -31,7 +32,8 @@
 
        i2c-gpio {
                compatible = "i2c-gpio";
-               gpios = <&gpio1 9 0 &gpio1 10 0>;
+               gpios = <&gpio1  9 GPIO_ACTIVE_HIGH
+                        &gpio1 10 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_i2c>;
                i2c-gpio,delay-us = <10>;
                poll-interval = <100>;
                power {
                        label = "power";
-                       gpios = <&gpio0 11 1>;
+                       gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                };
                reset {
                        label = "reset";
-                       gpios = <&gpio1 6 1>;
+                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
        };
@@ -68,7 +70,7 @@
                pinctrl-0 = <&pinctrl_leds>;
                led_status: status {
                        label = "akitio:red:status";
-                       gpios = <&gpio0 29 0>;
+                       gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -76,7 +78,7 @@
                compatible = "gpio-poweroff";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_poweroff>;
-               gpios = <&gpio1 13 2>;
+               gpios = <&gpio1 13 GPIO_SINGLE_ENDED>;
        };
 };
 
index 6f10a9406914827b6d44e80cc0040b717c635048..d6e239173b17e0ff095e0831311c82508f7a4902 100644 (file)
@@ -8,6 +8,7 @@
 
 /dts-v1/;
 #include "ox820.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
        model = "Cloud Engines PogoPlug Pro";
 
                led_status: blue {
                        label = "pogoplug:blue";
-                       gpios = <&gpio0 2 0>;
+                       gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
 
                led_warn: orange {
                        label = "pogoplug:orange";
-                       gpios = <&gpio1 16 1>;
+                       gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
 
                led_act: green {
                        label = "pogoplug:green";
-                       gpios = <&gpio1 17 1>;
+                       gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
        };
index 4610aab88344e9a752b42febb3bf779bf1bd2acc..6abab23586eeb58f42c19d7dd890fbc39c2ad20a 100644 (file)
@@ -2,6 +2,7 @@
 
 #include "ox820.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
 
                reset {
                        label = "reset";
-                       gpios = <&gpio1 11 1>;
+                       gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
                copy {
                        label = "copy";
-                       gpios = <&gpio1 13 1>;
+                       gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_COPY>;
                };
        };
                compatible = "gpio-leds";
                led_status: status {
                        label = "zyxel:blue:status";
-                       gpios = <&gpio1 5 0>;
+                       gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
                };
                led_warn: status2 {
                        label = "zyxel:red:status";
-                       gpios = <&gpio1 6 1>;
+                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
                };
                copy {
                        label = "zyxel:orange:copy";
-                       gpios = <&gpio1 8 1>;
+                       gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ehci_port1>, <&ehci_port2>;
                        linux,default-trigger = "usbport";
                };
@@ -67,7 +68,8 @@
 
        i2c-gpio {
                compatible = "i2c-gpio";
-               gpios = <&gpio1 9 0 &gpio1 10 0>;
+               gpios = <&gpio1  9 GPIO_ACTIVE_HIGH
+                        &gpio1 10 GPIO_ACTIVE_HIGH>;
                i2c-gpio,delay-us = <10>;
        };
 };