Merge tag 'omap-for-v4.17/ti-sysc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Pull "Driver changes for ti-sysc for v4.17" from Tony Lindgren:

This series of changes enables the use device tree based sysconfig
data for ti-sysc driver. As we already have SmartReflex data configured,
we use that as the first driver to enable. To do that in a way where
SmartReflex is not probed twice, we need to prepare the SmartReflex
driver before flipping dts data on for it in the last patch of the
series.

To avoid regressions, we are checking the passed dts data against
existing platform data since we still have it available. Then after the
dts files are converted, we can simply drop the related platform data
at some point in the future.

* tag 'omap-for-v4.17/ti-sysc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Enable ti-sysc to use device tree data for smartreflex
  PM / AVS: SmartReflex: Prepare to use device tree based probing
  ARM: OMAP2+: Try to parse earlycon from parent too
  ARM: OMAP2+: Add checks for device tree based sysconfig data
  ARM: OMAP2+: Add functions to allocate module data from device tree
  bus: ti-sysc: Handle some devices in omap_device compatible way
  bus: ti-sysc: Add support for platform data callbacks
  bus: ti-sysc: Remove unnecessary debugging statements
  bus: ti-sysc: Improve handling for no-reset-on-init and no-idle-on-init
  bus: ti-sysc: Handle stdout-path for debug console
  bus: ti-sysc: Add suspend and resume handling
  bus: ti-sysc: Add fck clock alias for children with notifier_block
  ARM: OMAP2+: Prepare to pass auxdata for smartreflex

10 files changed, 1086 insertions, 56 deletions

diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 20f25539d572..75bc18646df6 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -566,11 +566,11 @@ static int n8x0_menelaus_late_init(struct device *dev)
 }
 #endif
 
-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
+struct menelaus_platform_data n8x0_menelaus_platform_data = {
         .late_init = n8x0_menelaus_late_init,
 };
 
-struct aic3x_pdata n810_aic33_data __initdata = {
+struct aic3x_pdata n810_aic33_data = {
         .gpio_reset = 118,
 };
 
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index f0388058b7da..3b829a50d1db 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -140,6 +140,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
         struct omap_device *od;
         struct omap_hwmod *oh;
         struct device_node *node = pdev->dev.of_node;
+        struct resource res;
         const char *oh_name;
         int oh_cnt, i, ret = 0;
         bool device_active = false;
@@ -150,6 +151,10 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
                 return -ENODEV;
         }
 
