31 files changed, 249 insertions, 276 deletions

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index f2e289180e46..753b8c93ab51 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -64,6 +64,7 @@ config SND_SOC_SAMSUNG_JIVE_WM8750
 config SND_SOC_SAMSUNG_SMDK_WM8580
         tristate "SoC I2S Audio support for WM8580 on SMDK"
         depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110)
+        depends on REGMAP_I2C
         select SND_SOC_WM8580
         select SND_SAMSUNG_I2S
         help
@@ -115,21 +116,21 @@ config SND_SOC_SAMSUNG_SIMTEC
 
 config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23
         tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"
-        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
+        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX && I2C
         select SND_S3C24XX_I2S
         select SND_SOC_TLV320AIC23_I2C
         select SND_SOC_SAMSUNG_SIMTEC
 
 config SND_SOC_SAMSUNG_SIMTEC_HERMES
         tristate "SoC I2S Audio support for Simtec Hermes board"
-        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
+        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX && I2C
         select SND_S3C24XX_I2S
         select SND_SOC_TLV320AIC3X
         select SND_SOC_SAMSUNG_SIMTEC
 
 config SND_SOC_SAMSUNG_H1940_UDA1380
         tristate "Audio support for the HP iPAQ H1940"
-        depends on SND_SOC_SAMSUNG && ARCH_H1940
+        depends on SND_SOC_SAMSUNG && ARCH_H1940 && I2C
         select SND_S3C24XX_I2S
         select SND_SOC_UDA1380
         help
@@ -137,7 +138,7 @@ config SND_SOC_SAMSUNG_H1940_UDA1380
 
 config SND_SOC_SAMSUNG_RX1950_UDA1380
         tristate "Audio support for the HP iPAQ RX1950"
-        depends on SND_SOC_SAMSUNG && MACH_RX1950
+        depends on SND_SOC_SAMSUNG && MACH_RX1950 && I2C
         select SND_S3C24XX_I2S
         select SND_SOC_UDA1380
         help
@@ -178,6 +179,7 @@ config SND_SOC_SAMSUNG_SMDK_SPDIF
 config SND_SOC_SMDK_WM8580_PCM
         tristate "SoC PCM Audio support for WM8580 on SMDK"
         depends on SND_SOC_SAMSUNG && (MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110)
+        depends on REGMAP_I2C
         select SND_SOC_WM8580
         select SND_SAMSUNG_PCM
         help
@@ -204,7 +206,7 @@ config SND_SOC_SPEYSIDE
 
 config SND_SOC_TOBERMORY
         tristate "Audio support for Wolfson Tobermory"
-        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
+        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && INPUT
         select SND_SAMSUNG_I2S
         select SND_SOC_WM8962
 
@@ -231,3 +233,13 @@ config SND_SOC_LITTLEMILL
         select SND_SAMSUNG_I2S
         select MFD_WM8994
         select SND_SOC_WM8994
+
+config SND_SOC_SNOW
+        tristate "Audio support for Google Snow boards"
+        depends on SND_SOC_SAMSUNG
+        select SND_SOC_MAX98090
+        select SND_SOC_MAX98095
+        select SND_SAMSUNG_I2S
+        help
+          Say Y if you want to add audio support for various Snow
+          boards based on Exynos5 series of SoCs.
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index 86715d8efee6..6d0212ba571c 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -34,6 +34,7 @@ snd-soc-h1940-uda1380-objs := h1940_uda1380.o
 snd-soc-rx1950-uda1380-objs := rx1950_uda1380.o
 snd-soc-smdk-wm8580-objs := smdk_wm8580.o
 snd-soc-smdk-wm8994-objs := smdk_wm8994.o
+snd-soc-snow-objs := snow.o
 snd-soc-smdk-wm9713-objs := smdk_wm9713.o
 snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o
 snd-soc-goni-wm8994-objs := goni_wm8994.o
@@ -58,6 +59,7 @@ obj-$(CONFIG_SND_SOC_SAMSUNG_H1940_UDA1380) += snd-soc-h1940-uda1380.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8580) += snd-soc-smdk-wm8580.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994) += snd-soc-smdk-wm8994.o
+obj-$(CONFIG_SND_SOC_SNOW) += snd-soc-snow.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o
 obj-$(CONFIG_SND_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 76b072bd4ba2..68d9303047e8 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -433,7 +433,7 @@ static int s3c_ac97_probe(struct platform_device *pdev)
                 goto err4;
         }
 
-        ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
+        ret = devm_snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
                                          s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));
         if (ret)
                 goto err5;
@@ -441,12 +441,10 @@ static int s3c_ac97_probe(struct platform_device *pdev)
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);
-                goto err6;
+                goto err5;
         }
 
         return 0;
-err6:
-        snd_soc_unregister_component(&pdev->dev);
 err5:
         free_irq(irq_res->start, NULL);
 err4:
