Message ID | 20210213110919.29771-1-dariobin@libero.it |
---|---|
State | Accepted |
Commit | 252ee3c5b98ad3e06921f2794126860b2c65fbf3 |
Delegated to: | Lokesh Vutla |
Headers | show |
Series | arm: dts: sync am33xx-clocks with Linux 5.9-rc7 | expand |
On 13/02/21 4:39 pm, Dario Binacchi wrote: > The commit 6337d53fdf45 ("arm: dts: sync am33xx with Linux 5.9-rc7") > synchronized the am33xx-clocks.dtsi file with Linux 5.9-rc7 with the > exception of two nodes. I think I was wrong and it is better to keep > the two files similar and possibly make changes to the *-u-boot.dtsi > files. > > Signed-off-by: Dario Binacchi <dariobin@libero.it> Applied to u-boot-ti/for-rc branch. Thanks and regards, Lokesh
diff --git a/arch/arm/dts/am33xx-clocks.dtsi b/arch/arm/dts/am33xx-clocks.dtsi index 87c4410ee2..5947a35a74 100644 --- a/arch/arm/dts/am33xx-clocks.dtsi +++ b/arch/arm/dts/am33xx-clocks.dtsi @@ -539,7 +539,7 @@ }; &prcm { - l4_per_cm: l4_per-cm@0 { + per_cm: per-cm@0 { compatible = "ti,omap4-cm"; reg = <0x0 0x400>; #address-cells = <1>; @@ -670,9 +670,9 @@ #size-cells = <1>; ranges = <0 0xa00 0x100>; - l4_cefuse_clkctrl: clk@20 { + l4_cefuse_clkctrl: l4-cefuse-clkctrl@0 { compatible = "ti,clkctrl"; - reg = <0x20 0x4>; + reg = <0x0 0x24>; #clock-cells = <2>; }; };
The commit 6337d53fdf45 ("arm: dts: sync am33xx with Linux 5.9-rc7") synchronized the am33xx-clocks.dtsi file with Linux 5.9-rc7 with the exception of two nodes. I think I was wrong and it is better to keep the two files similar and possibly make changes to the *-u-boot.dtsi files. Signed-off-by: Dario Binacchi <dariobin@libero.it> --- arch/arm/dts/am33xx-clocks.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)