+        /* Use ti-sysc driver instead of omap_device? */
+        if (!omap_hwmod_parse_module_range(NULL, node, &res))
+                return -ENODEV;
+
         hwmods = kzalloc(sizeof(struct omap_hwmod *) * oh_cnt, GFP_KERNEL);
         if (!hwmods) {
                 ret = -ENOMEM;
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 34156eca8e23..e7d23e200ecc 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -145,6 +145,8 @@
 
 #include <linux/platform_data/ti-sysc.h>
 
+#include <dt-bindings/bus/ti-sysc.h>
+
 #include <asm/system_misc.h>
 
 #include "clock.h"
@@ -2498,7 +2500,7 @@ static void __init _setup_postsetup(struct omap_hwmod *oh)
  * affects the IP block hardware, or system integration hardware
  * associated with the IP block.  Returns 0.
  */
-static int __init _setup(struct omap_hwmod *oh, void *data)
+static int _setup(struct omap_hwmod *oh, void *data)
 {
         if (oh->_state != _HWMOD_STATE_INITIALIZED)
                 return 0;
@@ -3060,6 +3062,414 @@ int __init omap_hwmod_setup_one(const char *oh_name)
         return 0;
 }
 
+static void omap_hwmod_check_one(struct device *dev,
+                                 const char *name, s8 v1, u8 v2)
+{
+        if (v1 < 0)
+                return;
+
+        if (v1 != v2)
+                dev_warn(dev, "%s %d != %d\n", name, v1, v2);
+}
+
+/**
+ * omap_hwmod_check_sysc - check sysc against platform sysc
+ * @dev: struct device
+ * @data: module data
+ * @sysc_fields: new sysc configuration
+ */
+static int omap_hwmod_check_sysc(struct device *dev,
+                                 const struct ti_sysc_module_data *data,
+                                 struct sysc_regbits *sysc_fields)
+{
+        const struct sysc_regbits *regbits = data->cap->regbits;
+
+        omap_hwmod_check_one(dev, "dmadisable_shift",
+                             regbits->dmadisable_shift,
+                             sysc_fields->dmadisable_shift);
+        omap_hwmod_check_one(dev, "midle_shift",
+                             regbits->midle_shift,
+                             sysc_fields->midle_shift);
+        omap_hwmod_check_one(dev, "sidle_shift",
+                             regbits->sidle_shift,
+                             sysc_fields->sidle_shift);
+        omap_hwmod_check_one(dev, "clkact_shift",
+                             regbits->clkact_shift,
+                             sysc_fields->clkact_shift);
+        omap_hwmod_check_one(dev, "enwkup_shift",
+                             regbits->enwkup_shift,
+                             sysc_fields->enwkup_shift);
+        omap_hwmod_check_one(dev, "srst_shift",
+                             regbits->srst_shift,
+                             sysc_fields->srst_shift);
+        omap_hwmod_check_one(dev, "autoidle_shift",
+                             regbits->autoidle_shift,
+                             sysc_fields->autoidle_shift);
+
+        return 0;
+}
+
+/**
+ * omap_hwmod_init_regbits - init sysconfig specific register bits
+ * @dev: struct device
+ * @data: module data
+ * @sysc_fields: new sysc configuration
+ */
+static int omap_hwmod_init_regbits(struct device *dev,
+                                   const struct ti_sysc_module_data *data,
+                                   struct sysc_regbits **sysc_fields)
+{
+        *sysc_fields = NULL;
+
+        switch (data->cap->type) {
+        case TI_SYSC_OMAP2:
+        case TI_SYSC_OMAP2_TIMER:
+                *sysc_fields = &omap_hwmod_sysc_type1;
+                break;
+        case TI_SYSC_OMAP3_SHAM:
+                *sysc_fields = &omap3_sham_sysc_fields;
+                break;
+        case TI_SYSC_OMAP3_AES:
+                *sysc_fields = &omap3xxx_aes_sysc_fields;
+                break;
+        case TI_SYSC_OMAP4:
+        case TI_SYSC_OMAP4_TIMER:
+                *sysc_fields = &omap_hwmod_sysc_type2;
+                break;
+        case TI_SYSC_OMAP4_SIMPLE:
+                *sysc_fields = &omap_hwmod_sysc_type3;
+                break;
+        case TI_SYSC_OMAP34XX_SR:
+                *sysc_fields = &omap34xx_sr_sysc_fields;
+                break;
+        case TI_SYSC_OMAP36XX_SR:
+                *sysc_fields = &omap36xx_sr_sysc_fields;
+                break;
+        case TI_SYSC_OMAP4_SR:
+                *sysc_fields = &omap36xx_sr_sysc_fields;
+                break;
+        case TI_SYSC_OMAP4_MCASP:
+                *sysc_fields = &omap_hwmod_sysc_type_mcasp;
+                break;
+        case TI_SYSC_OMAP4_USB_HOST_FS:
+                *sysc_fields = &omap_hwmod_sysc_type_usb_host_fs;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return omap_hwmod_check_sysc(dev, data, *sysc_fields);
+}
+
+/**
+ * omap_hwmod_init_reg_offs - initialize sysconfig register offsets
+ * @dev: struct device
+ * @data: module data
+ * @rev_offs: revision register offset
+ * @sysc_offs: sysc register offset
+ * @syss_offs: syss register offset
+ */
+int omap_hwmod_init_reg_offs(struct device *dev,
+                             const struct ti_sysc_module_data *data,