Commit c840fc74 authored by Michael Williamson's avatar Michael Williamson Committed by Kevin Hilman
Browse files

davinci: da850: move da850_evm specific mcasp pins to board file. 



The da850_mcasp_pins pinmux array is specific to the da850_evm, and is
not generic.  Move the array to the board file, make it static initdata,
and rename it accordingly.

Signed-off-by: default avatarMichael Williamson <michael.williamson@criticallink.com>
Tested-by: default avatarSudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 0b642b6a

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

+8 −1
Original line number Diff line number Diff line
@@ -664,6 +664,13 @@ static struct snd_platform_data da850_evm_snd_data = { 
	.rxnumevt	= 1,

};



static const short da850_evm_mcasp_pins[] __initconst = {

	DA850_AHCLKX, DA850_ACLKX, DA850_AFSX,

	DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE,

	DA850_AXR_11, DA850_AXR_12,

	-1

};



static int da850_evm_mmc_get_ro(int index)

{

	return gpio_get_value(DA850_MMCSD_WP_PIN);
@@ -1106,7 +1113,7 @@ static __init void da850_evm_init(void) 
	__raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30);

	__raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30);



	ret = davinci_cfg_reg_list(da850_mcasp_pins);

	ret = davinci_cfg_reg_list(da850_evm_mcasp_pins);

	if (ret)

		pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",

				ret);

arch/arm/mach-davinci/da850.c

+0 −7
Original line number Diff line number Diff line
@@ -597,13 +597,6 @@ const short da850_i2c1_pins[] __initdata = { 
	-1

};



const short da850_mcasp_pins[] __initdata = {

	DA850_AHCLKX, DA850_ACLKX, DA850_AFSX,

	DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE,

	DA850_AXR_11, DA850_AXR_12,

	-1

};



const short da850_lcdcntl_pins[] __initdata = {

	DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3,

	DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7,

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

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ extern const short da850_uart1_pins[]; 
extern const short da850_uart2_pins[];

extern const short da850_i2c0_pins[];

extern const short da850_i2c1_pins[];

extern const short da850_mcasp_pins[];

extern const short da850_lcdcntl_pins[];

extern const short da850_mmcsd0_pins[];

CRA Git | Maintained and supported by SUSTech CRA and CCSE