aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-davinci/board-da850-evm.c9
-rw-r--r--arch/arm/mach-davinci/da850.c7
-rw-r--r--arch/arm/mach-davinci/include/mach/da8xx.h1
3 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index b01fb2ab944a..c4c0b7562d96 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -664,6 +664,13 @@ static struct snd_platform_data da850_evm_snd_data = {
664 .rxnumevt = 1, 664 .rxnumevt = 1,
665}; 665};
666 666
667static const short da850_evm_mcasp_pins[] __initconst = {
668 DA850_AHCLKX, DA850_ACLKX, DA850_AFSX,
669 DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE,
670 DA850_AXR_11, DA850_AXR_12,
671 -1
672};
673
667static int da850_evm_mmc_get_ro(int index) 674static int da850_evm_mmc_get_ro(int index)
668{ 675{
669 return gpio_get_value(DA850_MMCSD_WP_PIN); 676 return gpio_get_value(DA850_MMCSD_WP_PIN);
@@ -1106,7 +1113,7 @@ static __init void da850_evm_init(void)
1106 __raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30); 1113 __raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30);
1107 __raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30); 1114 __raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30);
1108 1115
1109 ret = davinci_cfg_reg_list(da850_mcasp_pins); 1116 ret = davinci_cfg_reg_list(da850_evm_mcasp_pins);
1110 if (ret) 1117 if (ret)
1111 pr_warning("da850_evm_init: mcasp mux setup failed: %d\n", 1118 pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",
1112 ret); 1119 ret);
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 1cf3d7fc4700..9cb769c2890b 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -597,13 +597,6 @@ const short da850_i2c1_pins[] __initdata = {
597 -1 597 -1
598}; 598};
599 599
600const short da850_mcasp_pins[] __initdata = {
601 DA850_AHCLKX, DA850_ACLKX, DA850_AFSX,
602 DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE,
603 DA850_AXR_11, DA850_AXR_12,
604 -1
605};
606
607const short da850_lcdcntl_pins[] __initdata = { 600const short da850_lcdcntl_pins[] __initdata = {
608 DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3, 601 DA850_LCD_D_0, DA850_LCD_D_1, DA850_LCD_D_2, DA850_LCD_D_3,
609 DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7, 602 DA850_LCD_D_4, DA850_LCD_D_5, DA850_LCD_D_6, DA850_LCD_D_7,
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 4297f1ecffac..89668b402e23 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -128,7 +128,6 @@ extern const short da850_uart1_pins[];
128extern const short da850_uart2_pins[]; 128extern const short da850_uart2_pins[];
129extern const short da850_i2c0_pins[]; 129extern const short da850_i2c0_pins[];
130extern const short da850_i2c1_pins[]; 130extern const short da850_i2c1_pins[];
131extern const short da850_mcasp_pins[];
132extern const short da850_lcdcntl_pins[]; 131extern const short da850_lcdcntl_pins[];
133extern const short da850_mmcsd0_pins[]; 132extern const short da850_mmcsd0_pins[];
134 133