diff options
author | Ido Yariv <ido@wizery.com> | 2011-07-10 09:14:37 -0400 |
---|---|---|
committer | Sekhar Nori <nsekhar@ti.com> | 2011-09-17 06:23:22 -0400 |
commit | 5c4d11b477f66080c9305c91e5d387c796be411c (patch) | |
tree | ab2d7978c1bbbfb9fdd9f12a1be72520c93383aa /arch/arm/mach-davinci | |
parent | b6fd41e29dea9c6753b1843a77e50433e6123bcb (diff) |
ARM: davinci: DA850: Add MMC/SD1 pinmux configuration
AM18x has two MMC slots. Add the required pinmux configuration for the
second slot.
Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/da850.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/mux.h | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 935dbed5c541..87cdce64fba7 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c | |||
@@ -535,6 +535,13 @@ static const struct mux_config da850_pins[] = { | |||
535 | MUX_CFG(DA850, MMCSD0_DAT_3, 10, 20, 15, 2, false) | 535 | MUX_CFG(DA850, MMCSD0_DAT_3, 10, 20, 15, 2, false) |
536 | MUX_CFG(DA850, MMCSD0_CLK, 10, 0, 15, 2, false) | 536 | MUX_CFG(DA850, MMCSD0_CLK, 10, 0, 15, 2, false) |
537 | MUX_CFG(DA850, MMCSD0_CMD, 10, 4, 15, 2, false) | 537 | MUX_CFG(DA850, MMCSD0_CMD, 10, 4, 15, 2, false) |
538 | /* MMC/SD1 function */ | ||
539 | MUX_CFG(DA850, MMCSD1_DAT_0, 18, 8, 15, 2, false) | ||
540 | MUX_CFG(DA850, MMCSD1_DAT_1, 19, 16, 15, 2, false) | ||
541 | MUX_CFG(DA850, MMCSD1_DAT_2, 19, 12, 15, 2, false) | ||
542 | MUX_CFG(DA850, MMCSD1_DAT_3, 19, 8, 15, 2, false) | ||
543 | MUX_CFG(DA850, MMCSD1_CLK, 18, 12, 15, 2, false) | ||
544 | MUX_CFG(DA850, MMCSD1_CMD, 18, 16, 15, 2, false) | ||
538 | /* EMIF2.5/EMIFA function */ | 545 | /* EMIF2.5/EMIFA function */ |
539 | MUX_CFG(DA850, EMA_D_7, 9, 0, 15, 1, false) | 546 | MUX_CFG(DA850, EMA_D_7, 9, 0, 15, 1, false) |
540 | MUX_CFG(DA850, EMA_D_6, 9, 4, 15, 1, false) | 547 | MUX_CFG(DA850, EMA_D_6, 9, 4, 15, 1, false) |
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h index 5d4e0fed828a..7fb7f1eb0d6b 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h | |||
@@ -857,6 +857,14 @@ enum davinci_da850_index { | |||
857 | DA850_MMCSD0_CLK, | 857 | DA850_MMCSD0_CLK, |
858 | DA850_MMCSD0_CMD, | 858 | DA850_MMCSD0_CMD, |
859 | 859 | ||
860 | /* MMC/SD1 function */ | ||
861 | DA850_MMCSD1_DAT_0, | ||
862 | DA850_MMCSD1_DAT_1, | ||
863 | DA850_MMCSD1_DAT_2, | ||
864 | DA850_MMCSD1_DAT_3, | ||
865 | DA850_MMCSD1_CLK, | ||
866 | DA850_MMCSD1_CMD, | ||
867 | |||
860 | /* EMIF2.5/EMIFA function */ | 868 | /* EMIF2.5/EMIFA function */ |
861 | DA850_EMA_D_7, | 869 | DA850_EMA_D_7, |
862 | DA850_EMA_D_6, | 870 | DA850_EMA_D_6, |