38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 5c9e66c6b75a754025c74bde7b7a6c52674d8aa1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Johan Jonker <jbx6244@gmail.com>
|
||
|
|
Date: Thu, 30 Sep 2021 13:05:17 +0200
|
||
|
|
Subject: [PATCH 084/478] arm64: dts: rockchip: fix resets in tsadc node for
|
||
|
|
rk356x
|
||
|
|
|
||
|
|
In the rockchip_thermal.c driver we now get the resets with
|
||
|
|
a devm_reset_control_array_get() function, so remove
|
||
|
|
the reset-names property as it is no longer needed.
|
||
|
|
Although no longer required in rockchip-thermal.yaml
|
||
|
|
sort tsadc-apb as first item.
|
||
|
|
|
||
|
|
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
|
||
|
|
Link: https://lore.kernel.org/r/20210930110517.14323-4-jbx6244@gmail.com
|
||
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||
|
|
---
|
||
|
|
arch/arm64/boot/dts/rockchip/rk356x.dtsi | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||
|
|
index ea8c0e4d71a1..46d9552f6028 100644
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||
|
|
@@ -921,9 +921,8 @@ tsadc: tsadc@fe710000 {
|
||
|
|
assigned-clock-rates = <17000000>, <700000>;
|
||
|
|
clocks = <&cru CLK_TSADC>, <&cru PCLK_TSADC>;
|
||
|
|
clock-names = "tsadc", "apb_pclk";
|
||
|
|
- resets = <&cru SRST_TSADC>, <&cru SRST_P_TSADC>,
|
||
|
|
+ resets = <&cru SRST_P_TSADC>, <&cru SRST_TSADC>,
|
||
|
|
<&cru SRST_TSADCPHY>;
|
||
|
|
- reset-names = "tsadc", "tsadc-apb", "tsadc-phy";
|
||
|
|
rockchip,grf = <&grf>;
|
||
|
|
rockchip,hw-tshut-temp = <95000>;
|
||
|
|
pinctrl-names = "init", "default", "sleep";
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|