Merge tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / omap_hwmod.c

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 104256a5f0f7164795c2a1ba1c477203f8f752b5..124f9af34a15a3145edecb30108ced8a3b13a2f5 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -143,6 +143,8 @@
 #include <linux/of_address.h>
 #include <linux/bootmem.h>
 
+#include <linux/platform_data/ti-sysc.h>
+
 #include <asm/system_misc.h>
 
 #include "clock.h"
@@ -185,15 +187,15 @@
 /**
  * struct clkctrl_provider - clkctrl provider mapping data
  * @addr: base address for the provider
- * @offset: base offset for the provider
- * @clkdm: base clockdomain for provider
+ * @size: size of the provider address space
+ * @offset: offset of the provider from PRCM instance base
  * @node: device node associated with the provider
  * @link: list link
  */
 struct clkctrl_provider {
        u32                     addr;
+       u32                     size;
        u16                     offset;
-       struct clockdomain      *clkdm;
        struct device_node      *node;
        struct list_head        link;
 };
@@ -223,8 +225,7 @@ struct omap_hwmod_soc_ops {
        void (*update_context_lost)(struct omap_hwmod *oh);
        int (*get_context_lost)(struct omap_hwmod *oh);
        int (*disable_direct_prcm)(struct omap_hwmod *oh);
-       u32 (*xlate_clkctrl)(struct omap_hwmod *oh,
-                            struct clkctrl_provider *provider);
+       u32 (*xlate_clkctrl)(struct omap_hwmod *oh);
 };
 
 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
@@ -716,52 +717,35 @@ static const struct of_device_id ti_clkctrl_match_table[] __initconst = {
        { }
 };
 
-static int _match_clkdm(struct clockdomain *clkdm, void *user)
-{
-       struct clkctrl_provider *provider = user;
-
-       if (clkdm_xlate_address(clkdm) == provider->addr) {
-               pr_debug("%s: Matched clkdm %s for addr %x (%s)\n", __func__,
-                        clkdm->name, provider->addr,
-                        provider->node->parent->name);
-               provider->clkdm = clkdm;
-
-               return -1;
-       }
-
-       return 0;
-}
-
-static int _setup_clkctrl_provider(struct device_node *np)
+static int __init _setup_clkctrl_provider(struct device_node *np)
 {
        const __be32 *addrp;
        struct clkctrl_provider *provider;
+       u64 size;
 
        provider = memblock_virt_alloc(sizeof(*provider), 0);
        if (!provider)
                return -ENOMEM;
 
-       addrp = of_get_address(np, 0, NULL, NULL);
+       addrp = of_get_address(np, 0, &size, NULL);
        provider->addr = (u32)of_translate_address(np, addrp);
-       provider->offset = provider->addr & 0xff;
+       addrp = of_get_address(np->parent, 0, NULL, NULL);
+       provider->offset = provider->addr -
+                          (u32)of_translate_address(np->parent, addrp);
        provider->addr &= ~0xff;
+       provider->size = size | 0xff;
        provider->node = np;
 
-       clkdm_for_each(_match_clkdm, provider);
-
-       if (!provider->clkdm) {
-               pr_err("%s: nothing matched for node %s (%x)\n",
-                      __func__, np->parent->name, provider->addr);
-               memblock_free_early(__pa(provider), sizeof(*provider));
-               return -EINVAL;
-       }
+       pr_debug("%s: %s: %x...%x [+%x]\n", __func__, np->parent->name,
+                provider->addr, provider->addr + provider->size,
+                provider->offset);
 
        list_add(&provider->link, &clkctrl_providers);
 
        return 0;
 }
 
-static int _init_clkctrl_providers(void)
+static int __init _init_clkctrl_providers(void)
 {
        struct device_node *np;
        int ret = 0;
@@ -775,32 +759,48 @@ static int _init_clkctrl_providers(void)
        return ret;
 }
 
-static u32 _omap4_xlate_clkctrl(struct omap_hwmod *oh,
-                               struct clkctrl_provider *provider)
+static u32 _omap4_xlate_clkctrl(struct omap_hwmod *oh)
 {
-       return oh->prcm.omap4.clkctrl_offs -
-              provider->offset - provider->clkdm->clkdm_offs;
+       if (!oh->prcm.omap4.modulemode)
+               return 0;
+
+       return omap_cm_xlate_clkctrl(oh->clkdm->prcm_partition,
+                                    oh->clkdm->cm_inst,
+                                    oh->prcm.omap4.clkctrl_offs);
 }
 
 static struct clk *_lookup_clkctrl_clk(struct omap_hwmod *oh)
 {
        struct clkctrl_provider *provider;
        struct clk *clk;
+       u32 addr;
 
        if (!soc_ops.xlate_clkctrl)
                return NULL;
 
+       addr = soc_ops.xlate_clkctrl(oh);
+       if (!addr)
+               return NULL;
+
+       pr_debug("%s: %s: addr=%x\n", __func__, oh->name, addr);
+
        list_for_each_entry(provider, &clkctrl_providers, link) {
-               if (provider->clkdm == oh->clkdm) {
+               if (provider->addr <= addr &&
+                   provider->addr + provider->size >= addr) {
                        struct of_phandle_args clkspec;
 
                        clkspec.np = provider->node;
                        clkspec.args_count = 2;
-                       clkspec.args[0] = soc_ops.xlate_clkctrl(oh, provider);
+                       clkspec.args[0] = addr - provider->addr -
+                                         provider->offset;
                        clkspec.args[1] = 0;
 
                        clk = of_clk_get_from_provider(&clkspec);
 
+                       pr_debug("%s: %s got %p (offset=%x, provider=%s)\n",
+                                __func__, oh->name, clk, clkspec.args[0],
+                                provider->node->parent->name);
+
                        return clk;
                }
        }
@@ -3521,6 +3521,7 @@ void __init omap_hwmod_init(void)
                soc_ops.is_hardreset_asserted = _omap4_is_hardreset_asserted;
                soc_ops.init_clkdm = _init_clkdm;
                soc_ops.disable_direct_prcm = _omap4_disable_direct_prcm;
+               soc_ops.xlate_clkctrl = _omap4_xlate_clkctrl;
        } else {
                WARN(1, "omap_hwmod: unknown SoC type\n");
        }