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

Pull ARM SoC-related driver updates from Olof Johansson:
 "Various driver updates for platforms and a couple of the small driver
  subsystems we merge through our tree:

   - A driver for SCU (system control) on NXP i.MX8QXP

   - Qualcomm Always-on Subsystem messaging driver (AOSS QMP)

   - Qualcomm PM support for MSM8998

   - Support for a newer version of DRAM PHY driver for Broadcom (DPFE)

   - Reset controller support for Bitmain BM1880

   - TI SCI (System Control Interface) support for CPU control on AM654
     processors

   - More TI sysc refactoring and rework"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (84 commits)
  reset: remove redundant null check on pointer dev
  soc: rockchip: work around clang warning
  dt-bindings: reset: imx7: Fix the spelling of 'indices'
  soc: imx: Add i.MX8MN SoC driver support
  soc: aspeed: lpc-ctrl: Fix probe error handling
  soc: qcom: geni: Add support for ACPI
  firmware: ti_sci: Fix gcc unused-but-set-variable warning
  firmware: ti_sci: Use the correct style for SPDX License Identifier
  soc: imx8: Use existing of_root directly
  soc: imx8: Fix potential kernel dump in error path
  firmware/psci: psci_checker: Park kthreads before stopping them
  memory: move jedec_ddr.h from include/memory to drivers/memory/
  memory: move jedec_ddr_data.c from lib/ to drivers/memory/
  MAINTAINERS: Remove myself as qcom maintainer
  soc: aspeed: lpc-ctrl: make parameter optional
  soc: qcom: apr: Don't use reg for domain id
  soc: qcom: fix QCOM_AOSS_QMP dependency and build errors
  memory: tegra: Fix -Wunused-const-variable
  firmware: tegra: Early resume BPMP
  soc/tegra: Select pinctrl for Tegra194
  ...

