[PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Hans de Goede]

Hi Maxime,

While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
hdmi out is no longer working (screen goes black when the kernel turns
of unused clocks).

This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
listing pll3, without pll3 being added to the clocks list for the
simplefb nodes.

For sun5i-r8 this does not happen because it lists the de_be and
tcon_ch#_clk in the framebuffer node's clocks which will in turn keep
ppl3 (and pll5) alive.

With this commit:
https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/for-next&id=eadc0660c2bca3a2a6d2c15fe04bc2aaa2709cef

This is also fixed for A13 based devices, but it still is a problem for
A10s, hence this patch, which sits on top of the commit I just linked too.

Note that we've the same problem in 4.7-rc1 for A10 / A20, this is fixed
by these 2 commits:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679

This also means that we must send all 3 linked commits + the patch I'm
sending now to 4.7 as fixes, to avoid regressing in 4.7.

Regards,

Hans

[PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Hans de Goede]

Hi Maxime,

While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
hdmi out is no longer working (screen goes black when the kernel turns
of unused clocks).

This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
listing pll3, without pll3 being added to the clocks list for the
simplefb nodes.

For sun5i-r8 this does not happen because it lists the de_be and
tcon_ch#_clk in the framebuffer node's clocks which will in turn keep
ppl3 (and pll5) alive.

With this commit:
https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/for-next&id=eadc0660c2bca3a2a6d2c15fe04bc2aaa2709cef

This is also fixed for A13 based devices, but it still is a problem for
A10s, hence this patch, which sits on top of the commit I just linked too.

Note that we've the same problem in 4.7-rc1 for A10 / A20, this is fixed
by these 2 commits:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679

This also means that we must send all 3 linked commits + the patch I'm
sending now to 4.7 as fixes, to avoid regressing in 4.7.

Regards,

Hans
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] ARM: dts: sun5i: Move display blocks to sun5i.dtsi

[Hans de Goede]

All sun5i models share, the same die, so the display-engine is
identical, except for which outputs / encoders all available.

All models support parallel / lvds lcd panels, the R8 and A10s also
support tv-out and the A10s also supports HDMI out.

This commit prepares for enabling display blocks on A10s boards,
but it also is a bug-fix for A10s boards, because before this commit
the simplefb nodes for A10s where not listing the recently added
pll3 as clock, causing the display to go block when the kernel
disables unused clocks at the end of boot.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/boot/dts/sun5i-a10s.dtsi |  24 ++---
 arch/arm/boot/dts/sun5i-a13.dtsi  | 182 --------------------------------------
 arch/arm/boot/dts/sun5i.dtsi      | 182 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 189 insertions(+), 199 deletions(-)

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index bddd0de..507ec42 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -57,24 +57,13 @@
 	};
 
 	chosen {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		framebuffer at 0 {
-			compatible = "allwinner,simple-framebuffer",
-				     "simple-framebuffer";
-			allwinner,pipeline = "de_be0-lcd0-hdmi";
-			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
-				 <&ahb_gates 44>;
-			status = "disabled";
-		};
-
 		framebuffer at 1 {
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
-			allwinner,pipeline = "de_be0-lcd0";
-			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;
+			allwinner,pipeline = "de_be0-lcd0-hdmi";
+			clocks = <&ahb_gates 36>, <&ahb_gates 43>,
+				 <&ahb_gates 44>, <&de_be_clk>,
+				 <&tcon_ch1_clk>, <&dram_gates 26>;
 			status = "disabled";
 		};
 
@@ -82,8 +71,9 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0-tve0";
-			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
-				 <&ahb_gates 44>;
+			clocks = <&ahb_gates 34>, <&ahb_gates 36>,
+				 <&ahb_gates 44>, <&de_be_clk>,
+				 <&tcon_ch1_clk>, <&dram_gates 26>;
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index e012890..5b6d9fc 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -52,21 +52,6 @@
 / {
 	interrupt-parent = <&intc>;
 
-	chosen {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		framebuffer at 0 {
-			compatible = "allwinner,simple-framebuffer",
-				     "simple-framebuffer";
-			allwinner,pipeline = "de_be0-lcd0";
-			clocks = <&ahb_gates 36>, <&ahb_gates 44>, <&de_be_clk>,
-				 <&tcon_ch0_clk>, <&dram_gates 26>;
-			status = "disabled";
-		};
-	};
-
 	thermal-zones {
 		cpu_thermal {
 			/* milliseconds */
@@ -150,107 +135,9 @@
 					     "apb1_i2c2", "apb1_uart1",
 					     "apb1_uart3";
 		};
-
-		dram_gates: clk at 01c20100 {
-			#clock-cells = <1>;
-			compatible = "allwinner,sun5i-a13-dram-gates-clk",
-				     "allwinner,sun4i-a10-gates-clk";
-			reg = <0x01c20100 0x4>;
-			clocks = <&pll5 0>;
-			clock-indices = <0>,
-					<1>,
-					<25>,
-					<26>,
-					<29>,
-					<31>;
-			clock-output-names = "dram_ve",
-					     "dram_csi",
-					     "dram_de_fe",
-					     "dram_de_be",
-					     "dram_ace",
-					     "dram_iep";
-		};
-
-		de_be_clk: clk at 01c20104 {
-			#clock-cells = <0>;
-			#reset-cells = <0>;
-			compatible = "allwinner,sun4i-a10-display-clk";
-			reg = <0x01c20104 0x4>;
-			clocks = <&pll3>, <&pll7>, <&pll5 1>;
-			clock-output-names = "de-be";
-		};
-
-		de_fe_clk: clk at 01c2010c {
-			#clock-cells = <0>;
-			#reset-cells = <0>;
-			compatible = "allwinner,sun4i-a10-display-clk";
-			reg = <0x01c2010c 0x4>;
-			clocks = <&pll3>, <&pll7>, <&pll5 1>;
-			clock-output-names = "de-fe";
-		};
-
-		tcon_ch0_clk: clk at 01c20118 {
-			#clock-cells = <0>;
-			#reset-cells = <1>;
-			compatible = "allwinner,sun4i-a10-tcon-ch0-clk";
-			reg = <0x01c20118 0x4>;
-			clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>;
-			clock-output-names = "tcon-ch0-sclk";
-		};
-
-		tcon_ch1_clk: clk at 01c2012c {
-			#clock-cells = <0>;
-			compatible = "allwinner,sun4i-a10-tcon-ch1-clk";
-			reg = <0x01c2012c 0x4>;
-			clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>;
-			clock-output-names = "tcon-ch1-sclk";
-		};
-	};
-
-	display-engine {
-		compatible = "allwinner,sun5i-a13-display-engine";
-		allwinner,pipelines = <&fe0>;
 	};
 
 	soc at 01c00000 {
-		tcon0: lcd-controller at 01c0c000 {
-			compatible = "allwinner,sun5i-a13-tcon";
-			reg = <0x01c0c000 0x1000>;
-			interrupts = <44>;
-			resets = <&tcon_ch0_clk 1>;
-			reset-names = "lcd";
-			clocks = <&ahb_gates 36>,
-				 <&tcon_ch0_clk>,
-				 <&tcon_ch1_clk>;
-			clock-names = "ahb",
-				      "tcon-ch0",
-				      "tcon-ch1";
-			clock-output-names = "tcon-pixel-clock";
-			status = "disabled";
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				tcon0_in: port at 0 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <0>;
-
-					tcon0_in_be0: endpoint at 0 {
-						reg = <0>;
-						remote-endpoint = <&be0_out_tcon0>;
-					};
-				};
-
-				tcon0_out: port at 1 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <1>;
-				};
-			};
-		};
-
 		pwm: pwm at 01c20e00 {
 			compatible = "allwinner,sun5i-a13-pwm";
 			reg = <0x01c20e00 0xc>;
@@ -258,75 +145,6 @@
 			#pwm-cells = <3>;
 			status = "disabled";
 		};
