aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/dm355.c
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@mvista.com>2009-04-15 15:39:48 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2009-05-26 11:17:16 -0400
commit0e585952ac6a06b3c77d6b8eadb9c359766a700d (patch)
treed8216964e80d9cd3d86b5aa9cb25f035efa26bef /arch/arm/mach-davinci/dm355.c
parentd81d188cafecbc9e01df51527ac4c84a5b19e033 (diff)
davinci: Move pinmux setup info to SoC infrastructure
The pinmux register base and setup can be different for different SoCs so move the pinmux reg base, pinmux table (and its size) to the SoC infrastructure. Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/dm355.c')
-rw-r--r--arch/arm/mach-davinci/dm355.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 37f20a7214be..f735ed9d2d10 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -436,6 +436,7 @@ void __init dm355_init_spi0(unsigned chipselect_mask,
436 * reg offset mask mode 436 * reg offset mask mode
437 */ 437 */
438static const struct mux_config dm355_pins[] = { 438static const struct mux_config dm355_pins[] = {
439#ifdef CONFIG_DAVINCI_MUX
439MUX_CFG(DM355, MMCSD0, 4, 2, 1, 0, false) 440MUX_CFG(DM355, MMCSD0, 4, 2, 1, 0, false)
440 441
441MUX_CFG(DM355, SD1_CLK, 3, 6, 1, 1, false) 442MUX_CFG(DM355, SD1_CLK, 3, 6, 1, 1, false)
@@ -466,6 +467,7 @@ INT_CFG(DM355, INT_EDMA_TC1_ERR, 4, 1, 1, false)
466EVT_CFG(DM355, EVT8_ASP1_TX, 0, 1, 0, false) 467EVT_CFG(DM355, EVT8_ASP1_TX, 0, 1, 0, false)
467EVT_CFG(DM355, EVT9_ASP1_RX, 1, 1, 0, false) 468EVT_CFG(DM355, EVT9_ASP1_RX, 1, 1, 0, false)
468EVT_CFG(DM355, EVT26_MMC0_RX, 2, 1, 0, false) 469EVT_CFG(DM355, EVT26_MMC0_RX, 2, 1, 0, false)
470#endif
469}; 471};
470 472
471/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
@@ -558,12 +560,14 @@ static struct davinci_soc_info davinci_soc_info_dm355 = {
558 .cpu_clks = dm355_clks, 560 .cpu_clks = dm355_clks,
559 .psc_bases = dm355_psc_bases, 561 .psc_bases = dm355_psc_bases,
560 .psc_bases_num = ARRAY_SIZE(dm355_psc_bases), 562 .psc_bases_num = ARRAY_SIZE(dm355_psc_bases),
563 .pinmux_base = IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE),
564 .pinmux_pins = dm355_pins,
565 .pinmux_pins_num = ARRAY_SIZE(dm355_pins),
561}; 566};
562 567
563void __init dm355_init(void) 568void __init dm355_init(void)
564{ 569{
565 davinci_common_init(&davinci_soc_info_dm355); 570 davinci_common_init(&davinci_soc_info_dm355);
566 davinci_mux_register(dm355_pins, ARRAY_SIZE(dm355_pins));;
567} 571}
568 572
569static int __init dm355_init_devices(void) 573static int __init dm355_init_devices(void)