4 files changed, 11 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/bus/ti-sysc.txt b/Documentation/devicetree/bindings/bus/ti-sysc.txt
index 85a23f551f02..f200f45572ae 100644
--- a/Documentation/devicetree/bindings/bus/ti-sysc.txt
+++ b/Documentation/devicetree/bindings/bus/ti-sysc.txt
@@ -94,6 +94,8 @@ Optional properties:
 
 - ti,no-idle-on-init    interconnect target module should not be idled at init
 
+- ti,no-idle            interconnect target module should not be idled
+
 Example: Single instance of MUSB controller on omap4 using interconnect ranges
 using offsets from l4_cfg second segment (0x4a000000 + 0x80000 = 0x4a0ab000):
 
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 9170fbfb7c59..a985844dbe39 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -3675,6 +3675,8 @@ int omap_hwmod_init_module(struct device *dev,
         if (error)
                 return error;
 
+        if (data->cfg->quirks & SYSC_QUIRK_NO_IDLE)
+                oh->flags |= HWMOD_NO_IDLE;
         if (data->cfg->quirks & SYSC_QUIRK_NO_IDLE_ON_INIT)
                 oh->flags |= HWMOD_INIT_NO_IDLE;
         if (data->cfg->quirks & SYSC_QUIRK_NO_RESET_ON_INIT)
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 647caccacee6..bc315f1d3bf8 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -920,7 +920,8 @@ static int sysc_init_module(struct sysc *ddata)
 {
         int error;
 
-        if (ddata->cfg.quirks & SYSC_QUIRK_NO_IDLE_ON_INIT) {
+        if (ddata->cfg.quirks &
+            (SYSC_QUIRK_NO_IDLE | SYSC_QUIRK_NO_IDLE_ON_INIT)) {
                 ddata->revision = sysc_read_revision(ddata);
                 goto rev_quirks;
         }
@@ -1281,6 +1282,8 @@ static const struct sysc_dts_quirk sysc_dts_quirks[] = {
           .mask = SYSC_QUIRK_NO_IDLE_ON_INIT, },
         { .name = "ti,no-reset-on-init",
           .mask = SYSC_QUIRK_NO_RESET_ON_INIT, },
+        { .name = "ti,no-idle",
+          .mask = SYSC_QUIRK_NO_IDLE, },
 };
 
 static void sysc_parse_dts_quirks(struct sysc *ddata, struct device_node *np,
diff --git a/include/linux/platform_data/ti-sysc.h b/include/linux/platform_data/ti-sysc.h
index 1ea3aab972b4..fa97b8c5d26d 100644
--- a/include/linux/platform_data/ti-sysc.h
+++ b/include/linux/platform_data/ti-sysc.h
@@ -46,8 +46,9 @@ struct sysc_regbits {
         s8 emufree_shift;
 };
 
-#define SYSC_QUIRK_LEGACY_IDLE          BIT(8)
-#define SYSC_QUIRK_RESET_STATUS         BIT(7)
+#define SYSC_QUIRK_LEGACY_IDLE          BIT(9)
+#define SYSC_QUIRK_RESET_STATUS         BIT(8)
+#define SYSC_QUIRK_NO_IDLE              BIT(7)
 #define SYSC_QUIRK_NO_IDLE_ON_INIT      BIT(6)
 #define SYSC_QUIRK_NO_RESET_ON_INIT     BIT(5)
 #define SYSC_QUIRK_OPT_CLKS_NEEDED      BIT(4)