From: Rocky Hao <rocky.hao@rock-chips.com>
Date: Fri, 17 Mar 2017 02:19:05 +0000 (+0800)
Subject: arm64: dts: rockchip: update tsadc node for rk3368
X-Git-Tag: firefly_0821_release~277
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=112fa9a9223dfa3cae856d2e4424321363588c25

arm64: dts: rockchip: update tsadc node for rk3368

Change-Id: I0c99dcc6b5515639a496b915832542c3b844f4c8
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index c3a29e31c953..4845d82b80e3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -662,19 +662,18 @@
 	};
 
 	tsadc: tsadc@ff280000 {
-		compatible = "rockchip,rk3368-tsadc";
+		compatible = "rockchip,rk3368-tsadc-legacy";
 		reg = <0x0 0xff280000 0x0 0x100>;
 		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;
 		clock-names = "tsadc", "apb_pclk";
+		clock-frequency = <32768>;
 		resets = <&cru SRST_TSADC>;
 		reset-names = "tsadc-apb";
-		pinctrl-names = "init", "default", "sleep";
-		pinctrl-0 = <&otp_gpio>;
-		pinctrl-1 = <&otp_out>;
-		pinctrl-2 = <&otp_gpio>;
+		nvmem-cells = <&temp_adjust>;
+		nvmem-cell-names = "temp_adjust";
 		#thermal-sensor-cells = <1>;
-		rockchip,hw-tshut-temp = <95000>;
+		hw-shut-temp = <95000>;
 		status = "disabled";
 	};
 
@@ -1653,16 +1652,6 @@
 			};
 		};
 
-		tsadc {
-			otp_gpio: otp-gpio {
-				rockchip,pins = <0 3 RK_FUNC_GPIO &pcfg_pull_none>;
-			};
-
-			otp_out: otp-out {
-				rockchip,pins = <0 3 RK_FUNC_1 &pcfg_pull_none>;
-			};
-		};
-
 		uart0 {
 			uart0_xfer: uart0-xfer {
 				rockchip,pins = <2 24 RK_FUNC_1 &pcfg_pull_up>,