aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/devices-da8xx.c
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@mvista.com>2009-08-28 18:02:54 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2009-11-25 13:21:18 -0500
commit31f53cf391520e62804ed013daf50dfa170d114a (patch)
tree300163c05e7594aaf14748dfb588d6ad1a808c53 /arch/arm/mach-davinci/devices-da8xx.c
parente9ab3214a8fc546d62e22064caa559b912620106 (diff)
davinci: Move DA8xx/OMAP-L13x emac register routine
Some mcasp code was inserted between the emac resource setup and the related register routine that registers the emac. Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/devices-da8xx.c')
-rw-r--r--arch/arm/mach-davinci/devices-da8xx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 58ad5b66fd60..94ce7a15c728 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -282,6 +282,11 @@ static struct platform_device da8xx_emac_device = {
282 .resource = da8xx_emac_resources, 282 .resource = da8xx_emac_resources,
283}; 283};
284 284
285int __init da8xx_register_emac(void)
286{
287 return platform_device_register(&da8xx_emac_device);
288}
289
285static struct resource da830_mcasp1_resources[] = { 290static struct resource da830_mcasp1_resources[] = {
286 { 291 {
287 .name = "mcasp1", 292 .name = "mcasp1",
@@ -338,11 +343,6 @@ static struct platform_device da850_mcasp_device = {
338 .resource = da850_mcasp_resources, 343 .resource = da850_mcasp_resources,
339}; 344};
340 345
341int __init da8xx_register_emac(void)
342{
343 return platform_device_register(&da8xx_emac_device);
344}
345
346void __init da8xx_init_mcasp(int id, struct snd_platform_data *pdata) 346void __init da8xx_init_mcasp(int id, struct snd_platform_data *pdata)
347{ 347{
348 /* DA830/OMAP-L137 has 3 instances of McASP */ 348 /* DA830/OMAP-L137 has 3 instances of McASP */