On Sun, 2019-01-06 at 22:00 +0100, Stefan Agner wrote: > From: Stefan Agner <stefan.ag...@toradex.com> > > Drop legacy pinmux/usdhc board configuration. > > Signed-off-by: Stefan Agner <stefan.ag...@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswi...@toradex.com> > --- > > board/toradex/colibri_imx7/colibri_imx7.c | 97 ------------------- > ---- > 1 file changed, 97 deletions(-) > > diff --git a/board/toradex/colibri_imx7/colibri_imx7.c > b/board/toradex/colibri_imx7/colibri_imx7.c > index a4c99626b4..392fda92da 100644 > --- a/board/toradex/colibri_imx7/colibri_imx7.c > +++ b/board/toradex/colibri_imx7/colibri_imx7.c > @@ -33,9 +33,6 @@ DECLARE_GLOBAL_DATA_PTR; > #define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \ > PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS) > > -#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | > \ > - PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM) > - Good catch. The rest is exactly equal to what I came up with. > #define ENET_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | > PAD_CTL_DSE_3P3V_49OHM) > #define ENET_PAD_CTRL_MII (PAD_CTL_DSE_3P3V_32OHM) > > @@ -64,17 +61,6 @@ static iomux_v3_cfg_t const uart1_pads[] = { > MX7D_PAD_SAI2_TX_SYNC__UART1_DTE_RTS | > MUX_PAD_CTRL(UART_PAD_CTRL), > }; > > -static iomux_v3_cfg_t const usdhc1_pads[] = { > - MX7D_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD1_CMD__SD1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD1_DATA0__SD1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD1_DATA1__SD1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD1_DATA2__SD1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD1_DATA3__SD1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - > - MX7D_PAD_GPIO1_IO00__GPIO1_IO0 | MUX_PAD_CTRL(NO_PAD_CTRL), > -}; > - > #ifdef CONFIG_USB_EHCI_MX7 > static iomux_v3_cfg_t const usb_cdet_pads[] = { > MX7D_PAD_ENET1_CRS__GPIO7_IO14 | MUX_PAD_CTRL(NO_PAD_CTRL), > @@ -109,24 +95,6 @@ static void setup_gpmi_nand(void) > } > #endif > > -#ifdef CONFIG_TARGET_COLIBRI_IMX7_EMMC > -static iomux_v3_cfg_t const usdhc3_emmc_pads[] = { > - MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_DATA3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_DATA4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_DATA5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_DATA6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_DATA7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), > - MX7D_PAD_SD3_STROBE__SD3_STROBE | > MUX_PAD_CTRL(USDHC_PAD_CTRL), > - > - MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | > MUX_PAD_CTRL(USDHC_PAD_CTRL), > -}; > -#endif > - > #ifdef CONFIG_VIDEO_MXS > static iomux_v3_cfg_t const lcd_pads[] = { > MX7D_PAD_LCD_CLK__LCD_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), > @@ -211,71 +179,6 @@ static void setup_iomux_uart(void) > imx_iomux_v3_setup_multiple_pads(uart1_pads, > ARRAY_SIZE(uart1_pads)); > } > > -#ifdef CONFIG_FSL_ESDHC > - > -#define USDHC1_CD_GPIO IMX_GPIO_NR(1, 0) > - > -static struct fsl_esdhc_cfg usdhc_cfg[] = { > -#ifdef CONFIG_TARGET_COLIBRI_IMX7_EMMC > - {USDHC3_BASE_ADDR}, > -#endif > - {USDHC1_BASE_ADDR, 0, 4}, > -}; > - > -int board_mmc_getcd(struct mmc *mmc) > -{ > - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; > - int ret = 0; > - > - switch (cfg->esdhc_base) { > - case USDHC1_BASE_ADDR: > - ret = !gpio_get_value(USDHC1_CD_GPIO); > - break; > -#ifdef CONFIG_TARGET_COLIBRI_IMX7_EMMC > - case USDHC3_BASE_ADDR: > - ret = 1; > - break; > -#endif > - } > - > - return ret; > -} > - > -int board_mmc_init(bd_t *bis) > -{ > - int i, ret; > - /* USDHC1 is mmc0, USDHC3 is mmc1 */ > - for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { > - switch (i) { > - case 0: > - imx_iomux_v3_setup_multiple_pads( > - usdhc1_pads, ARRAY_SIZE(usdhc1_pads)); > - gpio_request(USDHC1_CD_GPIO, "usdhc1_cd"); > - gpio_direction_input(USDHC1_CD_GPIO); > - usdhc_cfg[0].sdhc_clk = > mxc_get_clock(MXC_ESDHC_CLK); > - break; > -#ifdef CONFIG_TARGET_COLIBRI_IMX7_EMMC > - case 1: > - imx_iomux_v3_setup_multiple_pads(usdhc3_emmc_pa > ds, > - ARRAY_SIZE(usdhc3_emmc_pads)); > - usdhc_cfg[1].sdhc_clk = > mxc_get_clock(MXC_ESDHC3_CLK); > - break; > -#endif > - default: > - printf("Warning: you configured more USDHC > controllers" > - "(%d) than supported by the board\n", i > + 1); > - return -EINVAL; > - } > - > - ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); > - if (ret) > - return ret; > - } > - > - return 0; > -} > -#endif > - > #ifdef CONFIG_FEC_MXC > int board_eth_init(bd_t *bis) > { _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot