ARM: sun5i: a10s: Add the HDMI controller node

The A10s has an HDMI controller connected to the second TCON channel. Add
it to our DT.

Since the TV Encoder was the only channel 1 user so far, also add the
property now that we have several users.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
[wens@csie.org: Replaced CLK_PLL_VIDEO[01]_2X with raw numbers for now
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 1e38ff80366c677b6ee76a033f134cdc837ec1b5..18f25c5e75aebc3584699ec661b07fde5610f17c 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -71,7 +71,46 @@
                };
        };
 
+       display-engine {
+               compatible = "allwinner,sun5i-a10s-display-engine";
+               allwinner,pipelines = <&fe0>;
+       };
+
        soc@01c00000 {
+               hdmi: hdmi@01c16000 {
+                       compatible = "allwinner,sun5i-a10s-hdmi";
+                       reg = <0x01c16000 0x1000>;
+                       interrupts = <58>;
+                       clocks = <&ccu CLK_AHB_HDMI>, <&ccu CLK_HDMI>,
+                                <&ccu 9>,
+                                <&ccu 16>;
+                       clock-names = "ahb", "mod", "pll-0", "pll-1";
+                       dmas = <&dma SUN4I_DMA_NORMAL 16>,
+                              <&dma SUN4I_DMA_NORMAL 16>,
+                              <&dma SUN4I_DMA_DEDICATED 24>;
+                       dma-names = "ddc-tx", "ddc-rx", "audio-tx";
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               hdmi_in: port@0 {
+                                       reg = <0>;
+
+                                       hdmi_in_tcon0: endpoint {
+                                               remote-endpoint = <&tcon0_out_hdmi>;
+                                       };
+                               };
+
+                               hdmi_out: port@1 {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       reg = <1>;
+                               };
+                       };
+               };
+
                pwm: pwm@01c20e00 {
                        compatible = "allwinner,sun5i-a10s-pwm";
                        reg = <0x01c20e00 0xc>;
@@ -128,3 +167,11 @@
 
 &sram_a {
 };
+
+&tcon0_out {
+       tcon0_out_hdmi: endpoint@2 {
+               reg = <2>;
+               remote-endpoint = <&hdmi_in_tcon0>;
+               allwinner,tcon-channel = <1>;
+       };
+};

diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 5175f9cc9bed0f4f6169c1ef9387ffa74044b0b5..0e29f1d98a9e0eddaa93a9fad8a7c8e187ab4c29 100644 (file)
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -272,6 +272,7 @@
                                        tcon0_out_tve0: endpoint@1 {
                                                reg = <1>;
                                                remote-endpoint = <&tve0_in_tcon0>;
+                                               allwinner,tcon-channel = <1>;
                                        };
                                };
                        };