Merge tag 'asoc-v3.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v3.11

A few small fixes, all driver specific.  The removal of the GPIO based
pinmuxing is a bug fix, since the obsolete nodes had been removed from
the DT it stopped the driver loading.

5 files changed, 43 insertions, 68 deletions

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index b1dc7d426438..e2de9ecfd641 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3377,7 +3377,7 @@ static int wm8962_probe(struct snd_soc_codec *codec)
 {
         int ret;
         struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
-        struct wm8962_pdata *pdata = dev_get_platdata(codec->dev);
+        struct wm8962_pdata *pdata = &wm8962->pdata;
         int i, trigger, irq_pol;
         bool dmicclk, dmicdat;
 
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index 7a8bc1220b2e..3f726e4f88db 100644
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -113,13 +113,13 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
         ssi_pdev = of_find_device_by_node(ssi_np);
         if (!ssi_pdev) {
                 dev_err(&pdev->dev, "failed to find SSI platform device\n");
-                ret = -EINVAL;
+                ret = -EPROBE_DEFER;
                 goto fail;
         }
         codec_dev = of_find_i2c_device_by_node(codec_np);
         if (!codec_dev) {
                 dev_err(&pdev->dev, "failed to find codec platform device\n");
-                return -EINVAL;
+                return -EPROBE_DEFER;
         }
 
         data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 49d870034bc3..54511c5e6a7c 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
+#include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/time.h>
 #include <sound/core.h>
@@ -658,6 +659,33 @@ static irqreturn_t mxs_saif_irq(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
+static int mxs_saif_mclk_init(struct platform_device *pdev)
+{
+        struct mxs_saif *saif = platform_get_drvdata(pdev);
+        struct device_node *np = pdev->dev.of_node;
+        struct clk *clk;
+        int ret;
+
+        clk = clk_register_divider(&pdev->dev, "mxs_saif_mclk",
+                                   __clk_get_name(saif->clk), 0,
+                                   saif->base + SAIF_CTRL,
+                                   BP_SAIF_CTRL_BITCLK_MULT_RATE, 3,
+                                   0, NULL);
+        if (IS_ERR(clk)) {
+                ret = PTR_ERR(clk);
+                if (ret == -EEXIST)
+                        return 0;
+                dev_err(&pdev->dev, "failed to register mclk: %d\n", ret);
+                return PTR_ERR(clk);
+        }
+
+        ret = of_clk_add_provider(np, of_clk_src_simple_get, clk);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
 static int mxs_saif_probe(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
@@ -734,6 +762,13 @@ static int mxs_saif_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, saif);
 
+        /* We only support saif0 being tx and clock master */
+        if (saif->id == 0) {
+                ret = mxs_saif_mclk_init(pdev);
+                if (ret)
+                        dev_warn(&pdev->dev, "failed to init clocks\n");
+        }
+
         ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
                                          &mxs_saif_dai, 1);
         if (ret) {
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 82ebb1a51479..7a1734697434 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1016,52 +1016,6 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
         return i2s;
 }
 
-#ifdef CONFIG_OF
-static int samsung_i2s_parse_dt_gpio(struct i2s_dai *i2s)
-{
-        struct device *dev = &i2s->pdev->dev;
-        int index, gpio, ret;
-
-        for (index = 0; index < 7; index++) {
-                gpio = of_get_gpio(dev->of_node, index);
-                if (!gpio_is_valid(gpio)) {
-                        dev_err(dev, "invalid gpio[%d]: %d\n", index, gpio);
-                        goto free_gpio;
-                }
-
-                ret = gpio_request(gpio, dev_name(dev));
-                if (ret) {
-                        dev_err(dev, "gpio [%d] request failed\n", gpio);
-                        goto free_gpio;
-                }
-                i2s->gpios[index] = gpio;
-        }
-        return 0;
-
-free_gpio:
-        while (--index >= 0)
-                gpio_free(i2s->gpios[index]);
-        return -EINVAL;
-}
-
-static void samsung_i2s_dt_gpio_free(struct i2s_dai *i2s)
-{
-        unsigned int index;
-        for (index = 0; index < 7; index++)
-                gpio_free(i2s->gpios[index]);
-}
-#else
-static int samsung_i2s_parse_dt_gpio(struct i2s_dai *dai)
-{
-        return -EINVAL;
-}
-
-static void samsung_i2s_dt_gpio_free(struct i2s_dai *dai)
-{
-}
-
-#endif
-
 static const struct of_device_id exynos_i2s_match[];
 
 static inline int samsung_i2s_get_driver_data(struct platform_device *pdev)
@@ -1235,18 +1189,10 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                 pri_dai->sec_dai = sec_dai;
         }
 
-        if (np) {
-                if (samsung_i2s_parse_dt_gpio(pri_dai)) {
-                        dev_err(&pdev->dev, "Unable to configure gpio\n");
-                        ret = -EINVAL;
-                        goto err;
-                }
-        } else {
-                if (i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) {
-                        dev_err(&pdev->dev, "Unable to configure gpio\n");
-                        ret = -EINVAL;
-                        goto err;
-                }
+        if (i2s_pdata && i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) {
+                dev_err(&pdev->dev, "Unable to configure gpio\n");
+                ret = -EINVAL;
+                goto err;
         }
 
         snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component,
@@ -1267,14 +1213,10 @@ static int samsung_i2s_remove(struct platform_device *pdev)
 {
         struct i2s_dai *i2s, *other;
         struct resource *res;
-        struct s3c_audio_pdata *i2s_pdata = pdev->dev.platform_data;
 
         i2s = dev_get_drvdata(&pdev->dev);
         other = i2s->pri_dai ? : i2s->sec_dai;
 
-        if (!i2s_pdata->cfg_gpio && pdev->dev.of_node)
-                samsung_i2s_dt_gpio_free(i2s->pri_dai);
-
         if (other) {
                 other->pri_dai = NULL;
                 other->sec_dai = NULL;
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 20e98d1dded2..e5e81b111001 100644
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -1,6 +1,4 @@
-/* sound/soc/samsung/s3c-i2c-v2.c
- *
- * ALSA Soc Audio Layer - I2S core for newer Samsung SoCs.
+/* ALSA Soc Audio Layer - I2S core for newer Samsung SoCs.
  *
  * Copyright (c) 2006 Wolfson Microelectronics PLC.
  *      Graeme Gregory graeme.gregory@wolfsonmicro.com