ENGR00274412-2 ARM: dts: enable ePxP for imx6dl_sd and imx6sl_evk

Enable ePxP in DTS for imx6 duallite sabresd and imx6 sololite evk board.

Signed-off-by: Robby Cai <R63905@freescale.com>

diff --git a/Documentation/devicetree/bindings/video/fsl,pxp.txt b/Documentation/devicetree/bindings/video/fsl,pxp.txt
new file mode 100644 (file)
index 0000000..5b9ea40
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/fsl,pxp.txt
@@ -0,0 +1,30 @@
+* Freescale PxP Controller for i.MX6DL, i.MX6SL
+
+Required properties for PxP controller:
+- compatible: should be "fsl,<soc>-pxp-dma"
+- reg: <base addr, range> contains pxp register base address and range
+- interrupts: <type num flag> where type is an interrupt type, num is the
+  interrupt number and flag is a field that level/trigger information for
+  the interrupt.
+- clocks: the clock sources that pxp depends on.
+- clock-names: the name is related to the clock source
+
+Required properties for pxp on specified board:
+- status: should be set to "okay" if want to use PxP
+
+Examples:
+for SOC imx6dl.dtsi:
+       pxp@020f0000 {
+               compatible = "fsl,imx6dl-pxp-dma";
+               reg = <0x020f0000 0x4000>;
+               interrupts = <0 98 0x04>;
+               clocks = <&clks 133>;
+               clock-names = "pxp-axi";
+               status = "disabled";
+       };
+
+
+for board imx6dl-sabresd.dts:
+       &pxp {
+               status = "okay";
+       };

diff --git a/arch/arm/boot/dts/imx6dl-sabresd.dts b/arch/arm/boot/dts/imx6dl-sabresd.dts
index 1e45f2f9d0b6bce33210988fb17ff816a173c8b7..42a6bc165cac5839df9f72d24db48ee643996c1b 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-sabresd.dts
+++ b/arch/arm/boot/dts/imx6dl-sabresd.dts
@@ -15,3 +15,20 @@
        model = "Freescale i.MX6 DualLite SABRE Smart Device Board";
        compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
 };
+
+&ldb {
+       ipu_id = <0>;
+       sec_ipu_id = <0>;
+};
+
+&pxp {
+       status = "okay";
+};
+
+&mxcfb1 {
+       status = "okay";
+};
+
+&mxcfb2 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 95e6bbc5280c8c089c3a1a0f3827563ad5ebac90..aae4b369ff714cd4521311b9343f8cc08890adce 100644 (file)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -88,8 +88,12 @@
                        };
 
                        pxp: pxp@020f0000 {
+                               compatible = "fsl,imx6dl-pxp-dma";
                                reg = <0x020f0000 0x4000>;
                                interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clks 133>;
+                               clock-names = "pxp-axi";
+                               status = "disabled";
                        };
 
                        epdc: epdc@020f4000 {

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index a8d9a93fab85fd5031eb8c164fc676823392e0b2..2b71fea982cdb57320838f7ae2fd11aa76249a11 100644 (file)
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -529,3 +529,7 @@
        cd-gpios = <&gpio3 22 0>;
        status = "okay";
 };
+
+&pxp {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 57d4abe03a94f55180e6c6bf01f5919657fd9408..76a0a8e8508fbe7a08f0fde57a45cd6d5a688c29 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -619,8 +619,12 @@
                        };
 
                        pxp: pxp@020f0000 {
+                               compatible = "fsl,imx6sl-pxp-dma", "fsl,imx6dl-pxp-dma";
                                reg = <0x020f0000 0x4000>;
                                interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clks 111>;
+                               clock-names = "pxp-axi";
+                               status = "disabled";
                        };
 
                        epdc: epdc@020f4000 {