-
-		fe0: display-frontend at 01e00000 {
-			compatible = "allwinner,sun5i-a13-display-frontend";
-			reg = <0x01e00000 0x20000>;
-			interrupts = <47>;
-			clocks = <&ahb_gates 46>, <&de_fe_clk>,
-				 <&dram_gates 25>;
-			clock-names = "ahb", "mod",
-				      "ram";
-			resets = <&de_fe_clk>;
-			status = "disabled";
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				fe0_out: port at 1 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <1>;
-
-					fe0_out_be0: endpoint at 0 {
-						reg = <0>;
-						remote-endpoint = <&be0_in_fe0>;
-					};
-				};
-			};
-		};
-
-		be0: display-backend at 01e60000 {
-			compatible = "allwinner,sun5i-a13-display-backend";
-			reg = <0x01e60000 0x10000>;
-			clocks = <&ahb_gates 44>, <&de_be_clk>,
-				 <&dram_gates 26>;
-			clock-names = "ahb", "mod",
-				      "ram";
-			resets = <&de_be_clk>;
-			status = "disabled";
-
-			assigned-clocks = <&de_be_clk>;
-			assigned-clock-rates = <300000000>;
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				be0_in: port at 0 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <0>;
-
-					be0_in_fe0: endpoint at 0 {
-						reg = <0>;
-						remote-endpoint = <&fe0_out_be0>;
-					};
-				};
-
-				be0_out: port at 1 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <1>;
-
-					be0_out_tcon0: endpoint at 0 {
-						reg = <0>;
-						remote-endpoint = <&tcon0_in_be0>;
-					};
-				};
-			};
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 0840612..3c8bab9 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -51,6 +51,21 @@
 / {
 	interrupt-parent = <&intc>;
 
+	chosen {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		framebuffer at 0 {
+			compatible = "allwinner,simple-framebuffer",
+				     "simple-framebuffer";
+			allwinner,pipeline = "de_be0-lcd0";
+			clocks = <&ahb_gates 36>, <&ahb_gates 44>, <&de_be_clk>,
+				 <&tcon_ch0_clk>, <&dram_gates 26>;
+			status = "disabled";
+		};
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -338,6 +353,61 @@
 			clock-output-names = "usb_ohci0", "usb_phy";
 		};
 
+		dram_gates: clk at 01c20100 {
+			#clock-cells = <1>;
+			compatible = "allwinner,sun5i-a13-dram-gates-clk",
+				     "allwinner,sun4i-a10-gates-clk";
+			reg = <0x01c20100 0x4>;
+			clocks = <&pll5 0>;
+			clock-indices = <0>,
+					<1>,
+					<25>,
+					<26>,
+					<29>,
+					<31>;
+			clock-output-names = "dram_ve",
+					     "dram_csi",
+					     "dram_de_fe",
+					     "dram_de_be",
+					     "dram_ace",
+					     "dram_iep";
+		};
+
+		de_be_clk: clk at 01c20104 {
+			#clock-cells = <0>;
+			#reset-cells = <0>;
+			compatible = "allwinner,sun4i-a10-display-clk";
+			reg = <0x01c20104 0x4>;
+			clocks = <&pll3>, <&pll7>, <&pll5 1>;
+			clock-output-names = "de-be";
+		};
+
+		de_fe_clk: clk at 01c2010c {
+			#clock-cells = <0>;
+			#reset-cells = <0>;
+			compatible = "allwinner,sun4i-a10-display-clk";
+			reg = <0x01c2010c 0x4>;
+			clocks = <&pll3>, <&pll7>, <&pll5 1>;
+			clock-output-names = "de-fe";
+		};
+
+		tcon_ch0_clk: clk at 01c20118 {
+			#clock-cells = <0>;
+			#reset-cells = <1>;
+			compatible = "allwinner,sun4i-a10-tcon-ch0-clk";
+			reg = <0x01c20118 0x4>;
+			clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>;
+			clock-output-names = "tcon-ch0-sclk";
+		};
+
+		tcon_ch1_clk: clk at 01c2012c {
+			#clock-cells = <0>;
+			compatible = "allwinner,sun4i-a10-tcon-ch1-clk";
+			reg = <0x01c2012c 0x4>;
+			clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>;
+			clock-output-names = "tcon-ch1-sclk";
+		};
+
 		codec_clk: clk at 01c20140 {
 			#clock-cells = <0>;
 			compatible = "allwinner,sun4i-a10-codec-clk";
@@ -355,6 +425,11 @@
 		};
 	};
 
