ENGR00299748-2 ARM: dts: imx: add pxp support for imx6sx 17x17 arm2 board

- add pxp resources
- add a dummy clock for imx6sl/imx6dl

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

4 files changed, 19 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 286337940bf7..abad136c5487 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -136,8 +136,8 @@
                                 compatible = "fsl,imx6dl-pxp-dma";
                                 reg = <0x020f0000 0x4000>;
                                 interrupts = <0 98 0x04>;
-                                clocks = <&clks 133>;
-                                clock-names = "pxp-axi";
+                                clocks = <&clks 133>, <&clks 0>;
+                                clock-names = "pxp-axi", "disp-axi";
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 274000feea9f..40afe29b23a3 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -663,8 +663,8 @@
                                 compatible = "fsl,imx6sl-pxp-dma", "fsl,imx6dl-pxp-dma";
                                 reg = <0x020f0000 0x4000>;
                                 interrupts = <0 98 0x04>;
-                                clocks = <&clks 111>;
-                                clock-names = "pxp-axi";
+                                clocks = <&clks IMX6SL_CLK_PXP_AXI>, <&clks IMX6SL_CLK_DUMMY>;
+                                clock-names = "pxp-axi", "disp-axi";
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
index c0bef11a01cd..ea34d7f12b7c 100644
--- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
@@ -119,6 +119,10 @@
         status = "okay";
 };
 
+&pxp {
+        status = "okay";
+};
+
 &uart1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_uart1_1>;
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index c5dfb7521a41..59ed77ca801d 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -418,6 +418,17 @@
                                         clock-names = "pix", "axi", "disp_axi";
                                         status = "disabled";
                                 };
+
+                                pxp: pxp@02218000 {
+                                        compatible = "fsl,imx6sx-pxp-dma", "fsl,imx6sl-pxp-dma", "fsl,imx6dl-pxp-dma";
+                                        reg = <0x02218000 0x4000>;
+                                        interrupts = <0 8 0x04>;
+                                        clocks = <&clks IMX6SX_CLK_PXP_AXI>,
+                                                <&clks IMX6SX_CLK_DISPLAY_AXI>;
+                                        clock-names = "pxp-axi", "disp-axi";
+                                        status = "disabled";
+                                };
+
                                 spba@0223c000 {
                                         reg = <0x0223c000 0x4000>;
                                 };