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

davinci: da850: move da850_evm specific mmcsd pinmux array to board file. 



The da850_mmcsd0_pins pinmux array contains pins that are specific to the
da850 evm board (the write protect and card detect GPIO pins).  Move
the array to the board file.

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 c840fc74

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -690,6 +690,13 @@ static struct davinci_mmc_config da850_mmc_config = { 
	.version	= MMC_CTLR_VERSION_2,

	.version	= MMC_CTLR_VERSION_2,

};

};





static const short da850_evm_mmcsd0_pins[] __initconst = {

	DA850_MMCSD0_DAT_0, DA850_MMCSD0_DAT_1, DA850_MMCSD0_DAT_2,

	DA850_MMCSD0_DAT_3, DA850_MMCSD0_CLK, DA850_MMCSD0_CMD,

	DA850_GPIO4_0, DA850_GPIO4_1,

	-1

};



static void da850_panel_power_ctrl(int val)

static void da850_panel_power_ctrl(int val)

{

{

	/* lcd backlight */

	/* lcd backlight */
@@ -1077,7 +1084,7 @@ static __init void da850_evm_init(void) 
				ret);

				ret);





	if (HAS_MMC) {

	if (HAS_MMC) {

		ret = davinci_cfg_reg_list(da850_mmcsd0_pins);

		ret = davinci_cfg_reg_list(da850_evm_mmcsd0_pins);

		if (ret)

		if (ret)

			pr_warning("da850_evm_init: mmcsd0 mux setup failed:"

			pr_warning("da850_evm_init: mmcsd0 mux setup failed:"

					" %d\n", ret);

					" %d\n", ret);

arch/arm/mach-davinci/da850.c

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

	-1

};

};





const short da850_mmcsd0_pins[] __initdata = {

	DA850_MMCSD0_DAT_0, DA850_MMCSD0_DAT_1, DA850_MMCSD0_DAT_2,

	DA850_MMCSD0_DAT_3, DA850_MMCSD0_CLK, DA850_MMCSD0_CMD,

	DA850_GPIO4_0, DA850_GPIO4_1,

	-1

};



/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */

/* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */

static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {

static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {

	[IRQ_DA8XX_COMMTX]		= 7,

	[IRQ_DA8XX_COMMTX]		= 7,

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -129,6 +129,5 @@ extern const short da850_uart2_pins[]; 
extern const short da850_i2c0_pins[];

extern const short da850_i2c0_pins[];

extern const short da850_i2c1_pins[];

extern const short da850_i2c1_pins[];

extern const short da850_lcdcntl_pins[];

extern const short da850_lcdcntl_pins[];

extern const short da850_mmcsd0_pins[];





#endif /* __ASM_ARCH_DAVINCI_DA8XX_H */
 
#endif /* __ASM_ARCH_DAVINCI_DA8XX_H */