+	display-engine {
+		compatible = "allwinner,sun5i-a13-display-engine";
+		allwinner,pipelines = <&fe0>;
+	};
+
 	soc at 01c00000 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -427,6 +502,44 @@
 			#size-cells = <0>;
 		};
 
+		tcon0: lcd-controller at 01c0c000 {
+			compatible = "allwinner,sun5i-a13-tcon";
+			reg = <0x01c0c000 0x1000>;
+			interrupts = <44>;
+			resets = <&tcon_ch0_clk 1>;
+			reset-names = "lcd";
+			clocks = <&ahb_gates 36>,
+				 <&tcon_ch0_clk>,
+				 <&tcon_ch1_clk>;
+			clock-names = "ahb",
+				      "tcon-ch0",
+				      "tcon-ch1";
+			clock-output-names = "tcon-pixel-clock";
+			status = "disabled";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				tcon0_in: port at 0 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <0>;
+
+					tcon0_in_be0: endpoint at 0 {
+						reg = <0>;
+						remote-endpoint = <&be0_out_tcon0>;
+					};
+				};
+
+				tcon0_out: port at 1 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <1>;
+				};
+			};
+		};
+
 		mmc0: mmc at 01c0f000 {
 			compatible = "allwinner,sun5i-a13-mmc";
 			reg = <0x01c0f000 0x1000>;
@@ -713,5 +826,74 @@
 			interrupts = <82>, <83>;
 			clocks = <&ahb_gates 28>;
 		};
+
+		fe0: display-frontend at 01e00000 {
+			compatible = "allwinner,sun5i-a13-display-frontend";
+			reg = <0x01e00000 0x20000>;
+			interrupts = <47>;
+			clocks = <&ahb_gates 46>, <&de_fe_clk>,
+				 <&dram_gates 25>;
+			clock-names = "ahb", "mod",
+				      "ram";
+			resets = <&de_fe_clk>;
+			status = "disabled";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				fe0_out: port at 1 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <1>;
+
+					fe0_out_be0: endpoint at 0 {
+						reg = <0>;
+						remote-endpoint = <&be0_in_fe0>;
+					};
+				};
+			};
+		};
+
+		be0: display-backend at 01e60000 {
+			compatible = "allwinner,sun5i-a13-display-backend";
+			reg = <0x01e60000 0x10000>;
+			clocks = <&ahb_gates 44>, <&de_be_clk>,
+				 <&dram_gates 26>;
+			clock-names = "ahb", "mod",
+				      "ram";
+			resets = <&de_be_clk>;
+			status = "disabled";
+
+			assigned-clocks = <&de_be_clk>;
+			assigned-clock-rates = <300000000>;
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				be0_in: port at 0 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <0>;
+
+					be0_in_fe0: endpoint at 0 {
+						reg = <0>;
+						remote-endpoint = <&fe0_out_be0>;
+					};
+				};
+
+				be0_out: port at 1 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <1>;
+
+					be0_out_tcon0: endpoint at 0 {
+						reg = <0>;
+						remote-endpoint = <&tcon0_in_be0>;
+					};
+				};
+			};
+		};
 	};
 };
-- 
2.7.4

[PATCH] ARM: dts: sun5i: Move display blocks to sun5i.dtsi

[Hans de Goede]

All sun5i models share, the same die, so the display-engine is
identical, except for which outputs / encoders all available.

All models support parallel / lvds lcd panels, the R8 and A10s also
support tv-out and the A10s also supports HDMI out.

