diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2017-12-27 17:07:18 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-29 10:45:59 +0100 |
| commit | 81591346d11ffdf9a2442ad976390ffe0e61abda (patch) | |
| tree | 01f8c012ca72d9e1aac11d5c49b22b2996af9a35 /board/toradex/apalis-imx8/apalis-imx8.c | |
| parent | ba629689c627a571d5902a1c50fe9927424b45c6 (diff) | |
apalis-imx8: fix eMMC/MMC/SD interface muxing
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
(cherry picked from commit fa3d4f980a515b135778a74ce1b7476f61ef20d0)
(cherry picked from commit 2ee92bc1dd56b44343079a5474d0fc4e79f28f4a)
(cherry picked from commit 649afbe0aec4089112772a49a7e6f7d34c3741a7)
Diffstat (limited to 'board/toradex/apalis-imx8/apalis-imx8.c')
| -rw-r--r-- | board/toradex/apalis-imx8/apalis-imx8.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index e5d5aee0e7..735b0e010d 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -96,7 +96,7 @@ int board_early_init_f(void) #ifdef CONFIG_FSL_ESDHC -#define USDHC1_CD_GPIO IMX_GPIO_NR(5, 22) +#define USDHC1_CD_GPIO IMX_GPIO_NR(2, 9) #define USDHC2_CD_GPIO IMX_GPIO_NR(4, 12) static struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = { @@ -127,8 +127,11 @@ static iomux_cfg_t usdhc1_sd[] = { SC_P_USDHC1_DATA1 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), SC_P_USDHC1_DATA2 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), SC_P_USDHC1_DATA3 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_USDHC1_DATA6 | MUX_MODE_ALT(2) | MUX_PAD_CTRL(ESDHC_PAD_CTRL), /* Mux for WP */ - SC_P_USDHC1_DATA7 | MUX_MODE_ALT(3) | MUX_PAD_CTRL(ESDHC_PAD_CTRL), /* Mux for CD, GPIO5 IO22 */ + SC_P_USDHC1_DATA4 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), + SC_P_USDHC1_DATA5 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), + SC_P_USDHC1_DATA6 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), + SC_P_USDHC1_DATA7 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), + SC_P_ESAI1_TX1 | MUX_MODE_ALT(3) | MUX_PAD_CTRL(ESDHC_PAD_CTRL), /* Mux for CD, GPIO2 IO09 */ SC_P_USDHC1_RESET_B | MUX_PAD_CTRL(ESDHC_PAD_CTRL), SC_P_USDHC1_VSELECT | MUX_PAD_CTRL(ESDHC_PAD_CTRL), }; @@ -141,7 +144,6 @@ static iomux_cfg_t usdhc2_sd[] = { SC_P_USDHC2_DATA2 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), SC_P_USDHC2_DATA3 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), SC_P_USDHC2_RESET_B | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_USDHC2_WP | MUX_PAD_CTRL(ESDHC_PAD_CTRL), SC_P_USDHC2_CD_B | MUX_MODE_ALT(3) | MUX_PAD_CTRL(ESDHC_PAD_CTRL), /* Mux to GPIO4 IO12 */ }; |