diff options
| author | Hongzhang Yang <Hongzhang.Yang@freescale.com> | 2015-08-25 17:10:42 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-23 16:58:05 +0300 |
| commit | 2312aae88ef6d8d147d54689d4bcfa436b8bfbc9 (patch) | |
| tree | da9e9b7cad0fadc409c62e93d2bae6f7884ced4f /arch | |
| parent | 6cc1bce8989f0ee98cd6cb5c2a13b434059d4a2a (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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx6dl.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 18 |
2 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi index 46ffb38f03e2..08796e21371f 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi @@ -188,3 +188,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 cadd015137a3..2061657cf8f0 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -439,6 +439,24 @@ power-domains = <&gpc 1>; 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 */ |