This commit prepares for enabling display blocks on A10s boards,
but it also is a bug-fix for A10s boards, because before this commit
the simplefb nodes for A10s where not listing the recently added
pll3 as clock, causing the display to go block when the kernel
disables unused clocks at the end of boot.

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun5i-a10s.dtsi |  24 ++---
 arch/arm/boot/dts/sun5i-a13.dtsi  | 182 --------------------------------------
 arch/arm/boot/dts/sun5i.dtsi      | 182 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 189 insertions(+), 199 deletions(-)

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index bddd0de..507ec42 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -57,24 +57,13 @@
 	};
 
 	chosen {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		framebuffer@0 {
-			compatible = "allwinner,simple-framebuffer",
-				     "simple-framebuffer";
-			allwinner,pipeline = "de_be0-lcd0-hdmi";
-			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
-				 <&ahb_gates 44>;
-			status = "disabled";
-		};
-
 		framebuffer@1 {
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
-			allwinner,pipeline = "de_be0-lcd0";
-			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;
+			allwinner,pipeline = "de_be0-lcd0-hdmi";
+			clocks = <&ahb_gates 36>, <&ahb_gates 43>,
+				 <&ahb_gates 44>, <&de_be_clk>,
+				 <&tcon_ch1_clk>, <&dram_gates 26>;
 			status = "disabled";
 		};
 
@@ -82,8 +71,9 @@
 			compatible = "allwinner,simple-framebuffer",
 				     "simple-framebuffer";
 			allwinner,pipeline = "de_be0-lcd0-tve0";
-			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
-				 <&ahb_gates 44>;
+			clocks = <&ahb_gates 34>, <&ahb_gates 36>,
+				 <&ahb_gates 44>, <&de_be_clk>,
+				 <&tcon_ch1_clk>, <&dram_gates 26>;
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index e012890..5b6d9fc 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -52,21 +52,6 @@
 / {
 	interrupt-parent = <&intc>;
 
-	chosen {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		framebuffer@0 {
-			compatible = "allwinner,simple-framebuffer",
-				     "simple-framebuffer";
-			allwinner,pipeline = "de_be0-lcd0";
-			clocks = <&ahb_gates 36>, <&ahb_gates 44>, <&de_be_clk>,
-				 <&tcon_ch0_clk>, <&dram_gates 26>;
-			status = "disabled";
-		};
-	};
-
 	thermal-zones {
 		cpu_thermal {
 			/* milliseconds */
@@ -150,107 +135,9 @@
 					     "apb1_i2c2", "apb1_uart1",
 					     "apb1_uart3";
 		};
-
-		dram_gates: clk@01c20100 {
-			#clock-cells = <1>;
-			compatible = "allwinner,sun5i-a13-dram-gates-clk",
-				     "allwinner,sun4i-a10-gates-clk";
-			reg = <0x01c20100 0x4>;
-			clocks = <&pll5 0>;
-			clock-indices = <0>,
-					<1>,
-					<25>,
-					<26>,
-					<29>,
-					<31>;
-			clock-output-names = "dram_ve",
-					     "dram_csi",
-					     "dram_de_fe",
-					     "dram_de_be",
-					     "dram_ace",
-					     "dram_iep";
-		};
-
-		de_be_clk: clk@01c20104 {
-			#clock-cells = <0>;
-			#reset-cells = <0>;
-			compatible = "allwinner,sun4i-a10-display-clk";
-			reg = <0x01c20104 0x4>;
-			clocks = <&pll3>, <&pll7>, <&pll5 1>;
-			clock-output-names = "de-be";
-		};
-
-		de_fe_clk: clk@01c2010c {
-			#clock-cells = <0>;
-			#reset-cells = <0>;
-			compatible = "allwinner,sun4i-a10-display-clk";
-			reg = <0x01c2010c 0x4>;
-			clocks = <&pll3>, <&pll7>, <&pll5 1>;
-			clock-output-names = "de-fe";
-		};
-
-		tcon_ch0_clk: clk@01c20118 {
-			#clock-cells = <0>;
-			#reset-cells = <1>;
-			compatible = "allwinner,sun4i-a10-tcon-ch0-clk";
-			reg = <0x01c20118 0x4>;
-			clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>;
-			clock-output-names = "tcon-ch0-sclk";
-		};
-
-		tcon_ch1_clk: clk@01c2012c {
-			#clock-cells = <0>;
-			compatible = "allwinner,sun4i-a10-tcon-ch1-clk";
-			reg = <0x01c2012c 0x4>;
-			clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>;
-			clock-output-names = "tcon-ch1-sclk";
-		};
-	};
-
-	display-engine {
-		compatible = "allwinner,sun5i-a13-display-engine";
-		allwinner,pipelines = <&fe0>;
 	};
 
 	soc@01c00000 {
-		tcon0: lcd-controller@01c0c000 {
-			compatible = "allwinner,sun5i-a13-tcon";
-			reg = <0x01c0c000 0x1000>;
-			interrupts = <44>;
-			resets = <&tcon_ch0_clk 1>;
-			reset-names = "lcd";
-			clocks = <&ahb_gates 36>,
-				 <&tcon_ch0_clk>,
-				 <&tcon_ch1_clk>;
-			clock-names = "ahb",
-				      "tcon-ch0",
-				      "tcon-ch1";
-			clock-output-names = "tcon-pixel-clock";
-			status = "disabled";
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				tcon0_in: port@0 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <0>;
-
-					tcon0_in_be0: endpoint@0 {
-						reg = <0>;
-						remote-endpoint = <&be0_out_tcon0>;
-					};
-				};
-
-				tcon0_out: port@1 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <1>;
-				};
-			};
-		};
-
 		pwm: pwm@01c20e00 {
 			compatible = "allwinner,sun5i-a13-pwm";
 			reg = <0x01c20e00 0xc>;
@@ -258,75 +145,6 @@
 			#pwm-cells = <3>;
 			status = "disabled";
 		};
-
-		fe0: display-frontend@01e00000 {
-			compatible = "allwinner,sun5i-a13-display-frontend";
-			reg = <0x01e00000 0x20000>;
-			interrupts = <47>;
-			clocks = <&ahb_gates 46>, <&de_fe_clk>,
-				 <&dram_gates 25>;
-			clock-names = "ahb", "mod",
-				      "ram";
-			resets = <&de_fe_clk>;
-			status = "disabled";
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				fe0_out: port@1 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <1>;
-
-					fe0_out_be0: endpoint@0 {
-						reg = <0>;
-						remote-endpoint = <&be0_in_fe0>;
-					};
-				};
-			};
-		};
-
-		be0: display-backend@01e60000 {
-			compatible = "allwinner,sun5i-a13-display-backend";
-			reg = <0x01e60000 0x10000>;
-			clocks = <&ahb_gates 44>, <&de_be_clk>,
-				 <&dram_gates 26>;
-			clock-names = "ahb", "mod",
-				      "ram";
-			resets = <&de_be_clk>;
-			status = "disabled";
-
-			assigned-clocks = <&de_be_clk>;
-			assigned-clock-rates = <300000000>;
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				be0_in: port@0 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <0>;
-
-					be0_in_fe0: endpoint@0 {
-						reg = <0>;
-						remote-endpoint = <&fe0_out_be0>;
-					};
-				};
-
-				be0_out: port@1 {
-					#address-cells = <1>;
-					#size-cells = <0>;
-					reg = <1>;
-
-					be0_out_tcon0: endpoint@0 {
-						reg = <0>;
-						remote-endpoint = <&tcon0_in_be0>;
-					};
-				};
-			};
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 0840612..3c8bab9 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -51,6 +51,21 @@
 / {
 	interrupt-parent = <&intc>;
 
+	chosen {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		framebuffer@0 {
+			compatible = "allwinner,simple-framebuffer",
+				     "simple-framebuffer";
+			allwinner,pipeline = "de_be0-lcd0";
+			clocks = <&ahb_gates 36>, <&ahb_gates 44>, <&de_be_clk>,
+				 <&tcon_ch0_clk>, <&dram_gates 26>;
+			status = "disabled";
+		};
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -338,6 +353,61 @@
 			clock-output-names = "usb_ohci0", "usb_phy";
 		};
 
+		dram_gates: clk@01c20100 {
+			#clock-cells = <1>;
+			compatible = "allwinner,sun5i-a13-dram-gates-clk",
+				     "allwinner,sun4i-a10-gates-clk";
+			reg = <0x01c20100 0x4>;
+			clocks = <&pll5 0>;
+			clock-indices = <0>,
+					<1>,
+					<25>,
+					<26>,
+					<29>,
+					<31>;
+			clock-output-names = "dram_ve",
+					     "dram_csi",
+					     "dram_de_fe",
+					     "dram_de_be",
+					     "dram_ace",
+					     "dram_iep";
+		};
+
+		de_be_clk: clk@01c20104 {
+			#clock-cells = <0>;
+			#reset-cells = <0>;
+			compatible = "allwinner,sun4i-a10-display-clk";
+			reg = <0x01c20104 0x4>;
+			clocks = <&pll3>, <&pll7>, <&pll5 1>;
+			clock-output-names = "de-be";
+		};
+
+		de_fe_clk: clk@01c2010c {
+			#clock-cells = <0>;
+			#reset-cells = <0>;
+			compatible = "allwinner,sun4i-a10-display-clk";
+			reg = <0x01c2010c 0x4>;
+			clocks = <&pll3>, <&pll7>, <&pll5 1>;
+			clock-output-names = "de-fe";
+		};
+
+		tcon_ch0_clk: clk@01c20118 {
+			#clock-cells = <0>;
+			#reset-cells = <1>;
+			compatible = "allwinner,sun4i-a10-tcon-ch0-clk";
+			reg = <0x01c20118 0x4>;
+			clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>;
+			clock-output-names = "tcon-ch0-sclk";
+		};
+
+		tcon_ch1_clk: clk@01c2012c {
+			#clock-cells = <0>;
+			compatible = "allwinner,sun4i-a10-tcon-ch1-clk";
+			reg = <0x01c2012c 0x4>;
+			clocks = <&pll3>, <&pll7>, <&pll3x2>, <&pll7x2>;
+			clock-output-names = "tcon-ch1-sclk";
+		};
+
 		codec_clk: clk@01c20140 {
 			#clock-cells = <0>;
 			compatible = "allwinner,sun4i-a10-codec-clk";
@@ -355,6 +425,11 @@
 		};
 	};
 
