Skip to content

Commit e17e237

Browse files
wensmripard
authored andcommitted
ARM: dts: sunxi: Convert to CCU index macros for HDMI controller
When the HDMI controller device node was added, the needed PLL clock macros were not exported. A separate patch addresses that, but it is merged through a different tree. Now that both patches are in mainline proper, we can convert the raw numbers to proper macros. Signed-off-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Maxime Ripard <[email protected]>
1 parent e2bf801 commit e17e237

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

arch/arm/boot/dts/sun4i-a10.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,8 @@
502502
reg = <0x01c16000 0x1000>;
503503
interrupts = <58>;
504504
clocks = <&ccu CLK_AHB_HDMI0>, <&ccu CLK_HDMI>,
505-
<&ccu 9>,
506-
<&ccu 18>;
505+
<&ccu CLK_PLL_VIDEO0_2X>,
506+
<&ccu CLK_PLL_VIDEO1_2X>;
507507
clock-names = "ahb", "mod", "pll-0", "pll-1";
508508
dmas = <&dma SUN4I_DMA_NORMAL 16>,
509509
<&dma SUN4I_DMA_NORMAL 16>,

arch/arm/boot/dts/sun5i-a10s.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
reg = <0x01c16000 0x1000>;
8383
interrupts = <58>;
8484
clocks = <&ccu CLK_AHB_HDMI>, <&ccu CLK_HDMI>,
85-
<&ccu 9>,
86-
<&ccu 16>;
85+
<&ccu CLK_PLL_VIDEO0_2X>,
86+
<&ccu CLK_PLL_VIDEO1_2X>;
8787
clock-names = "ahb", "mod", "pll-0", "pll-1";
8888
dmas = <&dma SUN4I_DMA_NORMAL 16>,
8989
<&dma SUN4I_DMA_NORMAL 16>,

arch/arm/boot/dts/sun6i-a31.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,8 @@
429429
interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
430430
clocks = <&ccu CLK_AHB1_HDMI>, <&ccu CLK_HDMI>,
431431
<&ccu CLK_HDMI_DDC>,
432-
<&ccu 7>,
433-
<&ccu 13>;
432+
<&ccu CLK_PLL_VIDEO0_2X>,
433+
<&ccu CLK_PLL_VIDEO1_2X>;
434434
clock-names = "ahb", "mod", "ddc", "pll-0", "pll-1";
435435
resets = <&ccu RST_AHB1_HDMI>;
436436
reset-names = "ahb";

arch/arm/boot/dts/sun7i-a20.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,8 @@
581581
reg = <0x01c16000 0x1000>;
582582
interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
583583
clocks = <&ccu CLK_AHB_HDMI0>, <&ccu CLK_HDMI>,
584-
<&ccu 9>,
585-
<&ccu 18>;
584+
<&ccu CLK_PLL_VIDEO0_2X>,
585+
<&ccu CLK_PLL_VIDEO1_2X>;
586586
clock-names = "ahb", "mod", "pll-0", "pll-1";
587587
dmas = <&dma SUN4I_DMA_NORMAL 16>,
588588
<&dma SUN4I_DMA_NORMAL 16>,

0 commit comments

Comments
 (0)