Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This contains pretty many small commits covering fairly large range of
  files in sound/ directory.  Partly because of additional API support
  and partly because of constantly developed ASoC and ARM stuff.

  Some highlights:

   - Introduced the helper function and documentation for exposing the
     channel map via control API, as discussed in Plumbers; most of PCI
     drivers are covered, will follow more drivers later

   - Most of drivers have been replaced with the new PM callbacks (if
     the bus is supported)

   - HD-audio controller got the support of runtime PM and the support
     of D3 clock-stop.  Also changing the power_save option in sysfs
     kicks off immediately to enable / disable the power-save mode.

   - Another significant code change in HD-audio is the rewrite of
     firmware loading code.  Other than that, most of changes in
     HD-audio are continued cleanups and standardization for the generic
     auto parser and bug fixes (HBR, device-specific fixups), in
     addition to the support of channel-map API.

   - Addition of ASoC bindings for the compressed API, used by the
     mid-x86 drivers.

   - Lots of cleanups and API refreshes for ASoC codec drivers and
     DaVinci.

   - Conversion of OMAP to dmaengine.

   - New machine driver for Wolfson Microelectronics Bells.

   - New CODEC driver for Wolfson Microelectronics WM0010.

   - Enhancements to the ux500 and wm2000 drivers

   - A new driver for DA9055 and the support for regulator bypass mode."

Fix up various arm soc header file reorg conflicts.

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
  ALSA: hda - Add new codec ALC283 ALC290 support
  ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
  ALSA: hda - fix indices on boost volume on Conexant
  ALSA: aloop - add locking to timer access
  ALSA: hda - Fix hang caused by race during suspend.
  sound: Remove unnecessary semicolon
  ALSA: hda/realtek - Fix detection of ALC271X codec
  ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
  ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
  ALSA: hda - make a generic unsol event handler
  ASoC: codecs: Add DA9055 codec driver
  ASoC: eukrea-tlv320: Convert it to platform driver
  ALSA: ASoC: add DT bindings for CS4271
  ASoC: wm_hubs: Ensure volume updates are handled during class W startup
  ASoC: wm5110: Adding missing volume update bits
  ASoC: wm5110: Add OUT3R support
  ASoC: wm5110: Add AEC loopback support
  ASoC: wm5110: Rename EPOUT to HPOUT3
  ASoC: arizona: Add more clock rates
  ASoC: arizona: Add more DSP options for mixer input muxes
  ...

1 files changed, 8 insertions, 22 deletions

diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index e6a17baca1ee..006f7d465ed2 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -380,14 +380,13 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai)
 static struct snd_soc_dai_driver imx_ssi_dai = {
         .probe = imx_ssi_dai_probe,
         .playback = {
-                /* The SSI does not support monaural audio. */
-                .channels_min = 2,
+                .channels_min = 1,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_96000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,
         },
         .capture = {
-                .channels_min = 2,
+                .channels_min = 1,
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_96000,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,
@@ -524,7 +523,7 @@ static int imx_ssi_probe(struct platform_device *pdev)
         int ret = 0;
         struct snd_soc_dai_driver *dai;
 
-        ssi = kzalloc(sizeof(*ssi), GFP_KERNEL);
+        ssi = devm_kzalloc(&pdev->dev, sizeof(*ssi), GFP_KERNEL);
         if (!ssi)
                 return -ENOMEM;
         dev_set_drvdata(&pdev->dev, ssi);
@@ -537,7 +536,7 @@ static int imx_ssi_probe(struct platform_device *pdev)
 
         ssi->irq = platform_get_irq(pdev, 0);
 
-        ssi->clk = clk_get(&pdev->dev, NULL);
+        ssi->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(ssi->clk)) {
                 ret = PTR_ERR(ssi->clk);
                 dev_err(&pdev->dev, "Cannot get the clock: %d\n",
@@ -552,23 +551,18 @@ static int imx_ssi_probe(struct platform_device *pdev)
                 goto failed_get_resource;
         }
 
-        if (!request_mem_region(res->start, resource_size(res), DRV_NAME)) {
-                dev_err(&pdev->dev, "request_mem_region failed\n");
-                ret = -EBUSY;
-                goto failed_get_resource;
-        }
-
-        ssi->base = ioremap(res->start, resource_size(res));
+        ssi->base = devm_request_and_ioremap(&pdev->dev, res);
         if (!ssi->base) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -ENODEV;
-                goto failed_ioremap;
+                goto failed_register;
         }
 
         if (ssi->flags & IMX_SSI_USE_AC97) {
                 if (ac97_ssi) {
+                        dev_err(&pdev->dev, "AC'97 SSI already registered\n");
                         ret = -EBUSY;
-                        goto failed_ac97;
+                        goto failed_register;
                 }
                 ac97_ssi = ssi;
                 setup_channel_to_ac97(ssi);
@@ -637,15 +631,10 @@ failed_pdev_fiq_add:
 failed_pdev_fiq_alloc:
         snd_soc_unregister_dai(&pdev->dev);
 failed_register:
-failed_ac97:
-        iounmap(ssi->base);
-failed_ioremap:
         release_mem_region(res->start, resource_size(res));
 failed_get_resource:
         clk_disable_unprepare(ssi->clk);
-        clk_put(ssi->clk);
 failed_clk:
-        kfree(ssi);
 
         return ret;
 }
@@ -663,11 +652,8 @@ static int __devexit imx_ssi_remove(struct platform_device *pdev)
         if (ssi->flags & IMX_SSI_USE_AC97)
                 ac97_ssi = NULL;
 
-        iounmap(ssi->base);
         release_mem_region(res->start, resource_size(res));
         clk_disable_unprepare(ssi->clk);
-        clk_put(ssi->clk);
-        kfree(ssi);
 
         return 0;
 }