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

Commit bea13693 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: sun5i: r8: Merge common controllers into the common DTSI 



Some controllers found in the R8 DTSI actually apply to all of the sun5i
family. Move those into the common DTSI so that all SoCs can benefit from
it.

Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 78f6d982

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

+0 −40
Original line number Diff line number Diff line
@@ -45,43 +45,3 @@ 


#include "sun5i-a13.dtsi"

/ {

	chosen {

		framebuffer@1 {

			compatible = "allwinner,simple-framebuffer",

				     "simple-framebuffer";

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

			clocks = <&ccu CLK_AHB_TVE>, <&ccu CLK_AHB_LCD>,

				 <&ccu CLK_AHB_DE_BE>, <&ccu CLK_DE_BE>,

				 <&ccu CLK_TCON_CH1>, <&ccu CLK_DRAM_DE_BE>;

			status = "disabled";

		};

	};



	soc@01c00000 {

		tve0: tv-encoder@01c0a000 {

			compatible = "allwinner,sun4i-a10-tv-encoder";

			reg = <0x01c0a000 0x1000>;

			clocks = <&ccu CLK_AHB_TVE>;

			resets = <&ccu RST_TVE>;

			status = "disabled";



			port {

				#address-cells = <1>;

				#size-cells = <0>;



				tve0_in_tcon0: endpoint@0 {

					reg = <0>;

					remote-endpoint = <&tcon0_out_tve0>;

				};

			};

		};

	};

};



&tcon0_out {

	tcon0_out_tve0: endpoint@1 {

		reg = <1>;

		remote-endpoint = <&tve0_in_tcon0>;

	};

};

arch/arm/boot/dts/sun5i.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -187,6 +187,24 @@ 
			#size-cells = <0>;

		};



		tve0: tv-encoder@01c0a000 {

			compatible = "allwinner,sun4i-a10-tv-encoder";

			reg = <0x01c0a000 0x1000>;

			clocks = <&ccu CLK_AHB_TVE>;

			resets = <&ccu RST_TVE>;

			status = "disabled";



			port {

				#address-cells = <1>;

				#size-cells = <0>;



				tve0_in_tcon0: endpoint@0 {

					reg = <0>;

					remote-endpoint = <&tcon0_out_tve0>;

				};

			};

		};



		emac: ethernet@01c0b000 {

			compatible = "allwinner,sun4i-a10-emac";

			reg = <0x01c0b000 0x1000>;
@@ -238,6 +256,11 @@ 
					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;



					tcon0_out_tve0: endpoint@1 {

						reg = <1>;

						remote-endpoint = <&tve0_in_tcon0>;

					};

				};

			};

		};