Skip to content

Commit

Permalink
ARM: dts: imx6qdl: Enable CODA960 VPU
Browse files Browse the repository at this point in the history
This patch adds links to the on-chip SRAM and reset controller nodes
and switches the interrupts. Make the BIT processor interrupt, which exists on
all variants, the first one. The JPEG unit interrupt, which does not exist on
i.MX27 and i.MX5 thus is an optional second interrupt.
Use different compatible strings for i.MX6Q/D and i.MX6S/DL, as they have to
load separate firmware images for some reason.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
  • Loading branch information
Philipp Zabel authored and Shawn Guo committed Nov 23, 2014
1 parent 367415d commit a04a0b6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/imx6dl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,7 @@
"di0_sel", "di1_sel",
"di0", "di1";
};

&vpu {
compatible = "fsl,imx6dl-vpu", "cnm,coda960";
};
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/imx6q.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -308,3 +308,7 @@
};
};
};

&vpu {
compatible = "fsl,imx6q-vpu", "cnm,coda960";
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/imx6qdl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,17 @@
};

vpu: vpu@02040000 {
compatible = "cnm,coda960";
reg = <0x02040000 0x3c000>;
interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>,
<0 12 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "bit", "jpeg";
clocks = <&clks IMX6QDL_CLK_VPU_AXI>,
<&clks IMX6QDL_CLK_MMDC_CH0_AXI>,
<&clks IMX6QDL_CLK_OCRAM>;
clock-names = "per", "ahb", "ocram";
resets = <&src 1>;
iram = <&ocram>;
};

aipstz@0207c000 { /* AIPSTZ1 */
Expand Down

0 comments on commit a04a0b6

Please sign in to comment.