Merge tag 'mvebu-fixes-4.17-2' of git://git.infradead.org/linux-mvebu into fixes

[mirror_ubuntu-eoan-kernel.git] / arch / arm / boot / dts / pxa3xx.dtsi

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 982d1a62661d4e8d265c66ccba8193635a571962..132a3b8ab14849ad6634f466c2e8320062779662 100644 (file)
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -8,6 +8,10 @@
         (gpio <= 98) ? (0x0400 + 4 * (gpio - 27)) :    \
         (gpio <= 127) ? (0x0600 + 4 * (gpio - 99)) :   \
         0)
+#define MFP_PIN_PXA300_2(gpio)                         \
+       ((gpio <= 1) ? (0x674 + 4 * gpio) :             \
+        (gpio <= 6) ? (0x2dc + 4 * gpio) :             \
+        0)
 
 #define MFP_PIN_PXA310(gpio)                           \
        ((gpio <= 2) ? (0x00b4 + 4 * gpio) :            \
@@ -18,6 +22,11 @@
         (gpio <= 262) ? 0 :                            \
         (gpio <= 268) ? (0x052c + 4 * (gpio - 263)) :  \
         0)
+#define MFP_PIN_PXA310_2(gpio)                         \
+       ((gpio <= 1) ? (0x674 + 4 * gpio) :             \
+        (gpio <= 6) ? (0x2dc + 4 * gpio) :             \
+        (gpio <= 10) ? (0x52c + 4 * gpio) :            \
+        0)
 
 #define MFP_PIN_PXA320(gpio)                           \
        ((gpio <= 4) ? (0x0124 + 4 * gpio) :            \
@@ -30,6 +39,10 @@
         (gpio <= 98) ? (0x04f0 + 4 * (gpio - 74)) :    \
         (gpio <= 127) ? (0x0600 + 4 * (gpio - 99)) :   \
         0)
+#define MFP_PIN_PXA320_2(gpio)                         \
+       ((gpio <= 3) ? (0x674 + 4 * gpio) :             \
+        (gpio <= 5) ? (0x284 + 4 * gpio) :             \
+        0)
 
 /*
  * MFP Alternate functions for pins having a gpio.
@@ -148,6 +161,7 @@
                        compatible = "intel,pxa3xx-gpio";
                        reg = <0x40e00000 0x10000>;
                        clocks = <&clks CLK_GPIO>;
+                       gpio-ranges = <&pinctrl 0 0 128>;
                        interrupt-names = "gpio0", "gpio1", "gpio_mux";
                        interrupts = <8 9 10>;
                        gpio-controller;
@@ -160,7 +174,7 @@
                        compatible = "marvell,pxa-mmc";
                        reg = <0x41100000 0x1000>;
                        interrupts = <23>;
-                       clocks = <&clks CLK_MMC>;
+                       clocks = <&clks CLK_MMC1>;
                        dmas = <&pdma 21 3
                                &pdma 22 3>;
                        dma-names = "rx", "tx";
@@ -171,7 +185,7 @@
                        compatible = "marvell,pxa-mmc";
                        reg = <0x42000000 0x1000>;
                        interrupts = <41>;
-                       clocks = <&clks CLK_MMC1>;
+                       clocks = <&clks CLK_MMC2>;
                        dmas = <&pdma 93 3
                                &pdma 94 3>;
                        dma-names = "rx", "tx";
@@ -182,7 +196,7 @@
                        compatible = "marvell,pxa-mmc";
                        reg = <0x42500000 0x1000>;
                        interrupts = <55>;
-                       clocks = <&clks CLK_MMC2>;
+                       clocks = <&clks CLK_MMC3>;
                        dmas = <&pdma 46 3
                                &pdma 47 3>;
                        dma-names = "rx", "tx";