2 files changed, 17 insertions, 6 deletions

diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index 08344b03fda6..0eba07ac6008 100644
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -238,7 +238,7 @@ static int omap_l3_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id;
         static struct omap_l3 *l3;
-        int ret, i;
+        int ret, i, res_idx;
 
         of_id = of_match_device(l3_noc_match, &pdev->dev);
         if (!of_id) {
@@ -255,15 +255,22 @@ static int omap_l3_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, l3);
 
         /* Get mem resources */
-        for (i = 0; i < l3->num_modules; i++) {
-                struct resource *res = platform_get_resource(pdev,
-                                                             IORESOURCE_MEM, i);
-
+        for (i = 0, res_idx = 0; i < l3->num_modules; i++) {
+                struct resource *res;
+
+                if (l3->l3_base[i] == L3_BASE_IS_SUBMODULE) {
+                        /* First entry cannot be submodule */
+                        BUG_ON(i == 0);
+                        l3->l3_base[i] = l3->l3_base[i - 1];
+                        continue;
+                }
+                res = platform_get_resource(pdev, IORESOURCE_MEM, res_idx);
                 l3->l3_base[i] = devm_ioremap_resource(&pdev->dev, res);
                 if (IS_ERR(l3->l3_base[i])) {
                         dev_err(l3->dev, "ioremap %d failed\n", i);
                         return PTR_ERR(l3->l3_base[i]);
                 }
+                res_idx++;
         }
 
         /*
diff --git a/drivers/bus/omap_l3_noc.h b/drivers/bus/omap_l3_noc.h
index 36dc48b3dc00..aced4c546783 100644
--- a/drivers/bus/omap_l3_noc.h
+++ b/drivers/bus/omap_l3_noc.h
@@ -41,6 +41,8 @@
 
 #define L3_TARGET_NOT_SUPPORTED         NULL
 
+#define L3_BASE_IS_SUBMODULE            ((void __iomem *)(1 << 0))
+
 static const char * const l3_transaction_type[] = {
         /* 0 0 0 */ "Idle",
         /* 0 0 1 */ "Write",
@@ -96,7 +98,9 @@ struct l3_flagmux_data {
 /**
  * struct omap_l3 - Description of data relevant for L3 bus.
  * @dev:        device representing the bus (populated runtime)
- * @l3_base:    base addresses of modules (populated runtime)
+ * @l3_base:    base addresses of modules (populated runtime if 0)
+ *              if set to L3_BASE_IS_SUBMODULE, then uses previous
+ *              module index as the base address
  * @l3_flag_mux: array containing flag mux data per module
  *               offset from corresponding module base indexed per
  *               module.