+	display-engine {
+		compatible = "allwinner,sun5i-a13-display-engine";
+		allwinner,pipelines = <&fe0>;
+	};
+
 	soc@01c00000 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -427,6 +502,44 @@
 			#size-cells = <0>;
 		};
 
+		tcon0: lcd-controller@01c0c000 {
+			compatible = "allwinner,sun5i-a13-tcon";
+			reg = <0x01c0c000 0x1000>;
+			interrupts = <44>;
+			resets = <&tcon_ch0_clk 1>;
+			reset-names = "lcd";
+			clocks = <&ahb_gates 36>,
+				 <&tcon_ch0_clk>,
+				 <&tcon_ch1_clk>;
+			clock-names = "ahb",
+				      "tcon-ch0",
+				      "tcon-ch1";
+			clock-output-names = "tcon-pixel-clock";
+			status = "disabled";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				tcon0_in: port@0 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <0>;
+
+					tcon0_in_be0: endpoint@0 {
+						reg = <0>;
+						remote-endpoint = <&be0_out_tcon0>;
+					};
+				};
+
+				tcon0_out: port@1 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <1>;
+				};
+			};
+		};
+
 		mmc0: mmc@01c0f000 {
 			compatible = "allwinner,sun5i-a13-mmc";
 			reg = <0x01c0f000 0x1000>;
@@ -713,5 +826,74 @@
 			interrupts = <82>, <83>;
 			clocks = <&ahb_gates 28>;
 		};
+
+		fe0: display-frontend@01e00000 {
+			compatible = "allwinner,sun5i-a13-display-frontend";
+			reg = <0x01e00000 0x20000>;
+			interrupts = <47>;
+			clocks = <&ahb_gates 46>, <&de_fe_clk>,
+				 <&dram_gates 25>;
+			clock-names = "ahb", "mod",
+				      "ram";
+			resets = <&de_fe_clk>;
+			status = "disabled";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				fe0_out: port@1 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <1>;
+
+					fe0_out_be0: endpoint@0 {
+						reg = <0>;
+						remote-endpoint = <&be0_in_fe0>;
+					};
+				};
+			};
+		};
+
+		be0: display-backend@01e60000 {
+			compatible = "allwinner,sun5i-a13-display-backend";
+			reg = <0x01e60000 0x10000>;
+			clocks = <&ahb_gates 44>, <&de_be_clk>,
+				 <&dram_gates 26>;
+			clock-names = "ahb", "mod",
+				      "ram";
+			resets = <&de_be_clk>;
+			status = "disabled";
+
+			assigned-clocks = <&de_be_clk>;
+			assigned-clock-rates = <300000000>;
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				be0_in: port@0 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <0>;
+
+					be0_in_fe0: endpoint@0 {
+						reg = <0>;
+						remote-endpoint = <&fe0_out_be0>;
+					};
+				};
+
+				be0_out: port@1 {
+					#address-cells = <1>;
+					#size-cells = <0>;
+					reg = <1>;
+
+					be0_out_tcon0: endpoint@0 {
+						reg = <0>;
+						remote-endpoint = <&tcon0_in_be0>;
+					};
+				};
+			};
+		};
 	};
 };
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] ARM: dts: sun5i: Move display blocks to sun5i.dtsi

[Peter Korsgaard]

>>>>> "Hans" == Hans de Goede <hdegoede@redhat.com> writes:

 > All sun5i models share, the same die, so the display-engine is

Drop comma after share.

> identical, except for which outputs / encoders all available.

s/all/are/

 > All models support parallel / lvds lcd panels, the R8 and A10s also
 > support tv-out and the A10s also supports HDMI out.

 > This commit prepares for enabling display blocks on A10s boards,
 > but it also is a bug-fix for A10s boards, because before this commit
 > the simplefb nodes for A10s where not listing the recently added

s/where/were/

 > pll3 as clock, causing the display to go block when the kernel

s/block/black/

-- 
Bye, Peter Korsgaard

Re: [PATCH] ARM: dts: sun5i: Move display blocks to sun5i.dtsi

[Peter Korsgaard]

>>>>> "Hans" == Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> writes:

 > All sun5i models share, the same die, so the display-engine is

Drop comma after share.

