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

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

davinci: Change DA8xx/OMAP-L13x McASP registration routine name 



For consistency with existing code, change the name of
da8xx_init_mcasp() to da8xx_register_mcasp().

Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 31f53cf3

arch/arm/mach-davinci/board-da830-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static __init void da830_evm_init(void) 
		pr_warning("da830_evm_init: mcasp1 mux setup failed: %d\n",

				ret);



	da8xx_init_mcasp(1, &da830_evm_snd_data);

	da8xx_register_mcasp(1, &da830_evm_snd_data);

}



#ifdef CONFIG_SERIAL_8250_CONSOLE

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static __init void da850_evm_init(void) 
		pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",

				ret);



	da8xx_init_mcasp(0, &da850_evm_snd_data);

	da8xx_register_mcasp(0, &da850_evm_snd_data);



	ret = da8xx_pinmux_setup(da850_lcdcntl_pins);

	if (ret)

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

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static struct platform_device da850_mcasp_device = { 
	.resource	= da850_mcasp_resources,

};



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

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

{

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

	if (cpu_is_davinci_da830() && id == 1) {

arch/arm/mach-davinci/include/mach/da8xx.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int da8xx_register_watchdog(void); 
int da8xx_register_emac(void);

int da8xx_register_lcdc(void);

int da8xx_register_mmcsd0(struct davinci_mmc_config *config);

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

void __init da8xx_register_mcasp(int id, struct snd_platform_data *pdata);



extern struct platform_device da8xx_serial_device;

extern struct emac_platform_data da8xx_emac_pdata;