diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-30 07:43:21 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-30 07:43:21 +0200 |
| commit | ea44735f1f819b1fe413866c72daaac609ed5247 (patch) | |
| tree | 18adda1f2790fe9cab63514d13011f518bcbaf02 | |
| parent | 24c17a30979ccdf64420522243c246b5f64c57b1 (diff) | |
| parent | bf2174540c02192eadd87b711a4bedc0bdfa4d31 (diff) | |
| download | kernel-ea44735f1f819b1fe413866c72daaac609ed5247.tar.gz kernel-ea44735f1f819b1fe413866c72daaac609ed5247.tar.xz kernel-ea44735f1f819b1fe413866c72daaac609ed5247.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
| -rw-r--r-- | arm64-rock960-enable-tsadc.patch | 35 | ||||
| -rw-r--r-- | kernel.spec | 2 |
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 41a3a7a08..fca78bab4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -568,8 +568,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 |