14 files changed, 69 insertions, 18 deletions

diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 4cf91deabc02..4e3e31aaf509 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -14,6 +14,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include <linux/pm.h>
 #include <linux/gcd.h>
 #include <linux/gpio.h>
@@ -2141,6 +2142,7 @@ int wm5100_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(wm5100_detect);
 
 static irqreturn_t wm5100_irq(int irq, void *data)
 {
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index d862f76b59f9..2c3c962d9a85 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -81,6 +81,54 @@ static const struct reg_default wm5110_sysclk_revd_patch[] = {
         { 0x3133, 0x1201 },
         { 0x3183, 0x1501 },
         { 0x31D3, 0x1401 },
+        { 0x0049, 0x01ea },
+        { 0x004a, 0x01f2 },
+        { 0x0057, 0x01e7 },
+        { 0x0058, 0x01fb },
+        { 0x33ce, 0xc4f5 },
+        { 0x33cf, 0x1361 },
+        { 0x33d0, 0x0402 },
+        { 0x33d1, 0x4700 },
+        { 0x33d2, 0x026d },
+        { 0x33d3, 0xff00 },
+        { 0x33d4, 0x026d },
+        { 0x33d5, 0x0101 },
+        { 0x33d6, 0xc4f5 },
+        { 0x33d7, 0x0361 },
+        { 0x33d8, 0x0402 },
+        { 0x33d9, 0x6701 },
+        { 0x33da, 0xc4f5 },
+        { 0x33db, 0x136f },
+        { 0x33dc, 0xc4f5 },
+        { 0x33dd, 0x134f },
+        { 0x33de, 0xc4f5 },
+        { 0x33df, 0x131f },
+        { 0x33e0, 0x026d },
+        { 0x33e1, 0x4f01 },
+        { 0x33e2, 0x026d },
+        { 0x33e3, 0xf100 },
+        { 0x33e4, 0x026d },
+        { 0x33e5, 0x0001 },
+        { 0x33e6, 0xc4f5 },
+        { 0x33e7, 0x0361 },
+        { 0x33e8, 0x0402 },
+        { 0x33e9, 0x6601 },
+        { 0x33ea, 0xc4f5 },
+        { 0x33eb, 0x136f },
+        { 0x33ec, 0xc4f5 },
+        { 0x33ed, 0x134f },
+        { 0x33ee, 0xc4f5 },
+        { 0x33ef, 0x131f },
+        { 0x33f0, 0x026d },
+        { 0x33f1, 0x4e01 },
+        { 0x33f2, 0x026d },
+        { 0x33f3, 0xf000 },
+        { 0x33f6, 0xc4f5 },
+        { 0x33f7, 0x1361 },
+        { 0x33f8, 0x0402 },
+        { 0x33f9, 0x4600 },
+        { 0x33fa, 0x026d },
+        { 0x33fb, 0xfe00 },
 };
 
 static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w,
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index f9090b167ad7..1c791ddbf006 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1262,18 +1262,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                 return -EINVAL;
         hw_type = (enum fsl_ssi_type) of_id->data;
 
-        /* We only support the SSI in "I2S Slave" mode */
         sprop = of_get_property(np, "fsl,mode", NULL);
         if (!sprop) {
                 dev_err(&pdev->dev, "fsl,mode property is necessary\n");
                 return -EINVAL;
         }
-        if (!strcmp(sprop, "ac97-slave")) {
+        if (!strcmp(sprop, "ac97-slave"))
                 ac97 = true;
-        } else if (strcmp(sprop, "i2s-slave")) {
-                dev_notice(&pdev->dev, "mode %s is unsupported\n", sprop);
-                return -ENODEV;
-        }
 
         /* The DAI name is the last part of the full name of the node. */
         p = strrchr(np->full_name, '/') + 1;
@@ -1391,7 +1386,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                  */
                 ssi_private->baudclk = devm_clk_get(&pdev->dev, "baud");
                 if (IS_ERR(ssi_private->baudclk))
-                        dev_warn(&pdev->dev, "could not get baud clock: %ld\n",
+                        dev_dbg(&pdev->dev, "could not get baud clock: %ld\n",
                                  PTR_ERR(ssi_private->baudclk));
                 else
                         clk_prepare_enable(ssi_private->baudclk);
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 4a07f7179690..22ad9c5654b5 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -30,6 +30,7 @@ config SND_OMAP_SOC_RX51
         select SND_OMAP_SOC_MCBSP
         select SND_SOC_TLV320AIC3X
         select SND_SOC_TPA6130A2
+        depends on GPIOLIB
         help
           Say Y if you want to add support for SoC audio on Nokia RX-51
           hardware. This is also known as Nokia N900 product.
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 27930fc432dc..454f41cfc828 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -19,7 +19,7 @@ config SND_S3C_DMA_LEGACY
 
 config SND_S3C24XX_I2S
         tristate
-        select S3C2410_DMA
+        select S3C24XX_DMA
 
 config SND_S3C_I2SV2_SOC
         tristate
@@ -210,7 +210,7 @@ config SND_SOC_TOBERMORY
 
 config SND_SOC_BELLS
         tristate "Audio support for Wolfson Bells"
-        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
+        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && MFD_ARIZONA
         select SND_SAMSUNG_I2S
         select SND_SOC_WM5102
         select SND_SOC_WM5110
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
index fa91376e323d..fbced589d077 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -23,6 +23,7 @@
 #include "regs-iis.h"
 #include <asm/mach-types.h>
 
+#include <mach/gpio-samsung.h>
 #include "s3c24xx-i2s.h"
 
 static unsigned int rates[] = {
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 92f64363427d..0a9b44c940ce 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -22,8 +22,6 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
-#include <mach/dma.h>
-
 #include <linux/platform_data/asoc-s3c.h>
 
 #include "dma.h"
@@ -1268,7 +1266,8 @@ static int samsung_i2s_probe(struct platform_device *pdev)
 
         return 0;
 err:
-        release_mem_region(regs_base, resource_size(res));
+        if (res)
+                release_mem_region(regs_base, resource_size(res));
 
         return ret;
 }
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index 807db417d234..98a04c11202d 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -20,6 +20,7 @@
 
 #include <sound/soc.h>
 
+#include <mach/gpio-samsung.h>
 #include <asm/mach-types.h>
 #include "regs-iis.h"
 
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
index 704460a37005..06ebdc061770 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -24,6 +24,7 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 
+#include <mach/gpio-samsung.h>
 #include "regs-iis.h"
 #include <asm/mach-types.h>
 
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index fefc56100349..79e7efb9283c 100644
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -729,7 +729,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id,
                            struct snd_soc_component_driver *cmp_drv,
                            struct snd_soc_dai_driver *dai_drv)
 {
-        struct snd_soc_dai_ops *ops = drv->ops;
+        struct snd_soc_dai_ops *ops = dai_drv->ops;
 
         ops->trigger = s3c2412_i2s_trigger;
         if (!ops->hw_params)
@@ -742,8 +742,8 @@ int s3c_i2sv2_register_component(struct device *dev, int id,
         if (!ops->delay)
                 ops->delay = s3c2412_i2s_delay;
 
-        drv->suspend = s3c2412_i2s_suspend;
-        drv->resume = s3c2412_i2s_resume;
+        dai_drv->suspend = s3c2412_i2s_suspend;
+        dai_drv->resume = s3c2412_i2s_resume;
 
         return snd_soc_register_component(dev, cmp_drv, dai_drv, 1);
 }
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index ea885cb9f76c..d0794458963a 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -26,6 +26,8 @@
 #include <sound/pcm_params.h>
 
 #include <mach/dma.h>
+#include <mach/gpio-samsung.h>
+#include <plat/gpio-cfg.h>
 
 #include "dma.h"
 #include "regs-i2s-v2.h"
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 9c8ebd872fac..f31e916dd8c4 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -24,6 +24,8 @@
 #include <sound/pcm_params.h>
 
 #include <mach/dma.h>
+#include <mach/gpio-samsung.h>
+#include <plat/gpio-cfg.h>
 #include "regs-iis.h"
 
 #include "dma.h"
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c
index 58ae3237ef69..c3b2adafb7b5 100644
--- a/sound/soc/samsung/smartq_wm8987.c
+++ b/sound/soc/samsung/smartq_wm8987.c
@@ -19,6 +19,7 @@
 #include <sound/soc.h>
 #include <sound/jack.h>
 
+#include <mach/gpio-samsung.h>
 #include <asm/mach-types.h>
 
 #include "i2s.h"
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index b072bd107b31..d38ae98e2f32 100644
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -152,13 +152,11 @@ static struct snd_soc_card smdk = {
         .num_links = ARRAY_SIZE(smdk_dai),
 };
 
-#ifdef CONFIG_OF
 static const struct of_device_id samsung_wm8994_of_match[] = {
         { .compatible = "samsung,smdk-wm8994", .data = &smdk_board_data },
         {},
 };
 MODULE_DEVICE_TABLE(of, samsung_wm8994_of_match);
-#endif /* CONFIG_OF */
 
 static int smdk_audio_probe(struct platform_device *pdev)
 {
@@ -188,7 +186,7 @@ static int smdk_audio_probe(struct platform_device *pdev)
                 smdk_dai[0].platform_of_node = smdk_dai[0].cpu_of_node;
         }
 
-        id = of_match_device(samsung_wm8994_of_match, &pdev->dev);
+        id = of_match_device(of_match_ptr(samsung_wm8994_of_match), &pdev->dev);
         if (id)
                 *board = *((struct smdk_wm8994_data *)id->data);