Skip to contentSkip to conversation

ARM: dts: sun4i: HDMI and the tv-encoder use tcon ch1 not ch0

PATCH New Hans de Goede 3 participants 5 messages Jun 5, 2016 – Jun 9, 2016

Subsystems (2)
Device tree bindings Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Hans de Goede

author
#0 lore raw

PATCH 1/2 ARM: dts: sun4i: HDMI and the tv-encoder use tcon ch1 not ch0

Update the simplefb nodes for hdmi / tv-encoder out to point to tcon0_ch1 instead of tcon0_ch0 as tcon clock.

While at it fix the clocks lines being longer then 80 chars.

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun4i-a10.dtsi | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
arch/arm/boot/dts/sun4i-a10.dtsi +7 -5
index a9c3190..616b0f9 100644
@@ -65,8 +65,9 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0-hdmi";
-			clocks = <&ahb_gates 36>, <&ahb_gates 43>, <&ahb_gates 44>,
-				 <&de_be0_clk>, <&tcon0_ch0_clk>, <&dram_gates 26>;
+			clocks = <&ahb_gates 36>, <&ahb_gates 43>,
+				 <&ahb_gates 44>, <&de_be0_clk>,
+				 <&tcon0_ch1_clk>, <&dram_gates 26>;
 			status = "disabled";
 		};
 

@@ -76,7 +77,7 @@
 			allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";
 			clocks = <&ahb_gates 36>, <&ahb_gates 43>,
 				 <&ahb_gates 44>, <&ahb_gates 46>,
-				 <&de_be0_clk>, <&de_fe0_clk>, <&tcon0_ch0_clk>,
+				 <&de_be0_clk>, <&de_fe0_clk>, <&tcon0_ch1_clk>,
 				 <&dram_gates 25>, <&dram_gates 26>;
 			status = "disabled";
 		};

@@ -97,8 +98,9 @@
 			allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";
 			clocks = <&ahb_gates 34>, <&ahb_gates 36>,
 				 <&ahb_gates 44>, <&ahb_gates 46>,
-				 <&de_be0_clk>, <&de_fe0_clk>, <&tcon0_ch0_clk>,
-				 <&dram_gates 5>, <&dram_gates 25>, <&dram_gates 26>;
+				 <&de_be0_clk>, <&de_fe0_clk>,
+				 <&tcon0_ch1_clk>, <&dram_gates 5>,
+				 <&dram_gates 25>, <&dram_gates 26>;
 			status = "disabled";
 		};
 	};
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/2 ARM: dts: sun7i: HDMI and the tv-encoder use tcon ch1 not ch0

Update the simplefb nodes for hdmi / tv-encoder out to point to tcon0_ch1 instead of tcon0_ch0 as tcon clock.

While at it fix the clocks lines being longer then 80 chars.

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun7i-a20.dtsi | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
arch/arm/boot/dts/sun7i-a20.dtsi +6 -4
index 82e28c3..b9268d9 100644
@@ -67,8 +67,9 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0-hdmi";
-			clocks = <&ahb_gates 36>, <&ahb_gates 43>, <&ahb_gates 44>,
-				 <&de_be0_clk>, <&tcon0_ch0_clk>, <&dram_gates 26>;
+			clocks = <&ahb_gates 36>, <&ahb_gates 43>,
+				 <&ahb_gates 44>, <&de_be0_clk>,
+				 <&tcon0_ch1_clk>, <&dram_gates 26>;
 			status = "disabled";
 		};
 

@@ -86,8 +87,9 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0-tve0";
-			clocks = <&ahb_gates 34>, <&ahb_gates 36>, <&ahb_gates 44>,
-				 <&de_be0_clk>, <&tcon0_ch0_clk>,
+			clocks = <&ahb_gates 34>, <&ahb_gates 36>,
+				 <&ahb_gates 44>,
+				 <&de_be0_clk>, <&tcon0_ch1_clk>,
 				 <&dram_gates 5>, <&dram_gates 26>;
 			status = "disabled";
 		};
Signature · 1 line
2.7.4
#3 lore raw

PATCH 2/2 ARM: dts: sun7i: HDMI and the tv-encoder use tcon ch1 not ch0

In reply to Hans de Goede
Quoted 6 lines · Hans de Goede

Update the simplefb nodes for hdmi / tv-encoder out to point to tcon0_ch1 instead of tcon0_ch0 as tcon clock.

While at it fix the clocks lines being longer then 80 chars.

Signed-off-by Hans de Goede <[email protected]>

Fixed the typos (than vs then) and applied, thanks! Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160609/99489607/attachment.sig>