diff options
author | Michael Williamson <michael.williamson@criticallink.com> | 2011-01-18 12:21:44 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2011-02-28 17:53:29 -0500 |
commit | c840fc745f6ec8a3b7062d72de193ab9c397d725 (patch) | |
tree | db88ed608748adb10a181d0cd237c12feef585d1 /arch/arm/mach-davinci/board-da850-evm.c | |
parent | 0b642b6a86771f4f82abe6608fc61e050ea03f33 (diff) |
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: Michael Williamson <michael.williamson@criticallink.com>
Tested-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/board-da850-evm.c')
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 9 |
1 files changed, 8 insertions, 1 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 | ||
667 | static 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 | |||
667 | static int da850_evm_mmc_get_ro(int index) | 674 | static 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); |