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

Pull sound updates from Takashi Iwai:
 "This is the first big chunk for 3.5 merges of sound stuff.

  There are a few big changes in different areas.  First off, the
  streaming logic of USB-audio endpoints has been largely rewritten for
  the better support of "implicit feedback".  If anything about USB got
  broken, this change has to be checked.

  For HD-audio, the resume procedure was changed; instead of delaying
  the resume of the hardware until the first use, now waking up
  immediately at resume.  This is for buggy BIOS.

  For ASoC, dynamic PCM support and the improved support for digital
  links between off-SoC devices are major framework changes.

  Some highlights are below:

  * HD-audio
   - Avoid accesses of invalid pin-control bits that may stall the codec
   - V-ref setup cleanups
   - Fix the races in power-saving code
   - Fix the races in codec cache hashes and connection lists
   - Split some common codes for BIOS auto-parser to hda_auto_parser.c
   - Changed the PM resume code to wake up immediately for buggy BIOS
   - Creative SoundCore3D support
   - Add Conexant CX20751/2/3/4 codec support

  * ASoC
   - Dynamic PCM support, allowing support for SoCs with internal
     routing through components with tight sequencing and formatting
     constraints within their internal paths or where there are multiple
     components connected with CPU managed DMA controllers inside the
     SoC.
   - Greatly improved support for direct digital links between off-SoC
     devices, providing a much simpler way of connecting things like
     digital basebands to CODECs.
   - Much more fine grained and robust locking, cleaning up some of the
     confusion that crept in with multi-component.
   - CPU support for nVidia Tegra 30 I2S and audio hub controllers and
     ST-Ericsson MSP I2S controolers
   - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124,
     Texas Instruments LM49453.
   - Some regmap changes needed by the Tegra I2S driver.
   - mc13783 audio support.

  * Misc
   - Rewrite with module_pci_driver()
   - Xonar DGX support for snd-oxygen
   - Improvement of packet handling in snd-firewire driver
   - New USB-endpoint streaming logic
   - Enhanced M-audio FTU quirks and relevant cleanups
   - Increment the support of OSS devices to 256
   - snd-aloop accuracy improvement

  There are a few more pending changes for 3.5, but they will be sent
  slightly later as partly depending on the changes of DRM."

Fix up conflicts in regmap (due to duplicate patches, with some further
updates then having already come in from the regmap tree).  Also some
fairly trivial context conflicts in the imx and mcx soc drivers.

* tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits)
  ALSA: snd-usb: fix stream info output in /proc
  ALSA: pcm - Add proper state checks to snd_pcm_drain()
  ALSA: sh: Fix up namespace collision in sh_dac_audio.
  ALSA: hda/realtek - Fix unused variable compile warning
  ASoC: sh: fsi: enable chip specific data transfer mode
  ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger()
  ASoC: sh: fsi: use same format for IN/OUT
  ASoC: sh: fsi: add fsi_version() and removed meaningless version check
  ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC
  ASoC: tegra: Add machine driver for WM8753 codec
  ALSA: hda - Fix possible races of accesses to connection list array
  ASoC: OMAP: HDMI: Introduce codec
  ARM: mx31_3ds: Add sound support
  ASoC: imx-mc13783 cleanup
  mx31moboard: Add sound support
  ASoC: mc13783 codec cleanups
  ASoC: add imx-mc13783 sound support
  ASoC: Add mc13783 codec
  mfd: mc13xxx: add codec platform data
  ASoC: don't flip master of DT-instantiated DAI links
  ...

