From dfc9a6dbe2b72f15351853db3a68e7a1058a4c46 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 15 Apr 2019 12:30:18 +0200 Subject: apalis-imx8: remove board code for usdhc These are now configured out of the device tree. Signed-off-by: Max Krummenacher --- board/toradex/apalis-imx8/apalis-imx8.c | 132 -------------------------------- 1 file changed, 132 deletions(-) (limited to 'board/toradex') diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index 6e534a5bd19..6291de22785 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -83,138 +83,6 @@ int board_early_init_f(void) return 0; } -#ifdef CONFIG_FSL_ESDHC - -#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] = { - {USDHC1_BASE_ADDR, 0, 8}, - {USDHC2_BASE_ADDR, 0, 4}, - {USDHC3_BASE_ADDR, 0, 4}, -}; - -static iomux_cfg_t emmc0[] = { - SC_P_EMMC0_CLK | MUX_PAD_CTRL(ESDHC_CLK_PAD_CTRL), - SC_P_EMMC0_CMD | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_DATA0 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_DATA1 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_DATA2 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_DATA3 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_DATA4 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_DATA5 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_DATA6 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_DATA7 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_RESET_B | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_EMMC0_STROBE | MUX_PAD_CTRL(ESDHC_PAD_CTRL), -}; - -static iomux_cfg_t usdhc1_sd[] = { - SC_P_USDHC1_CLK | MUX_PAD_CTRL(ESDHC_CLK_PAD_CTRL), - SC_P_USDHC1_CMD | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_USDHC1_DATA0 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - 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_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), -}; - -static iomux_cfg_t usdhc2_sd[] = { - SC_P_USDHC2_CLK | MUX_PAD_CTRL(ESDHC_CLK_PAD_CTRL), - SC_P_USDHC2_CMD | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_USDHC2_DATA0 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - SC_P_USDHC2_DATA1 | MUX_PAD_CTRL(ESDHC_PAD_CTRL), - 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_CD_B | MUX_MODE_ALT(3) | MUX_PAD_CTRL(ESDHC_PAD_CTRL), /* Mux to GPIO4 IO12 */ -}; - -int board_mmc_init(bd_t *bis) -{ - int i, ret; - struct power_domain pd; - - /* - * According to the board_mmc_init() the following map is done: - * (U-boot device node) (Physical Port) - * mmc0 USDHC1 - * mmc1 USDHC2 - * mmc2 USDHC3 - */ - for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { - switch (i) { - case 0: - if (!power_domain_lookup_name("conn_sdhc0", &pd)) - power_domain_on(&pd); - - imx8_iomux_setup_multiple_pads(emmc0, ARRAY_SIZE(emmc0)); - init_clk_usdhc(0); - usdhc_cfg[i].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); - break; - case 1: - if (!power_domain_lookup_name("conn_sdhc1", &pd)) - power_domain_on(&pd); - - imx8_iomux_setup_multiple_pads(usdhc1_sd, ARRAY_SIZE(usdhc1_sd)); - init_clk_usdhc(1); - usdhc_cfg[i].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); - gpio_request(USDHC1_CD_GPIO, "sd1_cd"); - gpio_direction_input(USDHC1_CD_GPIO); - break; - case 2: - if (!power_domain_lookup_name("conn_sdhc2", &pd)) - power_domain_on(&pd); - - imx8_iomux_setup_multiple_pads(usdhc2_sd, ARRAY_SIZE(usdhc2_sd)); - init_clk_usdhc(2); - usdhc_cfg[i].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - gpio_request(USDHC2_CD_GPIO, "sd2_cd"); - gpio_direction_input(USDHC2_CD_GPIO); - break; - default: - printf("Warning: you configured more USDHC controllers" - "(%d) than supported by the board\n", i + 1); - return 0; - } - ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); - if (ret) { - printf("Warning: failed to initialize mmc dev %d\n", i); - return ret; - } - } - - return 0; -} - -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 = 1; /* eMMC */ - break; - case USDHC2_BASE_ADDR: - ret = !gpio_get_value(USDHC1_CD_GPIO); - break; - case USDHC3_BASE_ADDR: - ret = !gpio_get_value(USDHC2_CD_GPIO); - break; - } - - return ret; -} - -#endif /* CONFIG_FSL_ESDHC */ - #ifdef CONFIG_MXC_GPIO #define BKL1_GPIO IMX_GPIO_NR(1, 10) -- cgit v1.2.3