summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHongzhang Yang <Hongzhang.Yang@freescale.com>2015-08-25 17:10:42 +0800
committerNitin Garg <nitin.garg@nxp.com>2016-01-14 11:00:08 -0600
commitf67132364015558d1b13ae258c6f633624824e6a (patch)
tree000bc22355b35262f0adde76bc74cd510a9f4cf5
parent8387beccf1f2474847e584349be17d96158e1ebc (diff)
MLK-11440-1 Integrate VPU driver to kernel 4.1
- Include 3.14 VPU node with no change - Disable coda960 VPU node to avoid conflict Signed-off-by: Hongzhang Yang <Hongzhang.Yang@freescale.com>
-rw-r--r--arch/arm/boot/dts/imx6dl.dtsi4
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi18
2 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index cb72bcd..6344114 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -126,3 +126,7 @@
&vpu {
compatible = "fsl,imx6dl-vpu", "cnm,coda960";
};
+
+&vpu_fsl {
+ iramsize = <0>;
+};
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 9211193..0b72a5e 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -388,6 +388,24 @@
clock-names = "per", "ahb";
resets = <&src 1>;
iram = <&ocram>;
+ status = "disabled";
+ };
+
+ vpu_fsl: vpu_fsl@02040000 {
+ compatible = "fsl,imx6-vpu";
+ reg = <0x02040000 0x3c000>;
+ reg-names = "vpu_regs";
+ interrupts = <0 3 IRQ_TYPE_EDGE_RISING>,
+ <0 12 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "vpu_jpu_irq", "vpu_ipi_irq";
+ clocks = <&clks IMX6QDL_CLK_VPU_AXI>,
+ <&clks IMX6QDL_CLK_MMDC_CH0_AXI>,
+ <&clks IMX6QDL_CLK_OCRAM>;
+ clock-names = "vpu_clk", "mmdc_ch0_axi", "ocram";
+ iramsize = <0x21000>;
+ iram = <&ocram>;
+ resets = <&src 1>;
+ power-domains = <&gpc 1>;
};
aipstz@0207c000 { /* AIPSTZ1 */