Unverified Commit 437262c0 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard
Browse files

ARM: dts: sun8i-a33: Move display pipeline nodes to a23/a33 common dtsi 



The display pipeline has the same structure, resources and connections
on both the A23 and A33. The differences include:

  - compatible strings
  - extra clock, reset control, and IO region for SAT in the backend
    only found on the A33
  - missing ch1 clock for the TCON

However, while the A23 has the TCON ch1 clock defined in the CCU, and
the channel 1 registers are available, it does not have any means to
use channel 1 due to a lack of downstream encoders, and the enable bit
for channel 1 is hard-wired to 0 (off).

As the MIPI DSI output device is not officially documented, and there
are no A23 reference devices to test it, it is not covered by this
patch.

Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent d0275214

arch/arm/boot/dts/sun8i-a23-a33.dtsi

+147 −0
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ simplefb_lcd: framebuffer-lcd0 { 
		};

	};



	de: display-engine {

		/* compatible gets set in SoC specific dtsi file */

		allwinner,pipelines = <&fe0>;

		status = "disabled";

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -168,6 +174,42 @@ nfc: nand@1c03000 { 
			#size-cells = <0>;

		};



		tcon0: lcd-controller@1c0c000 {

			/* compatible gets set in SoC specific dtsi file */

			reg = <0x01c0c000 0x1000>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_LCD>,

				 <&ccu CLK_LCD_CH0>;

			clock-names = "ahb",

				      "tcon-ch0";

			clock-output-names = "tcon-pixel-clock";

			resets = <&ccu RST_BUS_LCD>;

			reset-names = "lcd";

			status = "disabled";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				tcon0_in: port@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;



					tcon0_in_drc0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&drc0_out_tcon0>;

					};

				};



				tcon0_out: port@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;

				};

			};

		};



		mmc0: mmc@1c0f000 {

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c0f000 0x1000>;
@@ -570,6 +612,111 @@ gic: interrupt-controller@1c81000 { 
			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

		};



		fe0: display-frontend@1e00000 {

			/* compatible gets set in SoC specific dtsi file */

			reg = <0x01e00000 0x20000>;

			interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_DE_FE>, <&ccu CLK_DE_FE>,

				 <&ccu CLK_DRAM_DE_FE>;

			clock-names = "ahb", "mod",

				      "ram";

			resets = <&ccu RST_BUS_DE_FE>;



			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@1e60000 {

			/* compatible gets set in SoC specific dtsi file */

			reg = <0x01e60000 0x10000>;

			interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_DE_BE>, <&ccu CLK_DE_BE>,

				 <&ccu CLK_DRAM_DE_BE>;

			clock-names = "ahb", "mod",

				      "ram";

			resets = <&ccu RST_BUS_DE_BE>;



			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_drc0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&drc0_in_be0>;

					};

				};

			};

		};



		drc0: drc@1e70000 {

			/* compatible gets set in SoC specific dtsi file */

			reg = <0x01e70000 0x10000>;

			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_DRC>, <&ccu CLK_DRC>,

				 <&ccu CLK_DRAM_DRC>;

			clock-names = "ahb", "mod", "ram";

			resets = <&ccu RST_BUS_DRC>;



			assigned-clocks = <&ccu CLK_DRC>;

			assigned-clock-rates = <300000000>;



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				drc0_in: port@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;



					drc0_in_be0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&be0_out_drc0>;

					};

				};



				drc0_out: port@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;



					drc0_out_tcon0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&tcon0_in_drc0>;

					};

				};

			};

		};



		rtc: rtc@1f00000 {

			compatible = "allwinner,sun8i-a23-rtc";

			reg = <0x01f00000 0x400>;

arch/arm/boot/dts/sun8i-a33.dtsi

+38 −156
Original line number Diff line number Diff line
@@ -159,12 +159,6 @@ cpu3: cpu@3 { 
		};

	};



	de: display-engine {

		compatible = "allwinner,sun8i-a33-display-engine";

		allwinner,pipelines = <&fe0>;

		status = "disabled";

	};



	iio-hwmon {

		compatible = "iio-hwmon";

		io-channels = <&ths>;
@@ -209,47 +203,6 @@ link_codec: simple-audio-card,codec { 
	};



	soc {

		tcon0: lcd-controller@1c0c000 {

			compatible = "allwinner,sun8i-a33-tcon";

			reg = <0x01c0c000 0x1000>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_LCD>,

				 <&ccu CLK_LCD_CH0>;

			clock-names = "ahb",

				      "tcon-ch0";

			clock-output-names = "tcon-pixel-clock";

			resets = <&ccu RST_BUS_LCD>;

			reset-names = "lcd";

			status = "disabled";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				tcon0_in: port@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;



					tcon0_in_drc0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&drc0_out_tcon0>;

					};

				};



				tcon0_out: port@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;



					tcon0_out_dsi: endpoint@1 {

						reg = <1>;

						remote-endpoint = <&dsi_in_tcon0>;

					};

				};

			};

		};



		video-codec@1c0e000 {

			compatible = "allwinner,sun8i-a33-video-engine";

			reg = <0x01c0e000 0x1000>;
@@ -339,115 +292,6 @@ dphy: d-phy@1ca1000 { 
			status = "disabled";

			#phy-cells = <0>;

		};



		fe0: display-frontend@1e00000 {

			compatible = "allwinner,sun8i-a33-display-frontend";

			reg = <0x01e00000 0x20000>;

			interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_DE_FE>, <&ccu CLK_DE_FE>,

				 <&ccu CLK_DRAM_DE_FE>;

			clock-names = "ahb", "mod",

				      "ram";

			resets = <&ccu RST_BUS_DE_FE>;



			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@1e60000 {

			compatible = "allwinner,sun8i-a33-display-backend";

			reg = <0x01e60000 0x10000>, <0x01e80000 0x1000>;

			reg-names = "be", "sat";

			interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_DE_BE>, <&ccu CLK_DE_BE>,

				 <&ccu CLK_DRAM_DE_BE>, <&ccu CLK_BUS_SAT>;

			clock-names = "ahb", "mod",

				      "ram", "sat";

			resets = <&ccu RST_BUS_DE_BE>, <&ccu RST_BUS_SAT>;

			reset-names = "be", "sat";

			assigned-clocks = <&ccu CLK_DE_BE>;

			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_drc0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&drc0_in_be0>;

					};

				};

			};

		};



		drc0: drc@1e70000 {

			compatible = "allwinner,sun8i-a33-drc";

			reg = <0x01e70000 0x10000>;

			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_BUS_DRC>, <&ccu CLK_DRC>,

				 <&ccu CLK_DRAM_DRC>;

			clock-names = "ahb", "mod", "ram";

			resets = <&ccu RST_BUS_DRC>;



			assigned-clocks = <&ccu CLK_DRC>;

			assigned-clock-rates = <300000000>;



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				drc0_in: port@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;



					drc0_in_be0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&be0_out_drc0>;

					};

				};



				drc0_out: port@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;



					drc0_out_tcon0: endpoint@0 {

						reg = <0>;

						remote-endpoint = <&tcon0_in_drc0>;

					};

				};

			};

		};

	};



	thermal-zones {
@@ -524,10 +368,37 @@ cpu_crit: cpu_crit { 
	};

};



