Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-microblaze.git] / arch / arm / boot / dts / gemini.dtsi

diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi
index b9b07d0..cb5c925 100644 (file)
--- a/arch/arm/boot/dts/gemini.dtsi
+++ b/arch/arm/boot/dts/gemini.dtsi
@@ -142,6 +142,12 @@
                                                groups = "idegrp";
                                        };
                                };
+                               tvc_default_pins: pinctrl-tvc {
+                                       mux {
+                                               function = "tvc";
+                                               groups = "tvcgrp";
+                                       };
+                               };
                        };
                };
 
@@ -348,5 +354,20 @@
                        memcpy-bus-width = <32>;
                        #dma-cells = <2>;
                };
+
+               display-controller@6a000000 {
+                       compatible = "cortina,gemini-tvc", "faraday,tve200";
+                       reg = <0x6a000000 0x1000>;
+                       interrupts = <13 IRQ_TYPE_EDGE_RISING>;
+                       resets = <&syscon GEMINI_RESET_TVC>;
+                       clocks = <&syscon GEMINI_CLK_GATE_TVC>,
+                                <&syscon GEMINI_CLK_TVC>;
+                       clock-names = "PCLK", "TVE";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&tvc_default_pins>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
        };
 };