summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-06-29 13:06:08 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-06-29 13:06:08 +0100
commitbf2174540c02192eadd87b711a4bedc0bdfa4d31 (patch)
tree10967c630c3dc87f0dbd9a6e956769dbe2c04d27
parent7addfa8f743d3685d2c93c38a992699f0b7645c2 (diff)
downloadkernel-bf2174540c02192eadd87b711a4bedc0bdfa4d31.tar.gz
kernel-bf2174540c02192eadd87b711a4bedc0bdfa4d31.tar.xz
kernel-bf2174540c02192eadd87b711a4bedc0bdfa4d31.zip
arm64: the tsadc patch is already upstream so drop it
-rw-r--r--arm64-rock960-enable-tsadc.patch35
-rw-r--r--kernel.spec2
2 files changed, 0 insertions, 37 deletions
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 <ezequiel@collabora.com>
-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 <ezequiel@collabora.com>
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
----
- 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 16f5ca9c3..68faab8ed 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -551,8 +551,6 @@ Patch304: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
# https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861
Patch305: arm-sdhci-esdhc-imx-fixes.patch
-Patch306: arm64-rock960-enable-tsadc.patch
-
# Raspberry Pi bits
Patch330: ARM-cpufreq-support-for-Raspberry-Pi.patch