ENGR00274761-2 Upgrade VPU driver for Linux 3.10 kernel

Add VPU node in dtsi
- Add VPU node (common part) in imx6qdl.dtsi. It was defined
  in imx6.dtsi in Linux 3.5.7.
- Add "iram" property for gen_pool api callings
- Add "resets" property for device_reset api calling
- Add VPU node (soc specific part) in imx6q.dtsi and imx6dl.dtsi

Signed-off-by: Hongzhang Yang <Hongzhang.Yang@freescale.com>

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 507cd6c24f0679ce7690eca9fffdd89fd57c3d4c..5aae91f72da8ac4754ec5c063cc5fac8419ec51e 100644 (file)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -82,6 +82,11 @@
                };
 
                aips1: aips-bus@02000000 {
+                       vpu@02040000 {
+                               iramsize = <0>;
+                               status = "okay";
+                       };
+
                        iomuxc: iomuxc@020e0000 {
                                compatible = "fsl,imx6dl-iomuxc";
                        };

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 2d18bf3b4123dd97ba5b468987a7fe69ee76e6f3..72b7547556b1a2742c125de542e281db3f1e318b 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -128,6 +128,10 @@
                                };
                        };
 
+                       vpu@02040000 {
+                               status = "okay";
+                       };
+
                        iomuxc: iomuxc@020e0000 {
                                compatible = "fsl,imx6q-iomuxc";
 

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 07f0a46ac51047d4637b5cbf8b8b5224f6dd5902..5cb48760eb6e3fcef6716ac2267344c940a44dfd 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -249,8 +249,17 @@
                        };
 
                        vpu: vpu@02040000 {
+                               compatible = "fsl,imx6-vpu";
                                reg = <0x02040000 0x3c000>;
-                               interrupts = <0 3 0x04 0 12 0x04>;
+                               reg-names = "vpu_regs";
+                               interrupts = <0 3 0x01>, <0 12 0x04>;
+                               interrupt-names = "vpu_jpu_irq", "vpu_ipi_irq";
+                               clocks = <&clks 168>, <&clks 140>, <&clks 142>;
+                               clock-names = "vpu_clk", "mmdc_ch0_axi", "ocram";
+                               iramsize = <0x21000>;
+                               iram = <&ocram>;
+                               resets = <&src 1>;
+                               status = "disabled";
                        };
 
                        aipstz@0207c000 { /* AIPSTZ1 */