From 9559a3304e5563c76c4a1c4901ab8ea3b6a8a5da Mon Sep 17 00:00:00 2001
From: Sungbo Eo <mans0n@gorani.run>
Date: Sun, 15 Mar 2020 20:56:40 +0900
Subject: [PATCH] oxnas: use dt-bindings macros for GPIO

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---
 .../arch/arm/boot/dts/ox820-akitio-mycloud.dts     | 12 +++++++-----
 .../boot/dts/ox820-cloudengines-pogoplugpro.dts    |  7 ++++---
 .../arch/arm/boot/dts/ox820-mitrastar-stg-212.dts  | 14 ++++++++------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts
index c626e5789e..c0edc8cf84 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts
@@ -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>;
@@ -52,12 +54,12 @@
 		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>;
 	};
 };
 
diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplugpro.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplugpro.dts
index 6f10a94069..d6e239173b 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplugpro.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplugpro.dts
@@ -8,6 +8,7 @@
 
 /dts-v1/;
 #include "ox820.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
 	model = "Cloud Engines PogoPlug Pro";
@@ -39,19 +40,19 @@
 
 		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";
 		};
 	};
diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg-212.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg-212.dts
index 4610aab883..6abab23586 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg-212.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg-212.dts
@@ -2,6 +2,7 @@
 
 #include "ox820.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
@@ -37,12 +38,12 @@
 
 		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>;
 		};
 	};
@@ -51,15 +52,15 @@
 		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>;
 	};
 };
-- 
2.30.2