diff options
author | Padmavathi Venna <padma.v@samsung.com> | 2012-12-07 03:29:21 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-07 05:36:07 -0500 |
commit | a08485d8fdf6f67ca5f173b68d8f873c574745f2 (patch) | |
tree | fac9dbea634fef912a5e74434110ad769b8c963f /arch/arm/mach-s3c64xx | |
parent | 1974a042dd15f1f007a3a1a2dd7a23ca0e42c01d (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 'arch/arm/mach-s3c64xx')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 13b7eaa45fd0..ef2117d7391b 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -357,7 +357,6 @@ static struct platform_device *crag6410_devices[] __initdata = { | |||
357 | &s3c_device_timer[0], | 357 | &s3c_device_timer[0], |
358 | &s3c64xx_device_iis0, | 358 | &s3c64xx_device_iis0, |
359 | &s3c64xx_device_iis1, | 359 | &s3c64xx_device_iis1, |
360 | &samsung_asoc_dma, | ||
361 | &samsung_device_keypad, | 360 | &samsung_device_keypad, |
362 | &crag6410_gpio_keydev, | 361 | &crag6410_gpio_keydev, |
363 | &crag6410_dm9k_device, | 362 | &crag6410_dm9k_device, |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index da1a771a29e9..574a9eef588d 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -275,7 +275,6 @@ static struct platform_device *smdk6410_devices[] __initdata = { | |||
275 | &s3c_device_fb, | 275 | &s3c_device_fb, |
276 | &s3c_device_ohci, | 276 | &s3c_device_ohci, |
277 | &s3c_device_usb_hsotg, | 277 | &s3c_device_usb_hsotg, |
278 | &samsung_asoc_dma, | ||
279 | &s3c64xx_device_iisv4, | 278 | &s3c64xx_device_iisv4, |
280 | &samsung_device_keypad, | 279 | &samsung_device_keypad, |
281 | 280 | ||