Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

diff --combined sound/soc/samsung/ac97.c
index 32ff594954bc44829afc27b4f7050a468288f99f,c76abdf6173faa63f26632748381376a9a28ca5c..cb88ead98917b354c459673ae879a80a37b40ad5
--- 1/sound/soc/samsung/ac97.c
--- 2/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@@ -20,7 -20,7 +20,7 @@@
  #include <sound/soc.h>
  
  #include <mach/dma.h>
- #include <plat/regs-ac97.h>
+ #include "regs-ac97.h"
  #include <linux/platform_data/asoc-s3c.h>
  
  #include "dma.h"
@@@ -370,10 -370,6 +370,10 @@@ static struct snd_soc_dai_driver s3c_ac
        },
  };
  
 +static const struct snd_soc_component_driver s3c_ac97_component = {
 +      .name           = "s3c-ac97",
 +};
 +
  static int s3c_ac97_probe(struct platform_device *pdev)
  {
        struct resource *mem_res, *dmatx_res, *dmarx_res, *dmamic_res, *irq_res;
@@@ -461,8 -457,8 +461,8 @@@
                goto err4;
        }
  
 -      ret = snd_soc_register_dais(&pdev->dev, s3c_ac97_dai,
 -                      ARRAY_SIZE(s3c_ac97_dai));
 +      ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
 +                                       s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));
        if (ret)
                goto err5;
  
@@@ -474,7 -470,7 +474,7 @@@
  
        return 0;
  err6:
 -      snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai));
 +      snd_soc_unregister_component(&pdev->dev);
  err5:
        free_irq(irq_res->start, NULL);
  err4:
@@@ -494,7 -490,7 +494,7 @@@ static int s3c_ac97_remove(struct platf
        struct resource *mem_res, *irq_res;
  
        asoc_dma_platform_unregister(&pdev->dev);
 -      snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(s3c_ac97_dai));
 +      snd_soc_unregister_component(&pdev->dev);
  
        irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (irq_res)

diff --combined sound/soc/samsung/i2s.c
index abbcbe4b429c48c96c8d859b3f7035a92d05a474,a487635412eb447ac694c6cc8ae9c20e00d65cd7..82ebb1a51479a7afdd4276b135e7c306092bbb3a
--- 1/sound/soc/samsung/i2s.c
--- 2/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@@ -963,10 -963,6 +963,10 @@@ static const struct snd_soc_dai_ops sam
        .delay = i2s_delay,
  };
  
 +static const struct snd_soc_component_driver samsung_i2s_component = {
 +      .name           = "samsung-i2s",
 +};
 +
  #define SAMSUNG_I2S_RATES     SNDRV_PCM_RATE_8000_96000
  
  #define SAMSUNG_I2S_FMTS      (SNDRV_PCM_FMTBIT_S8 | \
@@@ -1118,9 -1114,8 +1118,9 @@@ static int samsung_i2s_probe(struct pla
                        dev_err(&pdev->dev, "Unable to get drvdata\n");
                        return -EFAULT;
                }
 -              snd_soc_register_dai(&sec_dai->pdev->dev,
 -                      &sec_dai->i2s_dai_drv);
 +              snd_soc_register_component(&sec_dai->pdev->dev,
 +                                         &samsung_i2s_component,
 +                                         &sec_dai->i2s_dai_drv, 1);
                asoc_dma_platform_register(&pdev->dev);
                return 0;
        }
@@@ -1249,8 -1244,7 +1249,8 @@@
                }
        }
  
 -      snd_soc_register_dai(&pri_dai->pdev->dev, &pri_dai->i2s_dai_drv);
 +      snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component,
 +                                 &pri_dai->i2s_dai_drv, 1);
  
        pm_runtime_enable(&pdev->dev);
  
@@@ -1289,7 -1283,7 +1289,7 @@@ static int samsung_i2s_remove(struct pl
        i2s->sec_dai = NULL;
  
        asoc_dma_platform_unregister(&pdev->dev);
 -      snd_soc_unregister_dai(&pdev->dev);
 +      snd_soc_unregister_component(&pdev->dev);
  
        return 0;
  }
@@@ -1304,7 -1298,7 +1304,7 @@@ static struct platform_device_id samsun
        },
        {},
  };
- MODULE_DEVICE_TABLE(platform, samsung-i2s-driver-ids);
+ MODULE_DEVICE_TABLE(platform, samsung_i2s_driver_ids);
  
  #ifdef CONFIG_OF
  static struct samsung_i2s_dai_data samsung_i2s_dai_data_array[] = {

diff --combined sound/soc/samsung/s3c24xx-i2s.c
index 5403176b2aa39519283cd31bbbff7c15d7ac7023,a7b17c15236ff5bb1167be632bcb336936071aab..8b3414551a6231ffe6556989570831dd46c15dc7
--- 1/sound/soc/samsung/s3c24xx-i2s.c
--- 2/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@@ -24,7 -24,7 +24,7 @@@
  #include <sound/pcm_params.h>
  
  #include <mach/dma.h>
- #include <plat/regs-iis.h>
+ #include "regs-iis.h"
  
  #include "dma.h"
  #include "s3c24xx-i2s.h"
@@@ -465,16 -465,11 +465,16 @@@ static struct snd_soc_dai_driver s3c24x
        .ops = &s3c24xx_i2s_dai_ops,
  };
  
 +static const struct snd_soc_component_driver s3c24xx_i2s_component = {
 +      .name           = "s3c24xx-i2s",
 +};
 +
  static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
  {
        int ret = 0;
  
 -      ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai);
 +      ret = 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;
@@@ -488,14 -483,14 +488,14 @@@
  
        return 0;
  err:
 -      snd_soc_unregister_dai(&pdev->dev);
 +      snd_soc_unregister_component(&pdev->dev);
        return ret;
  }
  
  static int s3c24xx_iis_dev_remove(struct platform_device *pdev)
  {
        asoc_dma_platform_unregister(&pdev->dev);
 -      snd_soc_unregister_dai(&pdev->dev);
 +      snd_soc_unregister_component(&pdev->dev);
        return 0;
  }