1 files changed, 59 insertions, 33 deletions

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 7fd224bb7324..aba71bfa33b1 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -18,6 +18,8 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
@@ -621,37 +623,57 @@ static irqreturn_t mxs_saif_irq(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int mxs_saif_probe(struct platform_device *pdev)
+static int __devinit mxs_saif_probe(struct platform_device *pdev)
 {
+        struct device_node *np = pdev->dev.of_node;
         struct resource *iores, *dmares;
         struct mxs_saif *saif;
         struct mxs_saif_platform_data *pdata;
         struct pinctrl *pinctrl;
         int ret = 0;
 
-        if (pdev->id >= ARRAY_SIZE(mxs_saif))
+
+        if (!np && pdev->id >= ARRAY_SIZE(mxs_saif))
                 return -EINVAL;
 
         saif = devm_kzalloc(&pdev->dev, sizeof(*saif), GFP_KERNEL);
         if (!saif)
                 return -ENOMEM;
 
-        mxs_saif[pdev->id] = saif;
-        saif->id = pdev->id;
-
-        pdata = pdev->dev.platform_data;
-        if (pdata && !pdata->master_mode) {
-                saif->master_id = pdata->master_id;
-                if (saif->master_id < 0 ||
-                        saif->master_id >= ARRAY_SIZE(mxs_saif) ||
-                        saif->master_id == saif->id) {
-                        dev_err(&pdev->dev, "get wrong master id\n");
-                        return -EINVAL;
+        if (np) {
+                struct device_node *master;
+                saif->id = of_alias_get_id(np, "saif");
+                if (saif->id < 0)
+                        return saif->id;
+                /*
+                 * If there is no "fsl,saif-master" phandle, it's a saif
+                 * master.  Otherwise, it's a slave and its phandle points
+                 * to the master.
+                 */
+                master = of_parse_phandle(np, "fsl,saif-master", 0);
+                if (!master) {
+                        saif->master_id = saif->id;
+                } else {
+                        saif->master_id = of_alias_get_id(master, "saif");
+                        if (saif->master_id < 0)
+                                return saif->master_id;
                 }
         } else {
-                saif->master_id = saif->id;
+                saif->id = pdev->id;
+                pdata = pdev->dev.platform_data;
+                if (pdata && !pdata->master_mode)
+                        saif->master_id = pdata->master_id;
+                else
+                        saif->master_id = saif->id;
+        }
+
+        if (saif->master_id < 0 || saif->master_id >= ARRAY_SIZE(mxs_saif)) {
+                dev_err(&pdev->dev, "get wrong master id\n");
+                return -EINVAL;
         }
 
+        mxs_saif[saif->id] = saif;
+
         pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
         if (IS_ERR(pinctrl)) {
                 ret = PTR_ERR(pinctrl);
@@ -677,12 +699,19 @@ static int mxs_saif_probe(struct platform_device *pdev)
 
         dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);
         if (!dmares) {
-                ret = -ENODEV;
-                dev_err(&pdev->dev, "failed to get dma resource: %d\n",
-                        ret);
-                goto failed_get_resource;
+                /*
+                 * TODO: This is a temporary solution and should be changed
+                 * to use generic DMA binding later when the helplers get in.
+                 */
+                ret = of_property_read_u32(np, "fsl,saif-dma-channel",
+                                           &saif->dma_param.chan_num);
+                if (ret) {
+                        dev_err(&pdev->dev, "failed to get dma channel\n");
+                        goto failed_get_resource;
+                }
+        } else {
+                saif->dma_param.chan_num = dmares->start;
         }
-        saif->dma_param.chan_num = dmares->start;
 
         saif->irq = platform_get_irq(pdev, 0);
         if (saif->irq < 0) {
@@ -716,24 +745,14 @@ static int mxs_saif_probe(struct platform_device *pdev)
                 goto failed_get_resource;
         }
 
-        saif->soc_platform_pdev = platform_device_alloc(
-                                        "mxs-pcm-audio", pdev->id);
-        if (!saif->soc_platform_pdev) {
-                ret = -ENOMEM;
-                goto failed_pdev_alloc;
-        }
-
-        platform_set_drvdata(saif->soc_platform_pdev, saif);
-        ret = platform_device_add(saif->soc_platform_pdev);
+        ret = mxs_pcm_platform_register(&pdev->dev);
         if (ret) {
-                dev_err(&pdev->dev, "failed to add soc platform device\n");
-                goto failed_pdev_add;
+                dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
+                goto failed_pdev_alloc;
         }
 
         return 0;
 
-failed_pdev_add:
-        platform_device_put(saif->soc_platform_pdev);
 failed_pdev_alloc:
         snd_soc_unregister_dai(&pdev->dev);
 failed_get_resource:
@@ -746,13 +765,19 @@ static int __devexit mxs_saif_remove(struct platform_device *pdev)
 {
         struct mxs_saif *saif = platform_get_drvdata(pdev);
 
-        platform_device_unregister(saif->soc_platform_pdev);
+        mxs_pcm_platform_unregister(&pdev->dev);
         snd_soc_unregister_dai(&pdev->dev);
         clk_put(saif->clk);
 
         return 0;
 }
 
+static const struct of_device_id mxs_saif_dt_ids[] = {
+        { .compatible = "fsl,imx28-saif", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mxs_saif_dt_ids);
+
 static struct platform_driver mxs_saif_driver = {
         .probe = mxs_saif_probe,
         .remove = __devexit_p(mxs_saif_remove),
@@ -760,6 +785,7 @@ static struct platform_driver mxs_saif_driver = {
         .driver = {
                 .name = "mxs-saif",
                 .owner = THIS_MODULE,
+                .of_match_table = mxs_saif_dt_ids,
         },
 };