2 files changed, 65 insertions, 34 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index e0350476feaa..203664c40d3d 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -3442,6 +3442,7 @@ static int omap_hwmod_check_module(struct device *dev,
  * @dev: struct device
  * @oh: module
  * @sysc_fields: sysc register bits
+ * @clockdomain: clockdomain
  * @rev_offs: revision register offset
  * @sysc_offs: sysconfig register offset
  * @syss_offs: sysstatus register offset
@@ -3453,6 +3454,7 @@ static int omap_hwmod_check_module(struct device *dev,
 static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,
                                       const struct ti_sysc_module_data *data,
                                       struct sysc_regbits *sysc_fields,
+                                      struct clockdomain *clkdm,
                                       s32 rev_offs, s32 sysc_offs,
                                       s32 syss_offs, u32 sysc_flags,
                                       u32 idlemodes)
@@ -3460,8 +3462,6 @@ static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,
         struct omap_hwmod_class_sysconfig *sysc;
         struct omap_hwmod_class *class = NULL;
         struct omap_hwmod_ocp_if *oi = NULL;
-        struct clockdomain *clkdm = NULL;
-        struct clk *clk = NULL;
         void __iomem *regs = NULL;
         unsigned long flags;
 
@@ -3508,36 +3508,6 @@ static int omap_hwmod_allocate_module(struct device *dev, struct omap_hwmod *oh,
                 oi->user = OCP_USER_MPU | OCP_USER_SDMA;
         }
 
-        if (!oh->_clk) {
-                struct clk_hw_omap *hwclk;
-
-                clk = of_clk_get_by_name(dev->of_node, "fck");
-                if (!IS_ERR(clk))
-                        clk_prepare(clk);
-                else
-                        clk = NULL;
-
-                /*
-                 * Populate clockdomain based on dts clock. It is needed for
-                 * clkdm_deny_idle() and clkdm_allow_idle() until we have have
-                 * interconnect driver and reset driver capable of blocking
-                 * clockdomain idle during reset, enable and idle.
-                 */
-                if (clk) {
-                        hwclk = to_clk_hw_omap(__clk_get_hw(clk));
-                        if (hwclk && hwclk->clkdm_name)
-                                clkdm = clkdm_lookup(hwclk->clkdm_name);
-                }
-
-                /*
-                 * Note that we assume interconnect driver manages the clocks
-                 * and do not need to populate oh->_clk for dynamically
-                 * allocated modules.
-                 */
-                clk_unprepare(clk);
-                clk_put(clk);
-        }
-
         spin_lock_irqsave(&oh->_lock, flags);
         if (regs)
                 oh->_mpu_rt_va = regs;
@@ -3623,7 +3593,7 @@ int omap_hwmod_init_module(struct device *dev,
         u32 sysc_flags, idlemodes;
         int error;
 
-        if (!dev || !data)
+        if (!dev || !data || !data->name || !cookie)
                 return -EINVAL;
 
         oh = _lookup(data->name);
@@ -3694,7 +3664,8 @@ int omap_hwmod_init_module(struct device *dev,
                 return error;
 
         return omap_hwmod_allocate_module(dev, oh, data, sysc_fields,
-                                          rev_offs, sysc_offs, syss_offs,
+                                          cookie->clkdm, rev_offs,
+                                          sysc_offs, syss_offs,
                                           sysc_flags, idlemodes);
 }
 
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index b0f8c9a70c68..6c6f8fce854e 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -26,6 +26,7 @@
 #include <linux/platform_data/wkup_m3.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
+#include "clockdomain.h"
 #include "common.h"
 #include "common-board-devices.h"
 #include "control.h"
@@ -460,6 +461,62 @@ static void __init dra7x_evm_mmc_quirk(void)
 }
 #endif
 
+static struct clockdomain *ti_sysc_find_one_clockdomain(struct clk *clk)
+{
+        struct clockdomain *clkdm = NULL;
+        struct clk_hw_omap *hwclk;
+
+        hwclk = to_clk_hw_omap(__clk_get_hw(clk));
+        if (hwclk && hwclk->clkdm_name)
+                clkdm = clkdm_lookup(hwclk->clkdm_name);
+
+        return clkdm;
+}
+
+/**
+ * ti_sysc_clkdm_init - find clockdomain based on clock
+ * @fck: device functional clock
+ * @ick: device interface clock
+ * @dev: struct device
+ *
+ * Populate clockdomain based on clock. It is needed for
+ * clkdm_deny_idle() and clkdm_allow_idle() for blocking clockdomain
+ * clockdomain idle during reset, enable and idle.
+ *
+ * Note that we assume interconnect driver manages the clocks
+ * and do not need to populate oh->_clk for dynamically
+ * allocated modules.
+ */
+static int ti_sysc_clkdm_init(struct device *dev,
+                              struct clk *fck, struct clk *ick,
+                              struct ti_sysc_cookie *cookie)
+{
+        if (fck)
+                cookie->clkdm = ti_sysc_find_one_clockdomain(fck);
+        if (cookie->clkdm)
+                return 0;
+        if (ick)
+                cookie->clkdm = ti_sysc_find_one_clockdomain(ick);
+        if (cookie->clkdm)
+                return 0;
+
+        return -ENODEV;
+}
+
+static void ti_sysc_clkdm_deny_idle(struct device *dev,
+                                    const struct ti_sysc_cookie *cookie)
+{
+        if (cookie->clkdm)
+                clkdm_deny_idle(cookie->clkdm);
+}
+
+static void ti_sysc_clkdm_allow_idle(struct device *dev,
+                                     const struct ti_sysc_cookie *cookie)
+{
+        if (cookie->clkdm)
+                clkdm_allow_idle(cookie->clkdm);
+}
+
 static int ti_sysc_enable_module(struct device *dev,
                                  const struct ti_sysc_cookie *cookie)
 {
@@ -491,6 +548,9 @@ static struct of_dev_auxdata omap_auxdata_lookup[];
 
 static struct ti_sysc_platform_data ti_sysc_pdata = {
         .auxdata = omap_auxdata_lookup,
+        .init_clockdomain = ti_sysc_clkdm_init,
+        .clkdm_deny_idle = ti_sysc_clkdm_deny_idle,
+        .clkdm_allow_idle = ti_sysc_clkdm_allow_idle,
         .init_module = omap_hwmod_init_module,
         .enable_module = ti_sysc_enable_module,
         .idle_module = ti_sysc_idle_module,