aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@mvista.com>2009-08-28 18:05:21 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2009-11-25 13:21:18 -0500
commit32bf078caff4dbdba59f8aab022f11a4e1622880 (patch)
treedbf5b68647b617ea8e03f198c05ff3333e2f3024 /arch/arm
parentb8864aa4abf3cda4676c4174453cf813de6b1701 (diff)
davinci: Add DA830/OMAP-L137 EVM specific pinmux setting for McASP1
The DA830/OMAP-L137 EVM cannot use the default pinmux setup for McASP1 so put the correct settings in the board file for that platform. Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-davinci/board-da830-evm.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 22d9fe4d8eb3..39711c123dd6 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -22,6 +22,7 @@
22#include <mach/common.h> 22#include <mach/common.h>
23#include <mach/irqs.h> 23#include <mach/irqs.h>
24#include <mach/cp_intc.h> 24#include <mach/cp_intc.h>
25#include <mach/mux.h>
25#include <mach/da8xx.h> 26#include <mach/da8xx.h>
26#include <mach/asp.h> 27#include <mach/asp.h>
27 28
@@ -55,6 +56,14 @@ static struct davinci_uart_config da830_evm_uart_config __initdata = {
55 .enabled_uarts = 0x7, 56 .enabled_uarts = 0x7,
56}; 57};
57 58
59static const short da830_evm_mcasp1_pins[] = {
60 DA830_AHCLKX1, DA830_ACLKX1, DA830_AFSX1, DA830_AHCLKR1, DA830_AFSR1,
61 DA830_AMUTE1, DA830_AXR1_0, DA830_AXR1_1, DA830_AXR1_2, DA830_AXR1_5,
62 DA830_ACLKR1, DA830_AXR1_6, DA830_AXR1_7, DA830_AXR1_8, DA830_AXR1_10,
63 DA830_AXR1_11,
64 -1
65};
66
58static u8 da830_iis_serializer_direction[] = { 67static u8 da830_iis_serializer_direction[] = {
59 RX_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, 68 RX_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
60 INACTIVE_MODE, TX_MODE, INACTIVE_MODE, INACTIVE_MODE, 69 INACTIVE_MODE, TX_MODE, INACTIVE_MODE, INACTIVE_MODE,
@@ -117,7 +126,7 @@ static __init void da830_evm_init(void)
117 i2c_register_board_info(1, da830_evm_i2c_devices, 126 i2c_register_board_info(1, da830_evm_i2c_devices,
118 ARRAY_SIZE(da830_evm_i2c_devices)); 127 ARRAY_SIZE(da830_evm_i2c_devices));
119 128
120 ret = da8xx_pinmux_setup(da830_mcasp1_pins); 129 ret = da8xx_pinmux_setup(da830_evm_mcasp1_pins);
121 if (ret) 130 if (ret)
122 pr_warning("da830_evm_init: mcasp1 mux setup failed: %d\n", 131 pr_warning("da830_evm_init: mcasp1 mux setup failed: %d\n",
123 ret); 132 ret);