@@ -461,9 +459,6 @@ static int s3c_ac97_remove(struct platform_device *pdev)
 {
         struct resource *irq_res;
 
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-
         irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (irq_res)
                 free_irq(irq_res->start, NULL);
diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
index 84f5d8b76679..5b21207cf551 100644
--- a/sound/soc/samsung/bells.c
+++ b/sound/soc/samsung/bells.c
@@ -433,22 +433,13 @@ static int bells_probe(struct platform_device *pdev)
 
         bells_cards[pdev->id].dev = &pdev->dev;
 
-        ret = snd_soc_register_card(&bells_cards[pdev->id]);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, &bells_cards[pdev->id]);
+        if (ret)
                 dev_err(&pdev->dev,
                         "snd_soc_register_card(%s) failed: %d\n",
                         bells_cards[pdev->id].name, ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int bells_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_card(&bells_cards[pdev->id]);
 
-        return 0;
+        return ret;
 }
 
 static struct platform_driver bells_driver = {
@@ -458,7 +449,6 @@ static struct platform_driver bells_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = bells_probe,
-        .remove = bells_remove,
 };
 
 module_platform_driver(bells_driver);
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
index dc09b71b7d9f..d9dc7bcc0336 100644
--- a/sound/soc/samsung/dma.c
+++ b/sound/soc/samsung/dma.c
@@ -445,16 +445,10 @@ EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);
 
 int samsung_asoc_dma_platform_register(struct device *dev)
 {
-        return snd_soc_register_platform(dev, &samsung_asoc_platform);
+        return devm_snd_soc_register_platform(dev, &samsung_asoc_platform);
 }
 EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);
 
-void samsung_asoc_dma_platform_unregister(struct device *dev)
-{
-        snd_soc_unregister_platform(dev);
-}
-EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_unregister);
-
 MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>");
 MODULE_DESCRIPTION("Samsung ASoC DMA Driver");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h
index ad7c0f04f00d..070ab0f09609 100644
--- a/sound/soc/samsung/dma.h
+++ b/sound/soc/samsung/dma.h
@@ -33,6 +33,5 @@ void samsung_asoc_init_dma_data(struct snd_soc_dai *dai,
                                 struct s3c_dma_params *playback,
                                 struct s3c_dma_params *capture);
 int samsung_asoc_dma_platform_register(struct device *dev);
-void samsung_asoc_dma_platform_unregister(struct device *dev);
 
 #endif
diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c
index 750ce5808d9f..a0e4e7948909 100644
--- a/sound/soc/samsung/dmaengine.c
+++ b/sound/soc/samsung/dmaengine.c
@@ -66,18 +66,13 @@ EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);
 
 int samsung_asoc_dma_platform_register(struct device *dev)
 {
-        return snd_dmaengine_pcm_register(dev, &samsung_dmaengine_pcm_config,
-                                          SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME |
-                                          SND_DMAENGINE_PCM_FLAG_COMPAT);
+        return devm_snd_dmaengine_pcm_register(dev,
+                        &samsung_dmaengine_pcm_config,
+                        SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME |
+                        SND_DMAENGINE_PCM_FLAG_COMPAT);
 }
 EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);
 
-void samsung_asoc_dma_platform_unregister(struct device *dev)
-{
-        return snd_dmaengine_pcm_unregister(dev);
-}
-EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_unregister);
-
 MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");
 MODULE_DESCRIPTION("Samsung dmaengine ASoC driver");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index 415ad81999c4..9506d7617223 100644
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -274,8 +274,8 @@ static int __init goni_init(void)
                 return -ENOMEM;
 
         /* register voice DAI here */
-        ret = snd_soc_register_component(&goni_snd_device->dev, &voice_component,
-                                         &voice_dai, 1);
+        ret = devm_snd_soc_register_component(&goni_snd_device->dev,
+                        &voice_component, &voice_dai, 1);
         if (ret) {
                 platform_device_put(goni_snd_device);
                 return ret;
@@ -284,17 +284,14 @@ static int __init goni_init(void)
         platform_set_drvdata(goni_snd_device, &goni);
         ret = platform_device_add(goni_snd_device);
 
-        if (ret) {
-                snd_soc_unregister_component(&goni_snd_device->dev);
+        if (ret)
                 platform_device_put(goni_snd_device);
-        }
 
         return ret;
 }
 
 static void __exit goni_exit(void)
 {
-        snd_soc_unregister_component(&goni_snd_device->dev);
         platform_device_unregister(goni_snd_device);
 }
 
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
index 88b09e022503..f2d7980d7ddc 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -176,11 +176,6 @@ static struct platform_device *s3c24xx_snd_device;
 static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
 
         snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
                 &hp_jack);
@@ -194,6 +189,14 @@ static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)
         return 0;
 }
 
