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, 0 insertions, 70 deletions

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index fc04be74e064..4acc0dae27e0 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -53,73 +53,3 @@ void __init omap3_mcbsp_init_pdata_callback(
 
         pdata->force_ick_on = omap3_mcbsp_force_ick_on;
 }
-
-static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
-{
-        int id, count = 1;
-        char *name = "omap-mcbsp";
-        struct omap_hwmod *oh_device[2];
-        struct omap_mcbsp_platform_data *pdata = NULL;
-        struct platform_device *pdev;
-
-        sscanf(oh->name, "mcbsp%d", &id);
-
-        pdata = kzalloc(sizeof(struct omap_mcbsp_platform_data), GFP_KERNEL);
-        if (!pdata) {
-                pr_err("%s: No memory for mcbsp\n", __func__);
-                return -ENOMEM;
-        }
-
-        pdata->reg_step = 4;
-        if (oh->class->rev < MCBSP_CONFIG_TYPE2) {
-                pdata->reg_size = 2;
-        } else {
-                pdata->reg_size = 4;
-                pdata->has_ccr = true;
-        }
-
-        if (oh->class->rev == MCBSP_CONFIG_TYPE2) {
-                /* The FIFO has 128 locations */
-                pdata->buffer_size = 0x80;
-        } else if (oh->class->rev == MCBSP_CONFIG_TYPE3) {
-                if (id == 2)
-                        /* The FIFO has 1024 + 256 locations */
-                        pdata->buffer_size = 0x500;
-                else
-                        /* The FIFO has 128 locations */
-                        pdata->buffer_size = 0x80;
-        } else if (oh->class->rev == MCBSP_CONFIG_TYPE4) {
-                /* The FIFO has 128 locations for all instances */
-                pdata->buffer_size = 0x80;
-        }
-
-        if (oh->class->rev >= MCBSP_CONFIG_TYPE3)
-                pdata->has_wakeup = true;
-
-        oh_device[0] = oh;
-
-        if (oh->dev_attr) {
-                oh_device[1] = omap_hwmod_lookup((
-                (struct omap_mcbsp_dev_attr *)(oh->dev_attr))->sidetone);
-                pdata->force_ick_on = omap3_mcbsp_force_ick_on;
-                count++;
-        }
-        pdev = omap_device_build_ss(name, id, oh_device, count, pdata,
-                                    sizeof(*pdata));
-        kfree(pdata);
-        if (IS_ERR(pdev))  {
-                pr_err("%s: Can't build omap_device for %s:%s.\n", __func__,
-                                        name, oh->name);
-                return PTR_ERR(pdev);
-        }
-        return 0;
-}
-
-static int __init omap2_mcbsp_init(void)
-{
-        if (!of_have_populated_dt())
-                omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);
-
-        return 0;
-}
-omap_arch_initcall(omap2_mcbsp_init);