redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

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>
pull/10/head
Hongzhang Yang 2015-08-25 17:10:42 +08:00 committed by Jason Liu
parent e6183ec886
commit 992ebec7c1
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/imx6dl.dtsi
View File

@ -377,3 +377,7 @@
&vpu {
compatible = "fsl,imx6dl-vpu", "cnm,coda960";
};
&vpu_fsl {
iramsize = <0>;
};

18
arch/arm/boot/dts/imx6qdl.dtsi
View File

@ -449,6 +449,24 @@
power-domains = <&pd_pu>;
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 = <&pd_pu>;
};
aipstz@0207c000 { /* AIPSTZ1 */