+static int h1940_uda1380_card_remove(struct snd_soc_card *card)
+{
+        snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
+                hp_jack_gpios);
+
+        return 0;
+}
+
 /* s3c24xx digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link h1940_uda1380_dai[] = {
         {
@@ -211,6 +214,7 @@ static struct snd_soc_dai_link h1940_uda1380_dai[] = {
 static struct snd_soc_card h1940_asoc = {
         .name = "h1940",
         .owner = THIS_MODULE,
+        .remove = h1940_uda1380_card_remove,
         .dai_link = h1940_uda1380_dai,
         .num_links = ARRAY_SIZE(h1940_uda1380_dai),
 
@@ -262,8 +266,6 @@ err_out:
 static void __exit h1940_exit(void)
 {
         platform_device_unregister(s3c24xx_snd_device);
-        snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
-                hp_jack_gpios);
         gpio_free(S3C_GPIO_END + 9);
 }
 
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 048ead967199..2ac76fa3e742 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -451,6 +451,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
         u32 mod = readl(i2s->addr + I2SMOD);
 
         switch (clk_id) {
+        case SAMSUNG_I2S_OPCLK:
+                mod &= ~MOD_OPCLK_MASK;
+                mod |= dir;
+                break;
         case SAMSUNG_I2S_CDCLK:
                 /* Shouldn't matter in GATING(CLOCK_IN) mode */
                 if (dir == SND_SOC_CLOCK_IN)
