From cd57c4f398d057e6fde41dd91c64fcfb9b7c96b9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 29 Jun 2019 13:07:58 +0100 Subject: arm64: the tsadc patch is already upstream so drop it --- arm64-rock960-enable-tsadc.patch | 35 ----------------------------------- kernel.spec | 2 -- 2 files changed, 37 deletions(-) delete mode 100644 arm64-rock960-enable-tsadc.patch diff --git a/arm64-rock960-enable-tsadc.patch b/arm64-rock960-enable-tsadc.patch deleted file mode 100644 index 53d5303c2..000000000 --- a/arm64-rock960-enable-tsadc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 02260a619efe574d0f6c2a4420b8b76c6802294e Mon Sep 17 00:00:00 2001 -From: Ezequiel Garcia -Date: Fri, 15 Feb 2019 12:25:39 -0300 -Subject: arm64: dts: rockchip: Enable tsadc device on rock960 - -Enable the thermal sensor. This device also provides -temperature shutdown protection. The shutdown value is -set at 110C, as tested by the vendor. - -Signed-off-by: Ezequiel Garcia -Signed-off-by: Heiko Stuebner ---- - arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi -index e40e66e33a5e..2927db4dda9d 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi -@@ -527,6 +527,13 @@ - status = "okay"; - }; - -+&tsadc { -+ rockchip,hw-tshut-mode = <1>; -+ rockchip,hw-tshut-polarity = <1>; -+ rockchip,hw-tshut-temp = <110000>; -+ status = "okay"; -+}; -+ - &uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; --- -cgit 1.2-0.3.lf.el7 diff --git a/kernel.spec b/kernel.spec index a89d6af5d..cb9462352 100644 --- a/kernel.spec +++ b/kernel.spec @@ -552,8 +552,6 @@ Patch305: qcom-msm89xx-fixes.patch # https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861 Patch306: arm-sdhci-esdhc-imx-fixes.patch -Patch307: arm64-rock960-enable-tsadc.patch - Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch Patch331: watchdog-bcm2835_wdt-Fix-module-autoload.patch -- cgit