ENGR00274761-2 Upgrade VPU driver for Linux 3.10 kernel

[karo-tx-linux.git] / arch / arm / boot / dts / imx6q.dtsi

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index addd3f881ce2b6358cbfce34822e3273af714a63..5888c5868e73c5f030296690d9887d6e8350c866 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -75,6 +75,24 @@
        };
 
        soc {
+               gpu@00130000 {
+                       compatible = "fsl,imx6q-gpu";
+                       reg = <0x00130000 0x4000>, <0x00134000 0x4000>,
+                             <0x02204000 0x4000>, <0x0 0x0>;
+                       reg-names = "iobase_3d", "iobase_2d",
+                                   "iobase_vg", "phys_baseaddr";
+                       interrupts = <0 9 0x04>, <0 10 0x04>,<0 11 0x04>;
+                       interrupt-names = "irq_3d", "irq_2d", "irq_vg";
+                       clocks = <&clks 26>, <&clks 143>,
+                                <&clks 27>, <&clks 121>,
+                                <&clks 122>, <&clks 74>;
+                       clock-names = "gpu2d_axi_clk", "openvg_axi_clk",
+                                     "gpu3d_axi_clk", "gpu2d_clk",
+                                     "gpu3d_clk", "gpu3d_shader_clk";
+                       resets = <&src 0>, <&src 3>, <&src 3>;
+                       reset-names = "gpu3d", "gpu2d", "gpuvg";
+               };
+
                ocram: sram@00900000 {
                        compatible = "mmio-sram";
                        reg = <0x00900000 0x40000>;
@@ -95,6 +113,10 @@
                                };
                        };
 
+                       vpu@02040000 {
+                               status = "okay";
+                       };
+
                        iomuxc: iomuxc@020e0000 {
                                compatible = "fsl,imx6q-iomuxc";