> identical, except for which outputs / encoders all available.

s/all/are/

 > All models support parallel / lvds lcd panels, the R8 and A10s also
 > support tv-out and the A10s also supports HDMI out.

 > This commit prepares for enabling display blocks on A10s boards,
 > but it also is a bug-fix for A10s boards, because before this commit
 > the simplefb nodes for A10s where not listing the recently added

s/where/were/

 > pll3 as clock, causing the display to go block when the kernel

s/block/black/

-- 
Bye, Peter Korsgaard
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Maxime Ripard]

Hi Hans,

On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
> Hi Maxime,
> 
> While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
> hdmi out is no longer working (screen goes black when the kernel turns
> of unused clocks).
> 
> This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
> listing pll3, without pll3 being added to the clocks list for the
> simplefb nodes.

Why not do just that then? It's more appropriate for a fix imho.

Thanks! (and sorry for the breakage)
Maxime

-- 
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/c47efccb/attachment-0001.sig>

Re: [PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 659 bytes --]

Hi Hans,

On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
> Hi Maxime,
> 
> While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
> hdmi out is no longer working (screen goes black when the kernel turns
> of unused clocks).
> 
> This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
> listing pll3, without pll3 being added to the clocks list for the
> simplefb nodes.

Why not do just that then? It's more appropriate for a fix imho.

Thanks! (and sorry for the breakage)
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Hans de Goede]

Hi,

On 09-06-16 09:46, Maxime Ripard wrote:
> Hi Hans,
>
> On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
>> Hi Maxime,
>>
>> While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
>> hdmi out is no longer working (screen goes black when the kernel turns
>> of unused clocks).
>>
>> This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
>> listing pll3, without pll3 being added to the clocks list for the
>> simplefb nodes.
>
> Why not do just that then? It's more appropriate for a fix imho.

You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
sun7i ?

For sun4i and sun7i things are already fixed in next:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679

It seems best to use those fixes, rather then come up with a separate
fix for 4.7.

My patch for fixing sun5i-a10s is inline with the 2 above patches,
which seems best, rather then doing something special for just sun5i-a10s.

I'll send a v2 of this patch with the spelling mistakes pointed out
by Peter Korsgaard fixed.

Regards,

Hans

Re: [PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Hans de Goede]

Hi,

On 09-06-16 09:46, Maxime Ripard wrote:
> Hi Hans,
>
> On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
>> Hi Maxime,
>>
>> While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
>> hdmi out is no longer working (screen goes black when the kernel turns
>> of unused clocks).
>>
>> This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
>> listing pll3, without pll3 being added to the clocks list for the
>> simplefb nodes.
>
> Why not do just that then? It's more appropriate for a fix imho.

You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
sun7i ?

For sun4i and sun7i things are already fixed in next:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679

It seems best to use those fixes, rather then come up with a separate
fix for 4.7.

My patch for fixing sun5i-a10s is inline with the 2 above patches,
which seems best, rather then doing something special for just sun5i-a10s.

I'll send a v2 of this patch with the spelling mistakes pointed out
by Peter Korsgaard fixed.

Regards,

Hans


--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Maxime Ripard]

On Thu, Jun 09, 2016 at 12:47:36PM +0200, Hans de Goede wrote:
> Hi,
> 
> On 09-06-16 09:46, Maxime Ripard wrote:
> >Hi Hans,
> >
> >On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
> >>Hi Maxime,
> >>
> >>While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
> >>hdmi out is no longer working (screen goes black when the kernel turns
> >>of unused clocks).
> >>
> >>This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
> >>listing pll3, without pll3 being added to the clocks list for the
> >>simplefb nodes.
> >
> >Why not do just that then? It's more appropriate for a fix imho.
> 
> You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
> sun7i ?
> 
> For sun4i and sun7i things are already fixed in next:
> 
> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679
> 
> It seems best to use those fixes, rather then come up with a separate
> fix for 4.7.
> 
> My patch for fixing sun5i-a10s is inline with the 2 above patches,
> which seems best, rather then doing something special for just sun5i-a10s.

Well, you are doing something special for just the A10s: the patches
quoted above just add a bunch of clocks and add the handles to the
list of clocks managed by simplefb.

For the A10s, you also declare the whole display engine block without
anyone having tested that it was actually working.

Maxime

-- 
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/20160613/b202905d/attachment.sig>

Re: [PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1705 bytes --]

On Thu, Jun 09, 2016 at 12:47:36PM +0200, Hans de Goede wrote:
> Hi,
> 
> On 09-06-16 09:46, Maxime Ripard wrote:
> >Hi Hans,
> >
> >On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
> >>Hi Maxime,
> >>
> >>While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
> >>hdmi out is no longer working (screen goes black when the kernel turns
> >>of unused clocks).
> >>
> >>This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
> >>listing pll3, without pll3 being added to the clocks list for the
> >>simplefb nodes.
> >
> >Why not do just that then? It's more appropriate for a fix imho.
> 
> You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
> sun7i ?
> 
> For sun4i and sun7i things are already fixed in next:
> 
> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679
> 
> It seems best to use those fixes, rather then come up with a separate
> fix for 4.7.
> 
> My patch for fixing sun5i-a10s is inline with the 2 above patches,
> which seems best, rather then doing something special for just sun5i-a10s.

Well, you are doing something special for just the A10s: the patches
quoted above just add a bunch of clocks and add the handles to the
list of clocks managed by simplefb.

For the A10s, you also declare the whole display engine block without
anyone having tested that it was actually working.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Hans de Goede]

Hi,

On 13-06-16 10:01, Maxime Ripard wrote:
> On Thu, Jun 09, 2016 at 12:47:36PM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 09-06-16 09:46, Maxime Ripard wrote:
>>> Hi Hans,
>>>
>>> On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
>>>> Hi Maxime,
>>>>
>>>> While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
>>>> hdmi out is no longer working (screen goes black when the kernel turns
>>>> of unused clocks).
>>>>
>>>> This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
>>>> listing pll3, without pll3 being added to the clocks list for the
>>>> simplefb nodes.
>>>
>>> Why not do just that then? It's more appropriate for a fix imho.
>>
>> You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
>> sun7i ?
>>
>> For sun4i and sun7i things are already fixed in next:
>>
>> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
>> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679
>>
>> It seems best to use those fixes, rather then come up with a separate
>> fix for 4.7.
>>
>> My patch for fixing sun5i-a10s is inline with the 2 above patches,
>> which seems best, rather then doing something special for just sun5i-a10s.
>
> Well, you are doing something special for just the A10s: the patches
> quoted above just add a bunch of clocks and add the handles to the
> list of clocks managed by simplefb.
>
> For the A10s, you also declare the whole display engine block without
> anyone having tested that it was actually working.

