aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/bells.c
diff options
context:
space:
mode:
authorPadmavathi Venna <padma.v@samsung.com>2012-12-07 03:29:21 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-07 05:36:07 -0500
commita08485d8fdf6f67ca5f173b68d8f873c574745f2 (patch)
treefac9dbea634fef912a5e74434110ad769b8c963f /sound/soc/samsung/bells.c
parent1974a042dd15f1f007a3a1a2dd7a23ca0e42c01d (diff)
ASoC: Samsung: Do not register samsung audio dma device as pdev
Previously, the ASoC 'platform' (PCM/DMA) object was instantiated via a platform_device. This didn't represent the hardware well, since there was no separate hardware associated with this platform_device; it was a virtual device with sole purpose to call snd_soc_register_platform(). This change removes the platform_device completely. Each Samsung DAI now registers the ASoC 'platform' itself. Machine drivers are adjusted for the new 'platform' name. Signed-off-by: Padmavathi Venna <padma.v@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/samsung/bells.c')
-rw-r--r--sound/soc/samsung/bells.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
index 59ffd6c7ee30..01c1c5a2d321 100644
--- a/sound/soc/samsung/bells.c
+++ b/sound/soc/samsung/bells.c
@@ -233,7 +233,7 @@ static struct snd_soc_dai_link bells_dai_wm2200[] = {
233 .stream_name = "CPU-DSP", 233 .stream_name = "CPU-DSP",
234 .cpu_dai_name = "samsung-i2s.0", 234 .cpu_dai_name = "samsung-i2s.0",
235 .codec_dai_name = "wm0010-sdi1", 235 .codec_dai_name = "wm0010-sdi1",
236 .platform_name = "samsung-audio", 236 .platform_name = "samsung-i2s.0",
237 .codec_name = "spi0.0", 237 .codec_name = "spi0.0",
238 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF 238 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
239 | SND_SOC_DAIFMT_CBM_CFM, 239 | SND_SOC_DAIFMT_CBM_CFM,
@@ -257,7 +257,7 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
257 .stream_name = "CPU-DSP", 257 .stream_name = "CPU-DSP",
258 .cpu_dai_name = "samsung-i2s.0", 258 .cpu_dai_name = "samsung-i2s.0",
259 .codec_dai_name = "wm0010-sdi1", 259 .codec_dai_name = "wm0010-sdi1",
260 .platform_name = "samsung-audio", 260 .platform_name = "samsung-i2s.0",
261 .codec_name = "spi0.0", 261 .codec_name = "spi0.0",
262 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF 262 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
263 | SND_SOC_DAIFMT_CBM_CFM, 263 | SND_SOC_DAIFMT_CBM_CFM,
@@ -303,7 +303,7 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
303 .stream_name = "CPU-DSP", 303 .stream_name = "CPU-DSP",
304 .cpu_dai_name = "samsung-i2s.0", 304 .cpu_dai_name = "samsung-i2s.0",
305 .codec_dai_name = "wm0010-sdi1", 305 .codec_dai_name = "wm0010-sdi1",
306 .platform_name = "samsung-audio", 306 .platform_name = "samsung-i2s.0",
307 .codec_name = "spi0.0", 307 .codec_name = "spi0.0",
308 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF 308 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
309 | SND_SOC_DAIFMT_CBM_CFM, 309 | SND_SOC_DAIFMT_CBM_CFM,