@@ -484,7 +488,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
                         clk_id = 1;
 
                 if (!any_active(i2s)) {
-                        if (i2s->op_clk) {
+                        if (i2s->op_clk && !IS_ERR(i2s->op_clk)) {
                                 if ((clk_id && !(mod & MOD_IMS_SYSMUX)) ||
                                         (!clk_id && (mod & MOD_IMS_SYSMUX))) {
                                         clk_disable_unprepare(i2s->op_clk);
@@ -502,6 +506,10 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai,
                         else
                                 i2s->op_clk = clk_get(&i2s->pdev->dev,
                                                 "i2s_opclk0");
+
+                        if (WARN_ON(IS_ERR(i2s->op_clk)))
+                                return PTR_ERR(i2s->op_clk);
+
                         clk_prepare_enable(i2s->op_clk);
                         i2s->rclk_srcrate = clk_get_rate(i2s->op_clk);
 
@@ -668,8 +676,8 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
         if (is_manager(i2s))
                 mod &= ~MOD_BLC_MASK;
 
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S8:
+        switch (params_width(params)) {
+        case 8:
                 if (is_secondary(i2s))
                         mod |= MOD_BLCS_8BIT;
                 else
@@ -677,7 +685,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
                 if (is_manager(i2s))
                         mod |= MOD_BLC_8BIT;
                 break;
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                 if (is_secondary(i2s))
                         mod |= MOD_BLCS_16BIT;
                 else
@@ -685,7 +693,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
                 if (is_manager(i2s))
                         mod |= MOD_BLC_16BIT;
                 break;
-        case SNDRV_PCM_FORMAT_S24_LE:
+        case 24:
                 if (is_secondary(i2s))
                         mod |= MOD_BLCS_24BIT;
                 else
@@ -724,9 +732,6 @@ static int i2s_startup(struct snd_pcm_substream *substream,
         else
                 i2s->mode |= DAI_MANAGER;
 
-        /* Enforce set_sysclk in Master mode */
-        i2s->rclk_srcrate = 0;
-
         if (!any_active(i2s) && (i2s->quirks & QUIRK_NEED_RSTCLR))
                 writel(CON_RSTCLR, i2s->addr + I2SCON);
 
@@ -984,6 +989,7 @@ probe_exit:
         /* Reset any constraint on RFS and BFS */
         i2s->rfs = 0;
         i2s->bfs = 0;
+        i2s->rclk_srcrate = 0;
         i2s_txctrl(i2s, 0);
         i2s_rxctrl(i2s, 0);
         i2s_fifo(i2s, FIC_TXFLUSH);
@@ -1293,8 +1299,6 @@ static int samsung_i2s_remove(struct platform_device *pdev)
         i2s->pri_dai = NULL;
         i2s->sec_dai = NULL;
 
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-
         return 0;
 }
 
diff --git a/sound/soc/samsung/i2s.h b/sound/soc/samsung/i2s.h
index 7966afc934db..21ff24e930db 100644
--- a/sound/soc/samsung/i2s.h
+++ b/sound/soc/samsung/i2s.h
@@ -18,5 +18,6 @@
 #define SAMSUNG_I2S_RCLKSRC_0   0
 #define SAMSUNG_I2S_RCLKSRC_1   1
 #define SAMSUNG_I2S_CDCLK               2
+#define SAMSUNG_I2S_OPCLK               3
 
 #endif /* __SND_SOC_SAMSUNG_I2S_H */
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c
index 3d5cf1530b6f..8cc5770abb39 100644
--- a/sound/soc/samsung/idma.c
+++ b/sound/soc/samsung/idma.c
@@ -274,7 +274,7 @@ static irqreturn_t iis_irq(int irqno, void *dev_id)
 
                 addr = readl(idma.regs + I2SLVL0ADDR) - idma.lp_tx_addr;
                 addr += prtd->periodsz;
-                addr %= (prtd->end - prtd->start);
+                addr %= (u32)(prtd->end - prtd->start);
                 addr += idma.lp_tx_addr;
 
                 writel(addr, idma.regs + I2SLVL0ADDR);
@@ -413,13 +413,7 @@ static int asoc_idma_platform_probe(struct platform_device *pdev)
         if (idma_irq < 0)
                 return idma_irq;
 
-        return snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
-}
-
-static int asoc_idma_platform_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_platform(&pdev->dev);
-        return 0;
+        return devm_snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
 }
 
 static struct platform_driver asoc_idma_driver = {
@@ -429,7 +423,6 @@ static struct platform_driver asoc_idma_driver = {
         },
 
         .probe = asoc_idma_platform_probe,
-        .remove = asoc_idma_platform_remove,
 };
 
 module_platform_driver(asoc_idma_driver);
diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c
index bfb91f34a22a..840787e63cb1 100644
--- a/sound/soc/samsung/littlemill.c
+++ b/sound/soc/samsung/littlemill.c
@@ -304,23 +304,12 @@ static int littlemill_probe(struct platform_device *pdev)
 
         card->dev = &pdev->dev;
 
-        ret = snd_soc_register_card(card);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                         ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int littlemill_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_card(card);
-
-        return 0;
+        return ret;
 }
 
 static struct platform_driver littlemill_driver = {
@@ -330,7 +319,6 @@ static struct platform_driver littlemill_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = littlemill_probe,
-        .remove = littlemill_remove,
 };
 
 module_platform_driver(littlemill_driver);
diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c
index 570cf5229508..bd5f0d643a86 100644
--- a/sound/soc/samsung/lowland.c
+++ b/sound/soc/samsung/lowland.c
@@ -187,23 +187,12 @@ static int lowland_probe(struct platform_device *pdev)
 
         card->dev = &pdev->dev;
 
-        ret = snd_soc_register_card(card);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                         ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int lowland_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_card(card);
-
-        return 0;
+        return ret;
 }
 
 static struct platform_driver lowland_driver = {
@@ -213,7 +202,6 @@ static struct platform_driver lowland_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = lowland_probe,
-        .remove = lowland_remove,
 };
 
 module_platform_driver(lowland_driver);
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index b0800337b79e..9b4a09f14b6c 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -271,15 +271,8 @@ static const struct snd_kcontrol_new neo1973_wm8753_controls[] = {
 
 static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_card *card = rtd->card;
 
-        /* set up NC codec pins */
-        snd_soc_dapm_nc_pin(&codec->dapm, "OUT3");
-        snd_soc_dapm_nc_pin(&codec->dapm, "OUT4");
-        snd_soc_dapm_nc_pin(&codec->dapm, "LINE1");
-        snd_soc_dapm_nc_pin(&codec->dapm, "LINE2");
-
         /* set endpoints to default off mode */
         snd_soc_dapm_disable_pin(&card->dapm, "GSM Line Out");
         snd_soc_dapm_disable_pin(&card->dapm, "GSM Line In");
@@ -355,6 +348,7 @@ static struct snd_soc_card neo1973 = {
         .num_dapm_widgets = ARRAY_SIZE(neo1973_wm8753_dapm_widgets),
         .dapm_routes = neo1973_wm8753_routes,
         .num_dapm_routes = ARRAY_SIZE(neo1973_wm8753_routes),
+        .fully_routed = true,
 };
 
 static struct platform_device *neo1973_snd_device;
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index ab54e297957c..4c5f97fe45c8 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -283,8 +283,8 @@ static int s3c_pcm_hw_params(struct snd_pcm_substream *substream,
         dev_dbg(pcm->dev, "Entered %s\n", __func__);
 
         /* Strictly check for sample size */
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S16_LE:
+        switch (params_width(params)) {
+        case 16:
                 break;
         default:
                 return -EINVAL;
@@ -542,7 +542,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
         /* Default is 128fs */
         pcm->sclk_per_fs = 128;
 
-        pcm->cclk = clk_get(&pdev->dev, "audio-bus");
+        pcm->cclk = devm_clk_get(&pdev->dev, "audio-bus");
         if (IS_ERR(pcm->cclk)) {
                 dev_err(&pdev->dev, "failed to get audio-bus\n");
                 ret = PTR_ERR(pcm->cclk);
@@ -567,7 +567,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
                 goto err3;
         }
 
-        pcm->pclk = clk_get(&pdev->dev, "pcm");
+        pcm->pclk = devm_clk_get(&pdev->dev, "pcm");
         if (IS_ERR(pcm->pclk)) {
                 dev_err(&pdev->dev, "failed to get pcm_clock\n");
                 ret = -ENOENT;
@@ -588,7 +588,7 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
 
         pm_runtime_enable(&pdev->dev);
 
-        ret = snd_soc_register_component(&pdev->dev, &s3c_pcm_component,
+        ret = devm_snd_soc_register_component(&pdev->dev, &s3c_pcm_component,
                                          &s3c_pcm_dai[pdev->id], 1);
         if (ret != 0) {
                 dev_err(&pdev->dev, "failed to get register DAI: %d\n", ret);
@@ -598,23 +598,19 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev)
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret);
-                goto err6;
+                goto err5;
         }
 
         return 0;
 
-err6:
-        snd_soc_unregister_component(&pdev->dev);
 err5:
         clk_disable_unprepare(pcm->pclk);
-        clk_put(pcm->pclk);
 err4:
         iounmap(pcm->regs);
 err3:
         release_mem_region(mem_res->start, resource_size(mem_res));
 err2:
         clk_disable_unprepare(pcm->cclk);
-        clk_put(pcm->cclk);
 err1:
         return ret;
 }
@@ -624,9 +620,6 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev)
         struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id];
         struct resource *mem_res;
 
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-
         pm_runtime_disable(&pdev->dev);
 
         iounmap(pcm->regs);
@@ -636,8 +629,6 @@ static int s3c_pcm_dev_remove(struct platform_device *pdev)
 
         clk_disable_unprepare(pcm->cclk);
         clk_disable_unprepare(pcm->pclk);
-        clk_put(pcm->pclk);
-        clk_put(pcm->cclk);
 
         return 0;
 }
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
index 2982d9e7f268..37688ebbb2b4 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -31,6 +31,7 @@
 #include "s3c24xx-i2s.h"
 
 static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd);
