Skip to contentSkip to conversation

arm64: dts: allwinner: h6: Switch to macros for RSB clock/reset indices

PATCH In review Chen-Yu Tsai 3 participants 3 messages Mar 1, 2021 – Mar 2, 2021

Subsystems (2)
lore
Share & tools
lore

Chen-Yu Tsai

author maintainer
#0 lore raw

PATCH 1/1 arm64: dts: allwinner: h6: Switch to macros for RSB clock/reset indices

From: Chen-Yu Tsai <[email protected]>

The macros for the clock and reset indices for the RSB hardware block were replaced with raw numbers when the RSB controller node was added. This was done to avoid cross-tree dependencies.

Now that both the clk and DT changes have been merged, we can switch back to using the macros.

Fixes aaad900757a6 ("arm64: dts: allwinner: h6: Add RSB controller node")

---

Small patch split out from the H6 RSB clock support patch. This should be merged for v5.12.

---
 arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +2 -2
index 49e979794094..af8b7d0ef750 100644
@@ -995,9 +995,9 @@ r_rsb: rsb@7083000 {
 			compatible = "allwinner,sun8i-a23-rsb";
 			reg = <0x07083000 0x400>;
 			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&r_ccu 13>;
+			clocks = <&r_ccu CLK_R_APB2_RSB>;
 			clock-frequency = <3000000>;
-			resets = <&r_ccu 7>;
+			resets = <&r_ccu RST_R_APB2_RSB>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&r_rsb_pins>;
 			status = "disabled";
Signature · 7 lines
2.30.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Reviewed-by on v1 1/1
#1 lore raw

Hi Chen-Yu,

Dne ponedeljek, 01. marec 2021 ob 17:23:09 CET je Chen-Yu Tsai napisal(a):

Quoted 11 lines

From: Chen-Yu Tsai <[email protected]>

The macros for the clock and reset indices for the RSB hardware block were replaced with raw numbers when the RSB controller node was added. This was done to avoid cross-tree dependencies.

Now that both the clk and DT changes have been merged, we can switch back to using the macros.

Fixes aaad900757a6 ("arm64: dts: allwinner: h6: Add RSB controller node")

Best regards,
Jernej

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#2 lore raw
In reply to Chen-Yu Tsai

Hi,

Quoted 9 lines · Chen-Yu Tsai

From: Chen-Yu Tsai <[email protected]>

The macros for the clock and reset indices for the RSB hardware block were replaced with raw numbers when the RSB controller node was added. This was done to avoid cross-tree dependencies.

Now that both the clk and DT changes have been merged, we can switch back to using the macros.

Quoted 6 lines
Fixes aaad900757a6 ("arm64: dts: allwinner: h6: Add RSB controller node")

---

Small patch split out from the H6 RSB clock support patch. This should be merged for v5.12.

It's not really a fix but something we can live with, so I've merged it to sunxi/dt-for-5.13

Thanks!
Maxime

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel