Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31f53cf3 authored by Mark A. Greer's avatar Mark A. Greer Committed by Kevin Hilman
Browse files

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: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent e9ab3214

arch/arm/mach-davinci/devices-da8xx.c

+5 −5
Original line number Diff line number Diff line
@@ -282,6 +282,11 @@ static struct platform_device da8xx_emac_device = { 
	.resource	= da8xx_emac_resources,

};



int __init da8xx_register_emac(void)

{

	return platform_device_register(&da8xx_emac_device);

}



static struct resource da830_mcasp1_resources[] = {

	{

		.name	= "mcasp1",
@@ -338,11 +343,6 @@ static struct platform_device da850_mcasp_device = { 
	.resource	= da850_mcasp_resources,

};



int __init da8xx_register_emac(void)

{

	return platform_device_register(&da8xx_emac_device);

}



void __init da8xx_init_mcasp(int id, struct snd_platform_data *pdata)

{

	/* DA830/OMAP-L137 has 3 instances of McASP */