Merge tag 'omap-for-v4.13/soc-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC changes for omap variants for v4.13 merge window:

- PM clean-up in preparation of adding am335x/am437x PM support

- Fixes for issues found by Coccinelle

- Legacy code removal now that everything boots in device
  tree only mode

- Interconnect changes in preparation of moving clkctrl clocks
  to be managed by clkctrl clock driver

- Interconnect changes to add omap4 crypto acceclerator
  support

* tag 'omap-for-v4.13/soc-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits)
  ARM: OMAP4: hwmod_data: add SHAM crypto accelerator
  ARM: OMAP4: hwmod data: add des
  ARM: OMAP4: hwmod data: add aes2
  ARM: OMAP4: hwmod data: add aes1
  ARM: OMAP2+: Remove unused legacy code for n8x0
  ARM: OMAP2+: Remove unused legacy code for watchdog
  ARM: OMAP2+: Remove unused legacy code for interconnects
  ARM: OMAP2+: Remove unused legacy code for PRM
  ARM: OMAP2+: Remove unused legacy code for io.c
  ARM: OMAP2+: Remove unused legacy code for McBSP
  ARM: OMAP2+: SmartReflex: Delete an error message for a failed memory allocation in two functions
  ARM: OMAP2+: Use kcalloc() in sr_set_nvalues()
  ARM: OMAP2+: Improve a size determination in sr_dev_init()
  ARM: OMAP2+: Delete an error message for a failed memory allocation in two functions
  ARM: OMAP2+: Remove unused legacy code for device init
  ARM: OMAP2+: Remove unused legacy code for PMU
  ARM: OMAP2+: Remove unused legacy code for opp
  ARM: OMAP2+: hwmod: populate clkctrl clocks for hwmods if available
  ARM: OMAP4: cminst: add support for clkdm_xlate_address
  ARM: omap2+: clockdomain: add clkdm_xlate_address
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 19 insertions, 12 deletions

diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c
index bbe41f4c9dc8..d555791cf349 100644
--- a/arch/arm/mach-omap2/cm_common.c
+++ b/arch/arm/mach-omap2/cm_common.c
@@ -32,10 +32,10 @@ static struct cm_ll_data null_cm_ll_data;
 static struct cm_ll_data *cm_ll_data = &null_cm_ll_data;
 
 /* cm_base: base virtual address of the CM IP block */
-void __iomem *cm_base;
+struct omap_domain_base cm_base;
 
 /* cm2_base: base virtual address of the CM2 IP block (OMAP44xx only) */
-void __iomem *cm2_base;
+struct omap_domain_base cm2_base;
 
 #define CM_NO_CLOCKS            0x1
 #define CM_SINGLE_INSTANCE      0x2
@@ -49,8 +49,8 @@ void __iomem *cm2_base;
  */
 void __init omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2)
 {
-        cm_base = cm;
-        cm2_base = cm2;
+        cm_base.va = cm;
+        cm2_base.va = cm2;
 }
 
 /**
@@ -315,27 +315,34 @@ int __init omap2_cm_base_init(void)
         struct device_node *np;
         const struct of_device_id *match;
         struct omap_prcm_init_data *data;
-        void __iomem *mem;
+        struct resource res;
+        int ret;
+        struct omap_domain_base *mem = NULL;
 
         for_each_matching_node_and_match(np, omap_cm_dt_match_table, &match) {
                 data = (struct omap_prcm_init_data *)match->data;
 
-                mem = of_iomap(np, 0);
-                if (!mem)
-                        return -ENOMEM;
+                ret = of_address_to_resource(np, 0, &res);
+                if (ret)
+                        return ret;
 
                 if (data->index == TI_CLKM_CM)
-                        cm_base = mem + data->offset;
+                        mem = &cm_base;
 
                 if (data->index == TI_CLKM_CM2)
-                        cm2_base = mem + data->offset;
+                        mem = &cm2_base;
+
+                data->mem = ioremap(res.start, resource_size(&res));
 
-                data->mem = mem;
+                if (mem) {
+                        mem->pa = res.start + data->offset;
+                        mem->va = data->mem + data->offset;
+                }
 
                 data->np = np;
 
                 if (data->init && (data->flags & CM_SINGLE_INSTANCE ||
-                                   (cm_base && cm2_base)))
+                                   (cm_base.va && cm2_base.va)))
                         data->init(data);
         }