Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3b630b2 authored by Hans de Goede's avatar Hans de Goede Committed by Maxime Ripard
Browse files

ARM: dts: sunxi: Add pll3 to simplefb nodes clocks lists 



Now that we've a clock node describing pll3 we must add it to the
simplefb nodes clocks lists to avoid it getting turned off when
simplefb is used.

This fixes the screen going black when using simplefb.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 5fc39d34

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

+12 −9
Original line number Original line Diff line number Diff line
@@ -65,8 +65,9 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0-hdmi";

			allwinner,pipeline = "de_be0-lcd0-hdmi";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 44>, <&dram_gates 26>;

				 <&ahb_gates 43>, <&ahb_gates 44>,

				 <&dram_gates 26>;

			status = "disabled";

			status = "disabled";

		};

		};
@@ -74,8 +75,9 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";

			allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 44>, <&ahb_gates 46>,

				 <&ahb_gates 43>, <&ahb_gates 44>,

				 <&ahb_gates 46>,

				 <&dram_gates 25>, <&dram_gates 26>;

				 <&dram_gates 25>, <&dram_gates 26>;

			status = "disabled";

			status = "disabled";

		};

		};
@@ -84,9 +86,9 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_fe0-de_be0-lcd0";

			allwinner,pipeline = "de_fe0-de_be0-lcd0";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 46>, <&dram_gates 25>,

				 <&ahb_gates 44>, <&ahb_gates 46>,

				 <&dram_gates 26>;

				 <&dram_gates 25>, <&dram_gates 26>;

			status = "disabled";

			status = "disabled";

		};

		};
@@ -94,8 +96,9 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";

			allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";

			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 34>,

				 <&ahb_gates 44>, <&ahb_gates 46>,

				 <&ahb_gates 36>, <&ahb_gates 44>,

				 <&ahb_gates 46>,

				 <&dram_gates 5>, <&dram_gates 25>, <&dram_gates 26>;

				 <&dram_gates 5>, <&dram_gates 25>, <&dram_gates 26>;

			status = "disabled";

			status = "disabled";

		};

		};

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -65,8 +65,8 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0-hdmi";

			allwinner,pipeline = "de_be0-lcd0-hdmi";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 44>;

				 <&ahb_gates 43>, <&ahb_gates 44>;

			status = "disabled";

			status = "disabled";

		};

		};
@@ -74,7 +74,8 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0";

			allwinner,pipeline = "de_be0-lcd0";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 44>;

			status = "disabled";

			status = "disabled";

		};

		};
@@ -82,8 +83,8 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0-tve0";

			allwinner,pipeline = "de_be0-lcd0-tve0";

			clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 34>,

				 <&ahb_gates 44>;

				 <&ahb_gates 36>, <&ahb_gates 44>;

			status = "disabled";

			status = "disabled";

		};

		};

	};

	};

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -67,8 +67,9 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0-hdmi";

			allwinner,pipeline = "de_be0-lcd0-hdmi";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&ahb_gates 44>, <&dram_gates 26>;

				 <&ahb_gates 43>, <&ahb_gates 44>,

				 <&dram_gates 26>;

			status = "disabled";

			status = "disabled";

		};

		};
@@ -76,8 +77,8 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0";

			allwinner,pipeline = "de_be0-lcd0";

			clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>,

			clocks = <&pll3>, <&pll5 1>, <&ahb_gates 36>,

				 <&dram_gates 26>;

				 <&ahb_gates 44>, <&dram_gates 26>;

			status = "disabled";

			status = "disabled";

		};

		};
@@ -85,7 +86,7 @@ 
			compatible = "allwinner,simple-framebuffer",

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

				     "simple-framebuffer";

			allwinner,pipeline = "de_be0-lcd0-tve0";

			allwinner,pipeline = "de_be0-lcd0-tve0";

			clocks = <&pll5 1>,

			clocks = <&pll3>, <&pll5 1>,

				 <&ahb_gates 34>, <&ahb_gates 36>, <&ahb_gates 44>,

				 <&ahb_gates 34>, <&ahb_gates 36>, <&ahb_gates 44>,

				 <&dram_gates 5>, <&dram_gates 26>;

				 <&dram_gates 5>, <&dram_gates 26>;

			status = "disabled";

			status = "disabled";