From 1ccf10d7d50433093fd6c90e2c4b61efcc8f375e Mon Sep 17 00:00:00 2001
From: Hyeonki Hong <hhk7734@gmail.com>
Date: Mon, 25 May 2020 17:22:45 +0900
Subject: [PATCH] ODROID-COMMON: arm64/dts: move onewire node to each overlay
 directory

Change-Id: Id0262986d0faceba5997e8bff9d89833aff8f5a0
---
 .../boot/dts/amlogic/meson64_odroidc4.dts     |  5 -----
 .../boot/dts/amlogic/meson64_odroidn2.dts     |  6 ------
 .../dts/amlogic/overlays/odroidc4/Makefile    |  3 ++-
 .../dts/amlogic/overlays/odroidc4/onewire.dts | 19 +++++++++++++++++++
 .../dts/amlogic/overlays/odroidn2/Makefile    |  3 ++-
 .../dts/amlogic/overlays/odroidn2/onewire.dts | 19 +++++++++++++++++++
 6 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidc4/onewire.dts
 create mode 100644 arch/arm64/boot/dts/amlogic/overlays/odroidn2/onewire.dts

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
index 186fa38f005e..0525e7d6fb07 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
@@ -766,11 +766,6 @@
 	gpio-reset {
 		/delete-node/ usb_hub_en;
 	};
-	onewire:onewire {
-		compatible = "w1-gpio";
-		gpios = <&gpio GPIOX_5 GPIO_ACTIVE_HIGH>;
-		status = "disabled";
-	};
 }; /* end of / */
 
 &audiobus {
diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
index 22d8f1aef0e4..f4056f3347c9 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
@@ -460,12 +460,6 @@
 		status = "ok";
 	};
 
-	onewire:onewire {
-		compatible = "w1-gpio";
-		gpios = <&gpio GPIOA_13 GPIO_ACTIVE_HIGH>;
-		status = "disabled";
-	};
-
 	pwmgpio:pwmgpio {
 		compatible = "pwm-gpio";
 		#pwm-cells = <3>;
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
index aa7cd0016b8c..5400d719c417 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
@@ -10,7 +10,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo		\
 					hktft35.dtbo		\
 					ads7846.dtbo		\
 					sx865x-i2c1.dtbo	\
-					pcf8563.dtbo
+					pcf8563.dtbo		\
+					onewire.dtbo
 
 targets	+= $(dtbo-y)
 always	:= $(dtbo-y)
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/onewire.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/onewire.dts
new file mode 100644
index 000000000000..24745fc97fda
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/onewire.dts
@@ -0,0 +1,19 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	fragment@0 {
+		target-path = "/";
+
+		__overlay__ {
+			onewire:onewire {
+				compatible = "w1-gpio";
+				gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
+				status = "okay";
+			};
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
index d5785d1c8fd4..bf9081f67b5f 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
@@ -10,7 +10,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDN2) += spi0.dtbo		\
 					ads7846.dtbo		\
 					sx865x-i2c1.dtbo	\
 					saradc.dtbo		\
-					irblaster.dtbo
+					irblaster.dtbo		\
+					onewire.dtbo
 
 targets	+= $(dtbo-y)
 always	:= $(dtbo-y)
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/onewire.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/onewire.dts
new file mode 100644
index 000000000000..24745fc97fda
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/onewire.dts
@@ -0,0 +1,19 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	fragment@0 {
+		target-path = "/";
+
+		__overlay__ {
+			onewire:onewire {
+				compatible = "w1-gpio";
+				gpios = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
+				status = "okay";
+			};
+		};
+	};
+};