A10s is the same SoC as A13 / R8, just in a different package / with
different pins routed to the outside and it features a parallel LCD
interface just like the A13 / R8. We've had this confirmed by
Allwinner multiple times now, A13 / A10s / R8 literary are the same
chip, there simply is no way the displayblock on the A10s somehow
is magically different.

Given all this, clearly having this identical displayblock in the
shared sun5i.dtsi is the right thing to do.

Regards,

Hans

Re: [PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Hans de Goede]

Hi,

On 13-06-16 10:01, Maxime Ripard wrote:
> On Thu, Jun 09, 2016 at 12:47:36PM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 09-06-16 09:46, Maxime Ripard wrote:
>>> Hi Hans,
>>>
>>> On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
>>>> Hi Maxime,
>>>>
>>>> While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
>>>> hdmi out is no longer working (screen goes black when the kernel turns
>>>> of unused clocks).
>>>>
>>>> This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
>>>> listing pll3, without pll3 being added to the clocks list for the
>>>> simplefb nodes.
>>>
>>> Why not do just that then? It's more appropriate for a fix imho.
>>
>> You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
>> sun7i ?
>>
>> For sun4i and sun7i things are already fixed in next:
>>
>> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
>> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679
>>
>> It seems best to use those fixes, rather then come up with a separate
>> fix for 4.7.
>>
>> My patch for fixing sun5i-a10s is inline with the 2 above patches,
>> which seems best, rather then doing something special for just sun5i-a10s.
>
> Well, you are doing something special for just the A10s: the patches
> quoted above just add a bunch of clocks and add the handles to the
> list of clocks managed by simplefb.
>
> For the A10s, you also declare the whole display engine block without
> anyone having tested that it was actually working.

A10s is the same SoC as A13 / R8, just in a different package / with
different pins routed to the outside and it features a parallel LCD
interface just like the A13 / R8. We've had this confirmed by
Allwinner multiple times now, A13 / A10s / R8 literary are the same
chip, there simply is no way the displayblock on the A10s somehow
is magically different.

Given all this, clearly having this identical displayblock in the
shared sun5i.dtsi is the right thing to do.

Regards,

Hans
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Maxime Ripard]

On Mon, Jun 13, 2016 at 10:30:57AM +0200, Hans de Goede wrote:
> Hi,
> 
> On 13-06-16 10:01, Maxime Ripard wrote:
> >On Thu, Jun 09, 2016 at 12:47:36PM +0200, Hans de Goede wrote:
> >>Hi,
> >>
> >>On 09-06-16 09:46, Maxime Ripard wrote:
> >>>Hi Hans,
> >>>
> >>>On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
> >>>>Hi Maxime,
> >>>>
> >>>>While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
> >>>>hdmi out is no longer working (screen goes black when the kernel turns
> >>>>of unused clocks).
> >>>>
> >>>>This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
> >>>>listing pll3, without pll3 being added to the clocks list for the
> >>>>simplefb nodes.
> >>>
> >>>Why not do just that then? It's more appropriate for a fix imho.
> >>
> >>You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
> >>sun7i ?
> >>
> >>For sun4i and sun7i things are already fixed in next:
> >>
> >>https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
> >>https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679
> >>
> >>It seems best to use those fixes, rather then come up with a separate
> >>fix for 4.7.
> >>
> >>My patch for fixing sun5i-a10s is inline with the 2 above patches,
> >>which seems best, rather then doing something special for just sun5i-a10s.
> >
> >Well, you are doing something special for just the A10s: the patches
> >quoted above just add a bunch of clocks and add the handles to the
> >list of clocks managed by simplefb.
> >
> >For the A10s, you also declare the whole display engine block without
> >anyone having tested that it was actually working.
> 
> A10s is the same SoC as A13 / R8, just in a different package / with
> different pins routed to the outside and it features a parallel LCD
> interface just like the A13 / R8. We've had this confirmed by
> Allwinner multiple times now, A13 / A10s / R8 literary are the same
> chip, there simply is no way the displayblock on the A10s somehow
> is magically different.
> 
> Given all this, clearly having this identical displayblock in the
> shared sun5i.dtsi is the right thing to do.

Maybe, but this is not a patch for an 4.7-rc* release, but for the
next merge window.

Maxime

-- 
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/20160620/a8fa6795/attachment.sig>

Re: [PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 2498 bytes --]

On Mon, Jun 13, 2016 at 10:30:57AM +0200, Hans de Goede wrote:
> Hi,
> 
> On 13-06-16 10:01, Maxime Ripard wrote:
> >On Thu, Jun 09, 2016 at 12:47:36PM +0200, Hans de Goede wrote:
> >>Hi,
> >>
> >>On 09-06-16 09:46, Maxime Ripard wrote:
> >>>Hi Hans,
> >>>
> >>>On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
> >>>>Hi Maxime,
> >>>>
> >>>>While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
> >>>>hdmi out is no longer working (screen goes black when the kernel turns
> >>>>of unused clocks).
> >>>>
> >>>>This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
> >>>>listing pll3, without pll3 being added to the clocks list for the
> >>>>simplefb nodes.
> >>>
> >>>Why not do just that then? It's more appropriate for a fix imho.
> >>
> >>You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
> >>sun7i ?
> >>
> >>For sun4i and sun7i things are already fixed in next:
> >>
> >>https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
> >>https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679
> >>
> >>It seems best to use those fixes, rather then come up with a separate
> >>fix for 4.7.
> >>
> >>My patch for fixing sun5i-a10s is inline with the 2 above patches,
> >>which seems best, rather then doing something special for just sun5i-a10s.
> >
> >Well, you are doing something special for just the A10s: the patches
> >quoted above just add a bunch of clocks and add the handles to the
> >list of clocks managed by simplefb.
> >
> >For the A10s, you also declare the whole display engine block without
> >anyone having tested that it was actually working.
> 
> A10s is the same SoC as A13 / R8, just in a different package / with
> different pins routed to the outside and it features a parallel LCD
> interface just like the A13 / R8. We've had this confirmed by
> Allwinner multiple times now, A13 / A10s / R8 literary are the same
> chip, there simply is no way the displayblock on the A10s somehow
> is magically different.
> 
> Given all this, clearly having this identical displayblock in the
> shared sun5i.dtsi is the right thing to do.