+static int rx1950_uda1380_card_remove(struct snd_soc_card *card);
 static int rx1950_startup(struct snd_pcm_substream *substream);
 static int rx1950_hw_params(struct snd_pcm_substream *substream,
                                 struct snd_pcm_hw_params *params);
@@ -116,6 +117,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
 static struct snd_soc_card rx1950_asoc = {
         .name = "rx1950",
         .owner = THIS_MODULE,
+        .remove = rx1950_uda1380_card_remove,
         .dai_link = rx1950_uda1380_dai,
         .num_links = ARRAY_SIZE(rx1950_uda1380_dai),
 
@@ -221,11 +223,6 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
 static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
 
         snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
                 &hp_jack);
@@ -239,6 +236,14 @@ static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
         return 0;
 }
 
+static int rx1950_uda1380_card_remove(struct snd_soc_card *card)
+{
+        snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
+                hp_jack_gpios);
+
+        return 0;
+}
+
 static int __init rx1950_init(void)
 {
         int ret;
@@ -283,8 +288,6 @@ err_gpio:
 static void __exit rx1950_exit(void)
 {
         platform_device_unregister(s3c24xx_snd_device);
-        snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
-                hp_jack_gpios);
         gpio_free(S3C2410_GPA(1));
 }
 
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 79e7efb9283c..0ff4bbe23af3 100644
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -322,13 +322,13 @@ static int s3c_i2sv2_hw_params(struct snd_pcm_substream *substream,
 
         iismod &= ~S3C64XX_IISMOD_BLC_MASK;
         /* Sample size */
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S8:
+        switch (params_width(params)) {
+        case 8:
                 iismod |= S3C64XX_IISMOD_BLC_8BIT;
                 break;
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                 break;
-        case SNDRV_PCM_FORMAT_S24_LE:
+        case 24:
                 iismod |= S3C64XX_IISMOD_BLC_24BIT;
                 break;
         }
@@ -745,7 +745,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id,
         dai_drv->suspend = s3c2412_i2s_suspend;
         dai_drv->resume = s3c2412_i2s_resume;
 
-        return snd_soc_register_component(dev, cmp_drv, dai_drv, 1);
+        return devm_snd_soc_register_component(dev, cmp_drv, dai_drv, 1);
 }
 EXPORT_SYMBOL_GPL(s3c_i2sv2_register_component);
 
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index e9bb5d7a71ee..08c059be9104 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -120,11 +120,11 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,
         iismod = readl(i2s->regs + S3C2412_IISMOD);
         pr_debug("%s: r: IISMOD: %x\n", __func__, iismod);
 
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S8:
+        switch (params_width(params)) {
+        case 8:
                 iismod |= S3C2412_IISMOD_8BIT;
                 break;
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                 iismod &= ~S3C2412_IISMOD_8BIT;
                 break;
         }
@@ -179,27 +179,14 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev)
         }
 
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
-        if (ret) {
+        if (ret)
                 pr_err("failed to register the DMA: %d\n", ret);
-                goto err;
-        }
 
-        return 0;
-err:
-        snd_soc_unregister_component(&pdev->dev);
         return ret;
 }
 
