Skip to contentSkip to conversation

dt-bindings: clock: ast2600: Add reset definition for video

PATCH Superseded Haiyue Wang 4 participants 5 messages Mar 2 – Apr 28

Subsystems (3)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 dt-bindings: clock: ast2600: Add reset definition for video

Add ASPEED_RESET_VIDEO reset definition to the ast2600-clock binding header. It is required for proper reset control of the video on the AST2600 SoC for aspeed-video driver.

---
v3:
- Drop 'Fixes:' tag in header file patch.
v2: https://lore.kernel.org/all/[email protected]/
- Fix checkpatch.pl warning, and send dt-bindings as single patch as the submitting-patches guide.
v1: https://lore.kernel.org/all/[email protected]/

---
 include/dt-bindings/clock/ast2600-clock.h | 1 +
 1 file changed, 1 insertion(+)
include/dt-bindings/clock/ast2600-clock.h +1 -0
index f60fff261130..7b9b80c38a8b 100644
@@ -124,6 +124,7 @@
 #define ASPEED_RESET_PCIE_RC_OEN	18
 #define ASPEED_RESET_MAC2		12
 #define ASPEED_RESET_MAC1		11
+#define ASPEED_RESET_VIDEO		6
 #define ASPEED_RESET_PCI_DP		5
 #define ASPEED_RESET_HACE		4
 #define ASPEED_RESET_AHB		1
Signature · 1 line
2.53.0
#1 lore raw

PATCH v3 2/2 ARM: dts: aspeed: add 'resets' to video node

The aspeed video (be compatible for ast2400, ast2500, ast2600) now needs the reset DTS handle specified, otherwise it will fail to load:

[    4.809494] aspeed-video 1e700000.video: irq 57
[    4.809977] aspeed-video 1e700000.video: Unable to get reset
[    4.810341] aspeed-video 1e700000.video: probe with driver aspeed-video failed with error -2
Fixes e83f8dd668ea ("media: aspeed: Fix dram hang at res-change")
---
 arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 1 +
 arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 1 +
 arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 1 +
 3 files changed, 3 insertions(+)
arch/arm/boot/dts/aspeed/aspeed-g4.dtsi +1 -0
index c3d4d916c69b..1547e28d77e2 100644
@@ -242,6 +242,7 @@ video: video@1e700000 {
 					 <&syscon ASPEED_CLK_GATE_ECLK>;
 				clock-names = "vclk", "eclk";
 				interrupts = <7>;
+				resets = <&syscon ASPEED_RESET_VIDEO>;
 				status = "disabled";
 			};
 
arch/arm/boot/dts/aspeed/aspeed-g5.dtsi +1 -0
index 39500bdb4747..793570ca2518 100644
@@ -296,6 +296,7 @@ video: video@1e700000 {
 					 <&syscon ASPEED_CLK_GATE_ECLK>;
 				clock-names = "vclk", "eclk";
 				interrupts = <7>;
+				resets = <&syscon ASPEED_RESET_VIDEO>;
 				status = "disabled";
 			};
 
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi +1 -0
index 189bc3bbb47c..3adf48987a17 100644
@@ -428,6 +428,7 @@ video: video@1e700000 {
 					 <&syscon ASPEED_CLK_GATE_ECLK>;
 				clock-names = "vclk", "eclk";
 				interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+				resets = <&syscon ASPEED_RESET_VIDEO>;
 				status = "disabled";
 			};
 
Signature · 1 line
2.53.0
Acked-by on v3 1/2
#2 lore raw
In reply to Haiyue Wang
Quoted 12 lines · Haiyue Wang

Add ASPEED_RESET_VIDEO reset definition to the ast2600-clock binding header. It is required for proper reset control of the video on the AST2600 SoC for aspeed-video driver.

---
v3:
- Drop 'Fixes:' tag in header file patch.
v2: https://lore.kernel.org/all/[email protected]/
- Fix checkpatch.pl warning, and send dt-bindings as single patch as the submitting-patches guide.
v1: https://lore.kernel.org/all/[email protected]/

Quoted 3 lines
---
 include/dt-bindings/clock/ast2600-clock.h | 1 +
 1 file changed, 1 insertion(+)

Best regards,
Krzysztof

maintainer Reviewed-by on v3 1/2
#3 lore raw
In reply to Haiyue Wang

Hi Michael, Stephen,

Quoted 21 lines · Haiyue Wang

Add ASPEED_RESET_VIDEO reset definition to the ast2600-clock binding header. It is required for proper reset control of the video on the AST2600 SoC for aspeed-video driver.

---
v3:
  - Drop 'Fixes:' tag in header file patch.
v2: https://lore.kernel.org/all/[email protected]/
  - Fix checkpatch.pl warning, and send dt-bindings as single patch as the submitting-patches guide.
v1: https://lore.kernel.org/all/[email protected]/
---
 include/dt-bindings/clock/ast2600-clock.h | 1 +

 1 file changed, 1 insertion(+)
include/dt-bindings/clock/ast2600-clock.h +0 -0
index f60fff261130..7b9b80c38a8b 100644

include/dt-bindings/clock/ast2600-clock.h line 130

Quoted 7 lines
include/dt-bindings/clock/ast2600-clock.h +1 -0
@@ -124,6 +124,7 @@
  #define ASPEED_RESET_PCIE_RC_OEN	18
  #define ASPEED_RESET_MAC2		12
  #define ASPEED_RESET_MAC1		11
+#define ASPEED_RESET_VIDEO		6
  #define ASPEED_RESET_PCI_DP		5
  #define ASPEED_RESET_HACE		4
  #define ASPEED_RESET_AHB		1

If you would like to take this change I can apply 2/2 later when it makes sense to do so:

Otherwise, I'm happy to take both through the aspeed/arm/dt branch in the bmc tree with your ack on this one.

Andrew