Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
 "Two more fixes for 4.5:

   - One is a fix for OMAP that is urgently needed to avoid DRA7xx chips
     from premature aging, by always keeping the Ethernet clock enabled.

   - The other solves a I/O memory layout issue on Armada, where SROM
     and PCI memory windows were conflicting in some configurations"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory window
  ARM: dts: dra7: do not gate cpsw clock due to errata i877
  ARM: OMAP2+: hwmod: Introduce ti,no-idle dt property

13 files changed, 41 insertions, 20 deletions

diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
index a2bd593881ca..66422d663184 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -23,6 +23,7 @@ Optional properties:
   during suspend.
 - ti,no-reset-on-init: When present, the module should not be reset at init
 - ti,no-idle-on-init: When present, the module should not be idled at init
+- ti,no-idle: When present, the module is never allowed to idle.
 
 Example:
 
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index 23fc670c0427..5c21b236721f 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -70,8 +70,8 @@
         soc {
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
-                          MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
+                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
                 pcie-controller {
                         status = "okay";
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index f774101416a5..ebe1d267406d 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -76,8 +76,8 @@
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
                           MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
-                          MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
+                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
                 devbus-bootcs {
                         status = "okay";
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index 4878d7353069..5730b875c4f5 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -95,8 +95,8 @@
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
                           MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
-                          MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
+                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
                 devbus-bootcs {
                         status = "okay";
diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index fb9e1bbf2338..8af463f26ea1 100644
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -65,8 +65,8 @@
         soc {
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
                         MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
-                        MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
-                        MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
+                        MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
+                        MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
                 pcie-controller {
                         status = "okay";
diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index 6e9820e141f8..b89e6cf1271a 100644
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -70,8 +70,8 @@
         soc {
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
-                          MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
+                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
                 pcie-controller {
                         status = "okay";
diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts
index 6ab33837a2b6..6522b04f4a8e 100644
--- a/arch/arm/boot/dts/armada-xp-matrix.dts
+++ b/arch/arm/boot/dts/armada-xp-matrix.dts
@@ -68,8 +68,8 @@
         soc {
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
-                          MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
+                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
                 internal-regs {
                         serial@12000 {
diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
index 62175a8848bc..d19f44c70925 100644
--- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
@@ -64,8 +64,8 @@
         soc {
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
-                          MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
+                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
                 pcie-controller {
                         status = "okay";
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index a5db17782e08..853bd392a4fe 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -65,9 +65,9 @@
         soc {
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
-                          MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x8000000
-                          MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
+                          MBUS_ID(0x01, 0x2f) 0 0 0xe8000000 0x8000000
+                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
                 devbus-bootcs {
                         status = "okay";
diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
index 2391b11dc546..d17dab0a6f51 100644
--- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
@@ -78,8 +78,8 @@
         soc {
                 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
                           MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
-                          MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
-                          MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
+                          MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
+                          MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
 
                 pcie-controller {
                         status = "okay";
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index c4d9175b90dc..f82aa44c3cee 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1500,6 +1500,16 @@
                                0x48485200 0x2E00>;
                         #address-cells = <1>;
                         #size-cells = <1>;
+
+                        /*
+                         * Do not allow gating of cpsw clock as workaround
+                         * for errata i877. Keeping internal clock disabled
+                         * causes the device switching characteristics
+                         * to degrade over time and eventually fail to meet
+                         * the data manual delay time/skew specs.
+                         */
+                        ti,no-idle;
+
                         /*
                          * rx_thresh_pend
                          * rx_pend
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index e9f65fec55c0..b6d62e4cdfdd 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2200,6 +2200,11 @@ static int _enable(struct omap_hwmod *oh)
  */
 static int _idle(struct omap_hwmod *oh)
 {
+        if (oh->flags & HWMOD_NO_IDLE) {
+                oh->_int_flags |= _HWMOD_SKIP_ENABLE;
+                return 0;
+        }
+
         pr_debug("omap_hwmod: %s: idling\n", oh->name);
 
         if (oh->_state != _HWMOD_STATE_ENABLED) {
@@ -2504,6 +2509,8 @@ static int __init _init(struct omap_hwmod *oh, void *data)
                         oh->flags |= HWMOD_INIT_NO_RESET;
                 if (of_find_property(np, "ti,no-idle-on-init", NULL))
                         oh->flags |= HWMOD_INIT_NO_IDLE;
+                if (of_find_property(np, "ti,no-idle", NULL))
+                        oh->flags |= HWMOD_NO_IDLE;
         }
 
         oh->_state = _HWMOD_STATE_INITIALIZED;
@@ -2630,7 +2637,7 @@ static void __init _setup_postsetup(struct omap_hwmod *oh)
          * XXX HWMOD_INIT_NO_IDLE does not belong in hwmod data -
          * it should be set by the core code as a runtime flag during startup
          */
-        if ((oh->flags & HWMOD_INIT_NO_IDLE) &&
+        if ((oh->flags & (HWMOD_INIT_NO_IDLE | HWMOD_NO_IDLE)) &&
             (postsetup_state == _HWMOD_STATE_IDLE)) {
                 oh->_int_flags |= _HWMOD_SKIP_ENABLE;
                 postsetup_state = _HWMOD_STATE_ENABLED;
diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h
index 76bce11c85a4..7c7a31169475 100644
--- a/arch/arm/mach-omap2/omap_hwmod.h
+++ b/arch/arm/mach-omap2/omap_hwmod.h
@@ -525,6 +525,8 @@ struct omap_hwmod_omap4_prcm {
  *     or idled.
  * HWMOD_OPT_CLKS_NEEDED: The optional clocks are needed for the module to
  *     operate and they need to be handled at the same time as the main_clk.
+ * HWMOD_NO_IDLE: Do not idle the hwmod at all. Useful to handle certain
+ *     IPs like CPSW on DRA7, where clocks to this module cannot be disabled.
  */
 #define HWMOD_SWSUP_SIDLE                       (1 << 0)
 #define HWMOD_SWSUP_MSTANDBY                    (1 << 1)
@@ -541,6 +543,7 @@ struct omap_hwmod_omap4_prcm {
 #define HWMOD_SWSUP_SIDLE_ACT                   (1 << 12)
 #define HWMOD_RECONFIG_IO_CHAIN                 (1 << 13)
 #define HWMOD_OPT_CLKS_NEEDED                   (1 << 14)
+#define HWMOD_NO_IDLE                           (1 << 15)
 
 /*
  * omap_hwmod._int_flags definitions