|
@@ -25,7 +25,6 @@
|
|
|
#include <asm/mach-imx/spi.h>
|
|
|
#include <asm/mach-imx/boot_mode.h>
|
|
|
#include <asm/mach-imx/video.h>
|
|
|
-#include <mmc.h>
|
|
|
#include <fsl_esdhc_imx.h>
|
|
|
#include <micrel.h>
|
|
|
#include <miiphy.h>
|
|
@@ -161,26 +160,6 @@ static iomux_v3_cfg_t const usdhc2_pads[] = {
|
|
|
IOMUX_PAD_CTRL(SD2_DAT3__SD2_DATA3, USDHC_PAD_CTRL),
|
|
|
};
|
|
|
|
|
|
-static iomux_v3_cfg_t const usdhc3_pads[] = {
|
|
|
- IOMUX_PAD_CTRL(SD3_CLK__SD3_CLK, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD3_CMD__SD3_CMD, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD3_DAT0__SD3_DATA0, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD3_DAT1__SD3_DATA1, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD3_DAT2__SD3_DATA2, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD3_DAT3__SD3_DATA3, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD3_DAT5__GPIO7_IO00, NO_PAD_CTRL), /* CD */
|
|
|
-};
|
|
|
-
|
|
|
-static iomux_v3_cfg_t const usdhc4_pads[] = {
|
|
|
- IOMUX_PAD_CTRL(SD4_CLK__SD4_CLK, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD4_CMD__SD4_CMD, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD4_DAT0__SD4_DATA0, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD4_DAT1__SD4_DATA1, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD4_DAT2__SD4_DATA2, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(SD4_DAT3__SD4_DATA3, USDHC_PAD_CTRL),
|
|
|
- IOMUX_PAD_CTRL(NANDF_D6__GPIO2_IO06, NO_PAD_CTRL), /* CD */
|
|
|
-};
|
|
|
-
|
|
|
static iomux_v3_cfg_t const enet_pads1[] = {
|
|
|
IOMUX_PAD_CTRL(ENET_MDIO__ENET_MDIO, ENET_PAD_CTRL),
|
|
|
IOMUX_PAD_CTRL(ENET_MDC__ENET_MDC, ENET_PAD_CTRL),
|
|
@@ -305,57 +284,6 @@ int board_ehci_power(int port, int on)
|
|
|
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_FSL_ESDHC_IMX
|
|
|
-static struct fsl_esdhc_cfg usdhc_cfg[2] = {
|
|
|
- {USDHC3_BASE_ADDR},
|
|
|
- {USDHC4_BASE_ADDR},
|
|
|
-};
|
|
|
-
|
|
|
-int board_mmc_getcd(struct mmc *mmc)
|
|
|
-{
|
|
|
- struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
|
|
|
- int gp_cd = (cfg->esdhc_base == USDHC3_BASE_ADDR) ? IMX_GPIO_NR(7, 0) :
|
|
|
- IMX_GPIO_NR(2, 6);
|
|
|
-
|
|
|
- gpio_direction_input(gp_cd);
|
|
|
- return !gpio_get_value(gp_cd);
|
|
|
-}
|
|
|
-
|
|
|
-int board_mmc_init(bd_t *bis)
|
|
|
-{
|
|
|
- int ret;
|
|
|
- u32 index = 0;
|
|
|
-
|
|
|
- usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
|
|
|
- usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
|
|
|
-
|
|
|
- usdhc_cfg[0].max_bus_width = 4;
|
|
|
- usdhc_cfg[1].max_bus_width = 4;
|
|
|
-
|
|
|
- for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) {
|
|
|
- switch (index) {
|
|
|
- case 0:
|
|
|
- SETUP_IOMUX_PADS(usdhc3_pads);
|
|
|
- break;
|
|
|
- case 1:
|
|
|
- SETUP_IOMUX_PADS(usdhc4_pads);
|
|
|
- break;
|
|
|
- default:
|
|
|
- printf("Warning: you configured more USDHC controllers"
|
|
|
- "(%d) then supported by the board (%d)\n",
|
|
|
- index + 1, CONFIG_SYS_FSL_USDHC_NUM);
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
-
|
|
|
- ret = fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
|
|
|
- if (ret)
|
|
|
- return ret;
|
|
|
- }
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-#endif
|
|
|
-
|
|
|
#ifdef CONFIG_MXC_SPI
|
|
|
int board_spi_cs_gpio(unsigned bus, unsigned cs)
|
|
|
{
|