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

Pull ARM SoC platform updates from Olof Johansson:
 "Improved and new platform support for various SoCs:

  New SoC support:
   - Broadcom BCM23550
   - Freescale i.MX7Solo
   - Qualcomm MDM9615
   - Renesas r8a7792

  Improvements:
   - convert clps711x to multiplatform
   - debug uart improvements for Atmel platforms
   - Tango platform improvements: HOTPLUG_CPU, Suspend-to-ram
   - OMAP tweaks and improvements to hwmod
   - OMAP support for kexec on SMP"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (109 commits)
  ARM: davinci: fix build break because of undeclared dm365_evm_snd_data
  ARM: s3c64xx: smartq: Avoid sparse warnings
  ARM: sti: Implement dummy L2 cache's write_sec
  ARM: STi: Update machine _namestr to be more generic.
  arm: meson: explicitly select clk drivers
  ARM: tango: add Suspend-to-RAM support
  ARM: hisi: consolidate the hisilicon machine entries
  ARM: tango: fix CONFIG_HOTPLUG_CPU=n build
  MAINTAINERS: Update BCM281XX/BCM11XXX/BCM216XX entry
  MAINTAINERS: Update BCM63XX entry
  MAINTAINERS: Add NS2 entry
  MAINTAINERS: Fix nsp false-positives
  MAINTAINERS: Change L to M for Broadcom ARM/ARM64 SoC entries
  ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
  ARM: clps711x: Switch to MULTIPLATFORM
  ARM: clps711x: Remove boards support
  ARM: clps711x: Add basic DT support
  ARM: clps711x: Reduce static map size
  ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu
  ARM: oxnas: Change OX810SE default driver config
  ...

3 files changed, 21 insertions, 8 deletions

diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c
index 4a16e778966b..76ce33199bf9 100644
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -257,8 +257,8 @@ static void omap_st_on(struct omap_mcbsp *mcbsp)
 {
         unsigned int w;
 
-        if (mcbsp->pdata->enable_st_clock)
-                mcbsp->pdata->enable_st_clock(mcbsp->id, 1);
+        if (mcbsp->pdata->force_ick_on)
+                mcbsp->pdata->force_ick_on(mcbsp->st_data->mcbsp_iclk, true);
 
         /* Disable Sidetone clock auto-gating for normal operation */
         w = MCBSP_ST_READ(mcbsp, SYSCONFIG);
@@ -287,8 +287,8 @@ static void omap_st_off(struct omap_mcbsp *mcbsp)
         w = MCBSP_ST_READ(mcbsp, SYSCONFIG);
         MCBSP_ST_WRITE(mcbsp, SYSCONFIG, w | ST_AUTOIDLE);
 
-        if (mcbsp->pdata->enable_st_clock)
-                mcbsp->pdata->enable_st_clock(mcbsp->id, 0);
+        if (mcbsp->pdata->force_ick_on)
+                mcbsp->pdata->force_ick_on(mcbsp->st_data->mcbsp_iclk, false);
 }
 
 static void omap_st_fir_write(struct omap_mcbsp *mcbsp, s16 *fir)
@@ -946,6 +946,13 @@ static int omap_st_add(struct omap_mcbsp *mcbsp, struct resource *res)
         if (!st_data)
                 return -ENOMEM;
 
+        st_data->mcbsp_iclk = clk_get(mcbsp->dev, "ick");
+        if (IS_ERR(st_data->mcbsp_iclk)) {
+                dev_warn(mcbsp->dev,
+                         "Failed to get ick, sidetone might be broken\n");
+                st_data->mcbsp_iclk = NULL;
+        }
+
         st_data->io_base_st = devm_ioremap(mcbsp->dev, res->start,
                                            resource_size(res));
         if (!st_data->io_base_st)
@@ -1088,11 +1095,13 @@ err_thres:
         return ret;
 }
 
-void omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp)
+void omap_mcbsp_cleanup(struct omap_mcbsp *mcbsp)
 {
         if (mcbsp->pdata->buffer_size)
                 sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group);
 
-        if (mcbsp->st_data)
+        if (mcbsp->st_data) {
                 sysfs_remove_group(&mcbsp->dev->kobj, &sidetone_attr_group);
+                clk_put(mcbsp->st_data->mcbsp_iclk);
+        }
 }
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
index 96d1b086bcf8..61e93b1c185d 100644
--- a/sound/soc/omap/mcbsp.h
+++ b/sound/soc/omap/mcbsp.h
@@ -280,6 +280,7 @@ struct omap_mcbsp_reg_cfg {
 
 struct omap_mcbsp_st_data {
         void __iomem *io_base_st;
+        struct clk *mcbsp_iclk;
         bool running;
         bool enabled;
         s16 taps[128];  /* Sidetone filter coefficients */
@@ -349,6 +350,6 @@ int omap_st_disable(struct omap_mcbsp *mcbsp);
 int omap_st_is_enabled(struct omap_mcbsp *mcbsp);
 
 int omap_mcbsp_init(struct platform_device *pdev);
-void omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp);
+void omap_mcbsp_cleanup(struct omap_mcbsp *mcbsp);
 
 #endif /* __ASOC_MCBSP_H */
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index fd99d89de6a8..d018e966e533 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -788,6 +788,7 @@ static int asoc_mcbsp_probe(struct platform_device *pdev)
         match = of_match_device(omap_mcbsp_of_match, &pdev->dev);
         if (match) {
                 struct device_node *node = pdev->dev.of_node;
+                struct omap_mcbsp_platform_data *pdata_quirk = pdata;
                 int buffer_size;
 
                 pdata = devm_kzalloc(&pdev->dev,
@@ -799,6 +800,8 @@ static int asoc_mcbsp_probe(struct platform_device *pdev)
                 memcpy(pdata, match->data, sizeof(*pdata));
                 if (!of_property_read_u32(node, "ti,buffer-size", &buffer_size))
                         pdata->buffer_size = buffer_size;
+                if (pdata_quirk)
+                        pdata->force_ick_on = pdata_quirk->force_ick_on;
         } else if (!pdata) {
                 dev_err(&pdev->dev, "missing platform data.\n");
                 return -EINVAL;
@@ -832,7 +835,7 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)
         if (mcbsp->pdata->ops && mcbsp->pdata->ops->free)
                 mcbsp->pdata->ops->free(mcbsp->id);
 
-        omap_mcbsp_sysfs_remove(mcbsp);
+        omap_mcbsp_cleanup(mcbsp);
 
         clk_put(mcbsp->fclk);