Maybe, but this is not a patch for an 4.7-rc* release, but for the
next merge window.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Hans de Goede]

Hi,

On 20-06-16 09:46, Maxime Ripard wrote:
> On Mon, Jun 13, 2016 at 10:30:57AM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 13-06-16 10:01, Maxime Ripard wrote:
>>> On Thu, Jun 09, 2016 at 12:47:36PM +0200, Hans de Goede wrote:
>>>> Hi,
>>>>
>>>> On 09-06-16 09:46, Maxime Ripard wrote:
>>>>> Hi Hans,
>>>>>
>>>>> On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
>>>>>> Hi Maxime,
>>>>>>
>>>>>> While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
>>>>>> hdmi out is no longer working (screen goes black when the kernel turns
>>>>>> of unused clocks).
>>>>>>
>>>>>> This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
>>>>>> listing pll3, without pll3 being added to the clocks list for the
>>>>>> simplefb nodes.
>>>>>
>>>>> Why not do just that then? It's more appropriate for a fix imho.
>>>>
>>>> You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
>>>> sun7i ?
>>>>
>>>> For sun4i and sun7i things are already fixed in next:
>>>>
>>>> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
>>>> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679
>>>>
>>>> It seems best to use those fixes, rather then come up with a separate
>>>> fix for 4.7.
>>>>
>>>> My patch for fixing sun5i-a10s is inline with the 2 above patches,
>>>> which seems best, rather then doing something special for just sun5i-a10s.
>>>
>>> Well, you are doing something special for just the A10s: the patches
>>> quoted above just add a bunch of clocks and add the handles to the
>>> list of clocks managed by simplefb.
>>>
>>> For the A10s, you also declare the whole display engine block without
>>> anyone having tested that it was actually working.
>>
>> A10s is the same SoC as A13 / R8, just in a different package / with
>> different pins routed to the outside and it features a parallel LCD
>> interface just like the A13 / R8. We've had this confirmed by
>> Allwinner multiple times now, A13 / A10s / R8 literary are the same
>> chip, there simply is no way the displayblock on the A10s somehow
>> is magically different.
>>
>> Given all this, clearly having this identical displayblock in the
>> shared sun5i.dtsi is the right thing to do.
>
> Maybe, but this is not a patch for an 4.7-rc* release, but for the
> next merge window.

Ok, I'll send out a patch with the simple fix for 4.7 for sun4i / sun5i-a10s / sun7i
then.

Regards,

Hans

Re: [PATCH 0/1] ARM: dts: sunxi: Fix simplefb not working in 4.7-rc1

[Hans de Goede]

Hi,

On 20-06-16 09:46, Maxime Ripard wrote:
> On Mon, Jun 13, 2016 at 10:30:57AM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 13-06-16 10:01, Maxime Ripard wrote:
>>> On Thu, Jun 09, 2016 at 12:47:36PM +0200, Hans de Goede wrote:
>>>> Hi,
>>>>
>>>> On 09-06-16 09:46, Maxime Ripard wrote:
>>>>> Hi Hans,
>>>>>
>>>>> On Sat, Jun 04, 2016 at 08:05:23PM +0200, Hans de Goede wrote:
>>>>>> Hi Maxime,
>>>>>>
>>>>>> While testing 4.7-rc1 / linux-sunxi/sunxi-next on a A10s I noticed that
>>>>>> hdmi out is no longer working (screen goes black when the kernel turns
>>>>>> of unused clocks).
>>>>>>
>>>>>> This is caused by the dtsi for sun4i / sun5i / sun7i based boards now
>>>>>> listing pll3, without pll3 being added to the clocks list for the
>>>>>> simplefb nodes.
>>>>>
>>>>> Why not do just that then? It's more appropriate for a fix imho.
>>>>
>>>> You mean just for sun5i-a10s, or for all of sun4i / sun5i-a10s and
>>>> sun7i ?
>>>>
>>>> For sun4i and sun7i things are already fixed in next:
>>>>
>>>> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=5a7f2310cc847a73852e70bc720a61ca9bf986a6
>>>> https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?id=c79255ca4d7b67cce4eac4dd532e097ce49f3679
>>>>
>>>> It seems best to use those fixes, rather then come up with a separate
>>>> fix for 4.7.
>>>>
>>>> My patch for fixing sun5i-a10s is inline with the 2 above patches,
>>>> which seems best, rather then doing something special for just sun5i-a10s.
>>>
>>> Well, you are doing something special for just the A10s: the patches
>>> quoted above just add a bunch of clocks and add the handles to the
>>> list of clocks managed by simplefb.
>>>
>>> For the A10s, you also declare the whole display engine block without
>>> anyone having tested that it was actually working.
>>
>> A10s is the same SoC as A13 / R8, just in a different package / with
>> different pins routed to the outside and it features a parallel LCD
>> interface just like the A13 / R8. We've had this confirmed by
>> Allwinner multiple times now, A13 / A10s / R8 literary are the same
>> chip, there simply is no way the displayblock on the A10s somehow
>> is magically different.
>>
>> Given all this, clearly having this identical displayblock in the
>> shared sun5i.dtsi is the right thing to do.
>
> Maybe, but this is not a patch for an 4.7-rc* release, but for the
> next merge window.

Ok, I'll send out a patch with the simple fix for 4.7 for sun4i / sun5i-a10s / sun7i
then.

Regards,

Hans