From d2ab1f26e1b33970a6ccda18633a681a7730665e Mon Sep 17 00:00:00 2001
From: Stephen <stephen@vamrs.com>
Date: Mon, 21 Oct 2019 12:54:51 +0800
Subject: [PATCH 76/97] overlays-rockpi4: add w1-gpio4-30

Support devices such as DS18B20.

Signed-off-by: Stephen <stephen@vamrs.com>
---
 .../dts/rockchip/overlays-rockpi4/Makefile    |  3 +-
 .../boot/dts/rockchip/overlays-rockpi4/README |  6 ++++
 .../rockchip/overlays-rockpi4/hw_intfc.conf   |  5 ++-
 .../overlays-rockpi4/w1-gpio4-30-overlay.dts  | 31 +++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/overlays-rockpi4/w1-gpio4-30-overlay.dts

diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile
index 85d76b2e59db..7f063a5258b1 100644
--- a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile
+++ b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile
@@ -16,7 +16,8 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 	raspberrypi-7-inch-lcd.dtbo \
 	cpufreq.dtbo \
 	imx219.dtbo \
-	ov5647.dtbo
+	ov5647.dtbo \
+	w1-gpio4-30.dtbo
 
 targets += dtbs dtbs_install
 targets += $(dtbo-y)
diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/README b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/README
index 5cef50b9e0dd..24b01d82a341 100644
--- a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/README
+++ b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/README
@@ -174,3 +174,9 @@ Name:   spi1-flash
 Info:   Overlay for activation of spi flash.
         Need set: intfc:uart4=off intfc:spi1=on
 Load:   intfc:dtoverlay=spi1-flash
+
+
+Name:   w1-gpio4-30
+Info:   Overlay for activation of 1-wire on GPIO4_D6 for devices such as
+        DS18B20.
+Load:   intfc:dtoverlay=w1-gpio4-30
diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf
index 024fe765fef4..15661550675d 100644
--- a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf
+++ b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf
@@ -63,4 +63,7 @@ intfc:dtoverlay=console-on-ttyS2
 #intfc:dtoverlay=imx219
 
 # Add ov5647 camera module support. Need disabled imx219 camera module.
-#intfc:dtoverlay=ov5647
\ No newline at end of file
+#intfc:dtoverlay=ov5647
+
+# Add w1 on GPIO4_D6 to support devices such as DS18B20.
+#intfc:dtoverlay=w1-gpio4-30
diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpi4/w1-gpio4-30-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/w1-gpio4-30-overlay.dts
new file mode 100644
index 000000000000..ad21c50dd5fc
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/w1-gpio4-30-overlay.dts
@@ -0,0 +1,31 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "rockchip,rockpi","rockchip,rk3399";
+
+	fragment@0 {
+		target-path = "/";
+
+		__overlay__ {
+
+			w1: onewire@0 {
+				compatible = "w1-gpio";
+				pinctrl-names = "default";
+				pinctrl-0 = <&w1_pins>;
+				gpios = <&gpio4 30 0>;
+				status = "okay";
+			};
+		};
+	};
+
+	fragment@1 {
+		target = <&gpio4>;
+
+		__overlay__ {
+			w1_pins: w1_pins {
+				rockchip,pins = <4 30 0 &pcfg_pull_none>;
+			};
+		};
+	};
+};
-- 
2.25.1