-static int s3c2412_iis_dev_remove(struct platform_device *pdev)
-{
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-        return 0;
-}
-
 static struct platform_driver s3c2412_iis_driver = {
         .probe  = s3c2412_iis_dev_probe,
-        .remove = s3c2412_iis_dev_remove,
         .driver = {
                 .name = "s3c2412-iis",
                 .owner = THIS_MODULE,
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index d7b8457b5650..9aba9fb7df0e 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -248,12 +248,12 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream,
         iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
         pr_debug("hw_params r: IISMOD: %x\n", iismod);
 
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S8:
+        switch (params_width(params)) {
+        case 8:
                 iismod &= ~S3C2410_IISMOD_16BIT;
                 dma_data->dma_size = 1;
                 break;
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                 iismod |= S3C2410_IISMOD_16BIT;
                 dma_data->dma_size = 2;
                 break;
@@ -475,35 +475,22 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
 {
         int ret = 0;
 
-        ret = snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component,
-                                         &s3c24xx_i2s_dai, 1);
+        ret = devm_snd_soc_register_component(&pdev->dev,
+                        &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1);
         if (ret) {
                 pr_err("failed to register the dai\n");
                 return ret;
         }
 
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
-        if (ret) {
+        if (ret)
                 pr_err("failed to register the dma: %d\n", ret);
-                goto err;
-        }
 
-        return 0;
-err:
-        snd_soc_unregister_component(&pdev->dev);
         return ret;
 }
 
-static int s3c24xx_iis_dev_remove(struct platform_device *pdev)
-{
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-        return 0;
-}
-
 static struct platform_driver s3c24xx_iis_driver = {
         .probe  = s3c24xx_iis_dev_probe,
-        .remove = s3c24xx_iis_dev_remove,
         .driver = {
                 .name = "s3c24xx-iis",
                 .owner = THIS_MODULE,
diff --git a/sound/soc/samsung/s3c24xx_simtec_hermes.c b/sound/soc/samsung/s3c24xx_simtec_hermes.c
index d8a0543cae5e..2d30b7b6818a 100644
--- a/sound/soc/samsung/s3c24xx_simtec_hermes.c
+++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c
@@ -63,14 +63,6 @@ static const struct snd_soc_dapm_route base_map[] = {
 */
 static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Line In");
-        snd_soc_dapm_enable_pin(dapm, "Line Out");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
-
         simtec_audio_init(rtd);
 
         return 0;
diff --git a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
index 1ac0d7a63a3a..83f6c7d49cd6 100644
--- a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
+++ b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
@@ -52,14 +52,6 @@ static const struct snd_soc_dapm_route base_map[] = {
 */
 static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
 {
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
-        snd_soc_dapm_enable_pin(dapm, "Line In");
-        snd_soc_dapm_enable_pin(dapm, "Line Out");
-        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
-
         simtec_audio_init(rtd);
 
         return 0;
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c
index c3b2adafb7b5..9b0ffacab790 100644
--- a/sound/soc/samsung/smartq_wm8987.c
+++ b/sound/soc/samsung/smartq_wm8987.c
@@ -162,8 +162,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "ROUT1");
 
         /* set endpoints to default off mode */
-        snd_soc_dapm_enable_pin(dapm, "Internal Speaker");
-        snd_soc_dapm_enable_pin(dapm, "Internal Mic");
         snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
 
         /* Headphone jack detection */
@@ -184,6 +182,14 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
         return err;
 }
 
+static int smartq_wm8987_card_remove(struct snd_soc_card *card)
+{
+        snd_soc_jack_free_gpios(&smartq_jack, ARRAY_SIZE(smartq_jack_gpios),
+                                smartq_jack_gpios);
+
+        return 0;
+}
+
 static struct snd_soc_dai_link smartq_dai[] = {
         {
                 .name           = "wm8987",
@@ -200,6 +206,7 @@ static struct snd_soc_dai_link smartq_dai[] = {
 static struct snd_soc_card snd_soc_smartq = {
         .name = "SmartQ",
         .owner = THIS_MODULE,
+        .remove = smartq_wm8987_card_remove,
         .dai_link = smartq_dai,
         .num_links = ARRAY_SIZE(smartq_dai),
 
@@ -261,8 +268,6 @@ err_unregister_device:
 static void __exit smartq_exit(void)
 {
         gpio_free(S3C64XX_GPK(12));
-        snd_soc_jack_free_gpios(&smartq_jack, ARRAY_SIZE(smartq_jack_gpios),
-                                smartq_jack_gpios);
 
         platform_device_unregister(smartq_snd_device);
 }
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index 7a16b32ed673..b1a519f83b29 100644
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -37,13 +37,11 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
         unsigned int pll_out;
         int bfs, rfs, ret;
 
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_U8:
-        case SNDRV_PCM_FORMAT_S8:
+        switch (params_width(params)) {
+        case 8:
                 bfs = 16;
                 break;
-        case SNDRV_PCM_FORMAT_U16_LE:
-        case SNDRV_PCM_FORMAT_S16_LE:
+        case 16:
                 bfs = 32;
                 break;
         default:
diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c
index 23a9204b106d..e119aaa91c28 100644
--- a/sound/soc/samsung/smdk_wm8580pcm.c
+++ b/sound/soc/samsung/smdk_wm8580pcm.c
@@ -164,19 +164,11 @@ static int snd_smdk_probe(struct platform_device *pdev)
                 xtal_freq = mclk_freq = SMDK_WM8580_EXT_VOICE;
 
         smdk_pcm.dev = &pdev->dev;
-        ret = snd_soc_register_card(&smdk_pcm);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
-                return ret;
-        }
 
-        return 0;
-}
-
-static int snd_smdk_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_card(&smdk_pcm);
-        return 0;
+        return ret;
 }
 
 static struct platform_driver snd_smdk_driver = {
@@ -185,7 +177,6 @@ static struct platform_driver snd_smdk_driver = {
                 .name = "samsung-smdk-pcm",
         },
         .probe = snd_smdk_probe,
-        .remove = snd_smdk_remove,
 };
 
 module_platform_driver(snd_smdk_driver);
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index 682eb4f7ba0c..3d6272a8cad2 100644
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -57,7 +57,7 @@ static int smdk_hw_params(struct snd_pcm_substream *substream,
         int ret;
 
         /* AIF1CLK should be >=3MHz for optimal performance */
-        if (params_format(params) == SNDRV_PCM_FORMAT_S24_LE)
+        if (params_width(params) == 24)
                 pll_out = params_rate(params) * 384;
         else if (params_rate(params) == 8000 || params_rate(params) == 11025)
                 pll_out = params_rate(params) * 512;
@@ -89,18 +89,6 @@ static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        /* HeadPhone */
-        snd_soc_dapm_enable_pin(dapm, "HPOUT1R");
-        snd_soc_dapm_enable_pin(dapm, "HPOUT1L");
-
-        /* MicIn */
-        snd_soc_dapm_enable_pin(dapm, "IN1LN");
-        snd_soc_dapm_enable_pin(dapm, "IN1RN");
-
-        /* LineIn */
-        snd_soc_dapm_enable_pin(dapm, "IN2LN");
-        snd_soc_dapm_enable_pin(dapm, "IN2RN");
-
         /* Other pins NC */
         snd_soc_dapm_nc_pin(dapm, "HPOUT2P");
         snd_soc_dapm_nc_pin(dapm, "HPOUT2N");
diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c
index 0c84ca099612..b6c09979be1f 100644
--- a/sound/soc/samsung/smdk_wm8994pcm.c
+++ b/sound/soc/samsung/smdk_wm8994pcm.c
@@ -134,19 +134,11 @@ static int snd_smdk_probe(struct platform_device *pdev)
         int ret = 0;
 
         smdk_pcm.dev = &pdev->dev;
-        ret = snd_soc_register_card(&smdk_pcm);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
-                return ret;
-        }
 
-        return 0;
-}
-
-static int snd_smdk_remove(struct platform_device *pdev)
-{
-        snd_soc_unregister_card(&smdk_pcm);
-        return 0;
+        return ret;
 }
 
 static struct platform_driver snd_smdk_driver = {
@@ -155,7 +147,6 @@ static struct platform_driver snd_smdk_driver = {
                 .name = "samsung-smdk-pcm",
         },
         .probe = snd_smdk_probe,
-        .remove = snd_smdk_remove,
 };
 
 module_platform_driver(snd_smdk_driver);
diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c
new file mode 100644
index 000000000000..014c177840ba
--- /dev/null
+++ b/sound/soc/samsung/snow.c
@@ -0,0 +1,123 @@
+/*
+ * ASoC machine driver for Snow boards
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+
+#include <sound/soc.h>
+
+#include "i2s.h"
+
+#define FIN_PLL_RATE            24000000
+
+static struct snd_soc_dai_link snow_dai[] = {
+        {
+                .name = "Primary",
+                .stream_name = "Primary",
+                .codec_dai_name = "HiFi",
+                .dai_fmt = SND_SOC_DAIFMT_I2S |
+                                SND_SOC_DAIFMT_NB_NF |
+                                SND_SOC_DAIFMT_CBS_CFS,
+        },
+};
+
+static int snow_late_probe(struct snd_soc_card *card)
+{
+        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
+        struct snd_soc_dai *cpu_dai = card->rtd[0].cpu_dai;
+        int ret;
+
+        /* Set the MCLK rate for the codec */
+        ret = snd_soc_dai_set_sysclk(codec_dai, 0,
+                                        FIN_PLL_RATE, SND_SOC_CLOCK_IN);
+        if (ret < 0)
+                return ret;
+
+        /* Select I2S Bus clock to set RCLK and BCLK */
+        ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0,
+                                        0, SND_SOC_CLOCK_IN);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static struct snd_soc_card snow_snd = {
+        .name = "Snow-I2S",
+        .dai_link = snow_dai,
+        .num_links = ARRAY_SIZE(snow_dai),
+
+        .late_probe = snow_late_probe,
+};
+
+static int snow_probe(struct platform_device *pdev)
+{
+        struct snd_soc_card *card = &snow_snd;
+        struct device_node *i2s_node, *codec_node;
+        int i, ret;
+
+        i2s_node = of_parse_phandle(pdev->dev.of_node,
+                                    "samsung,i2s-controller", 0);
+        if (!i2s_node) {
+                dev_err(&pdev->dev,
+                        "Property 'i2s-controller' missing or invalid\n");
+                return -EINVAL;
+        }
+
+        codec_node = of_parse_phandle(pdev->dev.of_node,
+                                      "samsung,audio-codec", 0);
+        if (!codec_node) {
+                dev_err(&pdev->dev,
+                        "Property 'audio-codec' missing or invalid\n");
+                return -EINVAL;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(snow_dai); i++) {
+                snow_dai[i].codec_of_node = codec_node;
+                snow_dai[i].cpu_of_node = i2s_node;
+                snow_dai[i].platform_of_node = i2s_node;
+        }
+
+        card->dev = &pdev->dev;
+
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret) {
+                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+                return ret;
+        }
+
+        return ret;
+}
+
+static const struct of_device_id snow_of_match[] = {
+        { .compatible = "google,snow-audio-max98090", },
+        { .compatible = "google,snow-audio-max98095", },
+        {},
+};
+
+static struct platform_driver snow_driver = {
+        .driver = {
+                .name = "snow-audio",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+                .of_match_table = snow_of_match,
+        },
+        .probe = snow_probe,
+};
+
+module_platform_driver(snow_driver);
+
+MODULE_DESCRIPTION("ALSA SoC Audio machine driver for Snow");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index cfe63b7bcc9f..d9ffc48fce5e 100644
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -211,8 +211,8 @@ static int spdif_hw_params(struct snd_pcm_substream *substream,
         con |= CON_PCM_DATA;
 
         con &= ~CON_PCM_MASK;
-        switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S16_LE:
+        switch (params_width(params)) {
+        case 16:
                 con |= CON_PCM_16BIT;
                 break;
         default:
@@ -427,8 +427,8 @@ static int spdif_probe(struct platform_device *pdev)
 
         dev_set_drvdata(&pdev->dev, spdif);
 
-        ret = snd_soc_register_component(&pdev->dev, &samsung_spdif_component,
-                                         &samsung_spdif_dai, 1);
+        ret = devm_snd_soc_register_component(&pdev->dev,
+                        &samsung_spdif_component, &samsung_spdif_dai, 1);
         if (ret != 0) {
                 dev_err(&pdev->dev, "fail to register dai\n");
                 goto err4;
@@ -444,12 +444,10 @@ static int spdif_probe(struct platform_device *pdev)
         ret = samsung_asoc_dma_platform_register(&pdev->dev);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register DMA: %d\n", ret);
-                goto err5;
+                goto err4;
         }
 
         return 0;
-err5:
-        snd_soc_unregister_component(&pdev->dev);
 err4:
         iounmap(spdif->regs);
 err3:
@@ -467,9 +465,6 @@ static int spdif_remove(struct platform_device *pdev)
         struct samsung_spdif_info *spdif = &spdif_info;
         struct resource *mem_res;
 
-        samsung_asoc_dma_platform_unregister(&pdev->dev);
-        snd_soc_unregister_component(&pdev->dev);
-
         iounmap(spdif->regs);
 
         mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 57df90d6b7c1..9902efcb8ea1 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -327,23 +327,12 @@ static int speyside_probe(struct platform_device *pdev)
 
         card->dev = &pdev->dev;
 
-        ret = snd_soc_register_card(card);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                         ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int speyside_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_card(card);
-
-        return 0;
+        return ret;
 }
 
 static struct platform_driver speyside_driver = {
@@ -353,7 +342,6 @@ static struct platform_driver speyside_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = speyside_probe,
-        .remove = speyside_remove,
 };
 
 module_platform_driver(speyside_driver);
diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c
index 1807b75ccc12..6a2b9f14d624 100644
--- a/sound/soc/samsung/tobermory.c
+++ b/sound/soc/samsung/tobermory.c
@@ -223,23 +223,12 @@ static int tobermory_probe(struct platform_device *pdev)
 
         card->dev = &pdev->dev;
 
-        ret = snd_soc_register_card(card);
-        if (ret) {
+        ret = devm_snd_soc_register_card(&pdev->dev, card);
+        if (ret)
                 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                         ret);
-                return ret;
-        }
-
-        return 0;
-}
-
-static int tobermory_remove(struct platform_device *pdev)
-{
-        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-        snd_soc_unregister_card(card);
-
-        return 0;
+        return ret;
 }
 
 static struct platform_driver tobermory_driver = {
@@ -249,7 +238,6 @@ static struct platform_driver tobermory_driver = {
                 .pm = &snd_soc_pm_ops,
         },
         .probe = tobermory_probe,
-        .remove = tobermory_remove,
 };
 
 module_platform_driver(tobermory_driver);