ARM: dts: imx: use generic name bus

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx6sll.dtsi

diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index 85aa8bb..797f850 100644 (file)
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -144,7 +144,7 @@
                        arm,data-latency = <4 2 3>;
                };
 
-               aips1: aips-bus@2000000 {
+               aips1: bus@2000000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -632,6 +632,15 @@
                                fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
                        };
 
+                       pxp: pxp@20f0000 {
+                               compatible = "fsl,imx6sll-pxp", "fsl,imx6ull-pxp";
+                               reg = <0x20f0000 0x4000>;
+                               interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clks IMX6SLL_CLK_PXP>;
+                               clock-names = "axi";
+                       };
+
                        lcdif: lcd-controller@20f8000 {
                                compatible = "fsl,imx6sll-lcdif", "fsl,imx28-lcdif";
                                reg = <0x020f8000 0x4000>;
@@ -654,7 +663,7 @@
                        };
                };
 
-               aips2: aips-bus@2100000 {
+               aips2: bus@2100000 {
                        compatible = "fsl,aips-bus", "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;