Commit e8777e91a239599ffd231ef56c60d49b68e5e3fc
Committed by
Ye Li
Ye Li
1 parent
41a6f612f6
Exists in
smarc-rel_imx_4.1.15_2.0.0_ga
MLK-12436-1: mx6qarm2: support lpddr2 board
Support lpddr2 board. Signed-off-by: Peng Fan <peng.fan@nxp.com>
Showing 2 changed files with 12 additions and 2 deletions Side-by-side Diff
board/freescale/mx6qarm2/mx6qarm2.c
| ... | ... | @@ -60,7 +60,11 @@ |
| 60 | 60 | MX6_PAD_SD3_DAT5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), |
| 61 | 61 | MX6_PAD_SD3_DAT6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), |
| 62 | 62 | MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), |
| 63 | +#ifdef CONFIG_MX6DQ_POP_LPDDR2 | |
| 64 | + MX6_PAD_GPIO_18__SD3_VSELECT | MUX_PAD_CTRL(USDHC_PAD_CTRL), | |
| 65 | +#else | |
| 63 | 66 | MX6_PAD_NANDF_CS0__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL), /* CD */ |
| 67 | +#endif | |
| 64 | 68 | }; |
| 65 | 69 | |
| 66 | 70 | iomux_v3_cfg_t const usdhc4_pads[] = { |
| 67 | 71 | |
| 68 | 72 | |
| ... | ... | @@ -123,15 +127,16 @@ |
| 123 | 127 | |
| 124 | 128 | int board_mmc_getcd(struct mmc *mmc) |
| 125 | 129 | { |
| 130 | + int ret = 1; | |
| 131 | +#ifndef CONFIG_MX6DQ_POP_LPDDR2 | |
| 126 | 132 | struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; |
| 127 | - int ret; | |
| 128 | 133 | |
| 129 | 134 | if (cfg->esdhc_base == USDHC3_BASE_ADDR) { |
| 130 | 135 | gpio_direction_input(IMX_GPIO_NR(6, 11)); |
| 131 | 136 | ret = !gpio_get_value(IMX_GPIO_NR(6, 11)); |
| 132 | 137 | } else /* Don't have the CD GPIO pin on board */ |
| 133 | 138 | ret = 1; |
| 134 | - | |
| 139 | +#endif | |
| 135 | 140 | return ret; |
| 136 | 141 | } |
| 137 | 142 |
configs/mx6qarm2_pop_lpddr2_defconfig
