diff options
author | Hebbar, Gururaja <gururaja.hebbar@ti.com> | 2012-08-27 09:26:40 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-27 14:12:08 -0400 |
commit | bdd732786dc776ba3e4ccb6f5d6461a92a978582 (patch) | |
tree | 107c8c6abc0027dd7f8d2d15a7ed6004ba41c054 /arch/arm/mach-davinci | |
parent | f08095a408bf6489b4a710d794ae6d5475a007ef (diff) |
ARM: Davinci: Remove references to davinci pcm
Since davinci-pcm is no more a platform_driver but helper to register
"platform" pcm driver, remove davinci-pcm device registration
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/devices-da8xx.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-davinci/devices.c | 11 |
2 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 783eab6845c4..4735d64fd6f2 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c | |||
@@ -505,15 +505,8 @@ static struct platform_device da850_mcasp_device = { | |||
505 | .resource = da850_mcasp_resources, | 505 | .resource = da850_mcasp_resources, |
506 | }; | 506 | }; |
507 | 507 | ||
508 | static struct platform_device davinci_pcm_device = { | ||
509 | .name = "davinci-pcm-audio", | ||
510 | .id = -1, | ||
511 | }; | ||
512 | |||
513 | void __init da8xx_register_mcasp(int id, struct snd_platform_data *pdata) | 508 | void __init da8xx_register_mcasp(int id, struct snd_platform_data *pdata) |
514 | { | 509 | { |
515 | platform_device_register(&davinci_pcm_device); | ||
516 | |||
517 | /* DA830/OMAP-L137 has 3 instances of McASP */ | 510 | /* DA830/OMAP-L137 has 3 instances of McASP */ |
518 | if (cpu_is_davinci_da830() && id == 1) { | 511 | if (cpu_is_davinci_da830() && id == 1) { |
519 | da830_mcasp1_device.dev.platform_data = pdata; | 512 | da830_mcasp1_device.dev.platform_data = pdata; |
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index d2f9666284a7..70056fb8cc06 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c | |||
@@ -313,16 +313,6 @@ static void davinci_init_wdt(void) | |||
313 | 313 | ||
314 | /*-------------------------------------------------------------------------*/ | 314 | /*-------------------------------------------------------------------------*/ |
315 | 315 | ||
316 | static struct platform_device davinci_pcm_device = { | ||
317 | .name = "davinci-pcm-audio", | ||
318 | .id = -1, | ||
319 | }; | ||
320 | |||
321 | static void davinci_init_pcm(void) | ||
322 | { | ||
323 | platform_device_register(&davinci_pcm_device); | ||
324 | } | ||
325 | |||
326 | /*-------------------------------------------------------------------------*/ | 316 | /*-------------------------------------------------------------------------*/ |
327 | 317 | ||
328 | struct davinci_timer_instance davinci_timer_instance[2] = { | 318 | struct davinci_timer_instance davinci_timer_instance[2] = { |
@@ -345,7 +335,6 @@ static int __init davinci_init_devices(void) | |||
345 | /* please keep these calls, and their implementations above, | 335 | /* please keep these calls, and their implementations above, |
346 | * in alphabetical order so they're easier to sort through. | 336 | * in alphabetical order so they're easier to sort through. |
347 | */ | 337 | */ |
348 | davinci_init_pcm(); | ||
349 | davinci_init_wdt(); | 338 | davinci_init_wdt(); |
350 | 339 | ||
351 | return 0; | 340 | return 0; |