evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Michael Williamson <michael.williamson@criticallink.com>
Tested-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Michael Williamson 2011-01-18 12:21:45 -05:00 • committed by Kevin Hilman
parent c840fc745f
commit 5a0d80ea80
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/mach-davinci/board-da850-evm.c
View file

@ -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);

7
arch/arm/mach-davinci/da850.c
View file

@ -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,

1
arch/arm/mach-davinci/include/mach/da8xx.h
View file

@ -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 */