These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / pxa3xx.dtsi

diff --git a/kernel/arch/arm/boot/dts/pxa3xx.dtsi b/kernel/arch/arm/boot/dts/pxa3xx.dtsi
index 83bb0ef..cf6998a 100644 (file)
--- a/kernel/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/kernel/arch/arm/boot/dts/pxa3xx.dtsi
@@ -1,15 +1,25 @@
 /* The pxa3xx skeleton simply augments the 2xx version */
-/include/ "pxa2xx.dtsi"
+#include "pxa2xx.dtsi"
 
 / {
        model = "Marvell PXA3xx familiy SoC";
        compatible = "marvell,pxa3xx";
 
        pxabus {
+               pdma: dma-controller@40000000 {
+                       compatible = "marvell,pdma-1.0";
+                       reg = <0x40000000 0x10000>;
+                       interrupts = <25>;
+                       #dma-channels = <32>;
+                       #dma-cells = <2>;
+                       status = "okay";
+               };
+
                pwri2c: i2c@40f500c0 {
                        compatible = "mrvl,pwri2c";
                        reg = <0x40f500c0 0x30>;
                        interrupts = <6>;
+                       clocks = <&clks CLK_PWRI2C>;
                        #address-cells = <0x1>;
                        #size-cells = <0>;
                        status = "disabled";
@@ -19,6 +29,9 @@
                        compatible = "marvell,pxa3xx-nand";
                        reg = <0x43100000 90>;
                        interrupts = <45>;
+                       clocks = <&clks CLK_NAND>;
+                       dmas = <&pdma 97>;
+                       dma-names = "data";
                        #address-cells = <1>;
                        #size-cells = <1>;      
                        status = "disabled";
@@ -32,6 +45,7 @@
                gpio: gpio@40e00000 {
                        compatible = "intel,pxa3xx-gpio";
                        reg = <0x40e00000 0x10000>;
+                       clocks = <&clks CLK_GPIO>;
                        interrupt-names = "gpio0", "gpio1", "gpio_mux";
                        interrupts = <8 9 10>;
                        gpio-controller;
@@ -39,5 +53,70 @@
                        interrupt-controller;
                        #interrupt-cells = <0x2>;
                };
+
+               mmc0: mmc@41100000 {
+                       compatible = "marvell,pxa-mmc";
+                       reg = <0x41100000 0x1000>;
+                       interrupts = <23>;
+                       clocks = <&clks CLK_MMC>;
+                       dmas = <&pdma 21 3
+                               &pdma 22 3>;
+                       dma-names = "rx", "tx";
+                       status = "disabled";
+               };
+
+               mmc1: mmc@42000000 {
+                       compatible = "marvell,pxa-mmc";
+                       reg = <0x42000000 0x1000>;
+                       interrupts = <41>;
+                       clocks = <&clks CLK_MMC1>;
+                       dmas = <&pdma 93 3
+                               &pdma 94 3>;
+                       dma-names = "rx", "tx";
+                       status = "disabled";
+               };
+
+               mmc2: mmc@42500000 {
+                       compatible = "marvell,pxa-mmc";
+                       reg = <0x42500000 0x1000>;
+                       interrupts = <55>;
+                       clocks = <&clks CLK_MMC2>;
+                       dmas = <&pdma 46 3
+                               &pdma 47 3>;
+                       dma-names = "rx", "tx";
+                       status = "disabled";
+               };
+
+               pxa3xx_ohci: usb@4c000000 {
+                       compatible = "marvell,pxa-ohci";
+                       reg = <0x4c000000 0x10000>;
+                       interrupts = <3>;
+                       clocks = <&clks CLK_USBHOST>;
+                       status = "disabled";
+               };
+       };
+
+       clocks {
+              /*
+               * The muxing of external clocks/internal dividers for osc* clock
+               * sources has been hidden under the carpet by now.
+               */
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               clks: pxa3xx_clks@41300004 {
+                       compatible = "marvell,pxa300-clocks";
+                       #clock-cells = <1>;
+                       status = "okay";
+               };
+       };
+
+       timer@40a00000 {
+               compatible = "marvell,pxa-timer";
+               reg = <0x40a00000 0x20>;
+               interrupts = <26>;
+               clocks = <&clks CLK_OSTIMER>;
+               status = "okay";
        };
 };