&be0 {

	compatible = "allwinner,sun8i-a33-display-backend";

	/* A33 has an extra "SAT" module packed inside the display backend */

	reg = <0x01e60000 0x10000>, <0x01e80000 0x1000>;

	reg-names = "be", "sat";

	clocks = <&ccu CLK_BUS_DE_BE>, <&ccu CLK_DE_BE>,

		 <&ccu CLK_DRAM_DE_BE>, <&ccu CLK_BUS_SAT>;

	clock-names = "ahb", "mod",

		      "ram", "sat";

	resets = <&ccu RST_BUS_DE_BE>, <&ccu RST_BUS_SAT>;

	reset-names = "be", "sat";

	assigned-clocks = <&ccu CLK_DE_BE>;

	assigned-clock-rates = <300000000>;

};



&ccu {

	compatible = "allwinner,sun8i-a33-ccu";

};



&de {

	compatible = "allwinner,sun8i-a33-display-engine";

};



&drc0 {

	compatible = "allwinner,sun8i-a33-drc";

};



&fe0 {

	compatible = "allwinner,sun8i-a33-display-frontend";

};



&mali {

	operating-points-v2 = <&mali_opp_table>;

};
@@ -544,6 +415,17 @@ uart0_pb_pins: uart0-pb-pins { 


};



&tcon0 {

	compatible = "allwinner,sun8i-a33-tcon";

};



&tcon0_out {

	tcon0_out_dsi: endpoint@1 {

		reg = <1>;

		remote-endpoint = <&dsi_in_tcon0>;

	};

};



&usb_otg {

	compatible = "allwinner,sun8i-a33-musb";

};