projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1938b58
)
arm64: dts: rockchip: fix resets in tsadc node for rk356x
author
Johan Jonker
<jbx6244@gmail.com>
Thu, 30 Sep 2021 11:05:17 +0000
(13:05 +0200)
committer
Heiko Stuebner
<heiko@sntech.de>
Mon, 18 Oct 2021 18:19:19 +0000
(20:19 +0200)
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
patch
|
blob
|
history
diff --git
a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
index
ea8c0e4
..
46d9552
100644
(file)
--- a/
arch/arm64/boot/dts/rockchip/rk356x.dtsi
+++ b/
arch/arm64/boot/dts/rockchip/rk356x.dtsi
@@
-921,9
+921,8
@@
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";