diff options
| author | Richard Zhu <r65037@freescale.com> | 2010-08-03 15:52:09 +0800 |
|---|---|---|
| committer | Richard Zhu <r65037@freescale.com> | 2010-08-03 16:00:47 +0800 |
| commit | 25d08562a09fbc5d7b29f3048af03b639dd6e73f (patch) | |
| tree | 8e43df30f3015c336d831a4b995385926af81fdd /arch | |
| parent | 8d31d08f56a4cf5d6367ca3233aec9123ddd4608 (diff) | |
ENGR00125856-1 MX53 eSDHC iomux updates when iomux V3 is used
The eSDHC iomux is not updated properly when iomux v3 is upgraded.
Signed-off-by: Richard Zhu <r65037@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx5/mx53_evk.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx53.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-mx5/mx53_evk.c b/arch/arm/mach-mx5/mx53_evk.c index d070de374d56..8f5b9a118803 100644 --- a/arch/arm/mach-mx5/mx53_evk.c +++ b/arch/arm/mach-mx5/mx53_evk.c @@ -1474,7 +1474,7 @@ static void __init mx53_evk_io_init(void) gpio_direction_input(EVK_SD3_CD); /* SD3 WP */ - gpio_request(EVK_SD3_CD, "sdhc3-wp"); + gpio_request(EVK_SD3_WP, "sdhc3-wp"); gpio_direction_input(EVK_SD3_WP); /* reset FEC PHY */ diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h index 864ac0288b67..4957a8d95ed5 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h @@ -44,9 +44,9 @@ typedef enum iomux_config { #define MX53_UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_DSE_HIGH | \ PAD_CTL_SRE_FAST | PAD_CTL_HYS) -#define MX53_SDHC_PAD_CTRL (PAD_CTL_DSE_MAX | PAD_CTL_PUS_22K_UP | \ - PAD_CTL_SRE_FAST | PAD_CTL_DVS | \ - PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_HYS) +#define MX53_SDHC_PAD_CTRL (PAD_CTL_DVS | PAD_CTL_PKE | PAD_CTL_PUE | \ + PAD_CTL_PUS_47K_UP | PAD_CTL_DSE_HIGH | \ + PAD_CTL_SRE_FAST) #define MX53_FEC_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_22K_UP | PAD_CTL_ODE | PAD_CTL_DSE_HIGH) #define PAD_CTRL_1 (PAD_CTL_HYS | PAD_CTL_DSE_HIGH) @@ -478,7 +478,7 @@ typedef enum iomux_config { MX53_SDHC_PAD_CTRL) #define MX53_PAD_SD1_CLK__SD1_CLK IOMUX_PAD(0x67C, 0x2F4, \ IOMUX_CONFIG_SION, 0x0, 0, \ - MX53_SDHC_PAD_CTRL) + MX53_SDHC_PAD_CTRL | PAD_CTL_HYS) #define MX53_PAD_SD1_DATA3__SD1_DATA3 IOMUX_PAD(0x680, 0x2F8, 0, 0x0, 0, \ MX53_SDHC_PAD_CTRL) @@ -514,7 +514,7 @@ typedef enum iomux_config { #define MX53_PAD_ATA_RESET_B__SD3_CMD IOMUX_PAD(0x608, 0x288, 2, 0x0, 0, \ MX53_SDHC_PAD_CTRL) #define MX53_PAD_ATA_IORDY__SD3_CLK IOMUX_PAD(0x60C, 0x28C, 2, \ - 0x0, 0, MX53_SDHC_PAD_CTRL) + 0x0, 0, MX53_SDHC_PAD_CTRL | PAD_CTL_HYS) /* USB */ #define MX53_PAD_EIM_A24__GPIO_5_4 IOMUX_PAD(0x4A8, 0x15C, 1, 0x0, 0, NO_PAD_CTRL) |