Make use of the i.MX GPIO API.
While at it created a separate function for the FEC PHY reset, so that it can be decoupled from the power_init function.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- board/freescale/mx51evk/mx51evk.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index ef7c6e4..2dabef9 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -33,6 +33,11 @@ #include <fsl_esdhc.h> #include <fsl_pmic.h> #include <mc13892.h> +#include <mxc_gpio.h> + +#define MX51EVK_PHY_RESET (1 * 32 + 14) /* GPIO2_14 */ +#define MX51EVK_SD1_CD (0 * 32 + 0) /* GPIO1_0 */ +#define MX51EVK_SD2_CD (0 * 32 + 6) /* GPIO1_6 */
DECLARE_GLOBAL_DATA_PTR;
@@ -261,27 +266,22 @@ static void power_init(void) pmic_reg_write(REG_MODE_1, val); udelay(200);
- reg = readl(GPIO2_BASE_ADDR + 0x0); - reg &= ~0x4000; /* Lower reset line */ - writel(reg, GPIO2_BASE_ADDR + 0x0); - - reg = readl(GPIO2_BASE_ADDR + 0x4); - reg |= 0x4000; /* configure GPIO lines as output */ - writel(reg, GPIO2_BASE_ADDR + 0x4); - - /* Reset the ethernet controller over GPIO */ - writel(0x1, IOMUXC_BASE_ADDR + 0x0AC); - /* Enable VGEN3, VCAM, VAUDIO, VVIDEO, VSD regulators */ val = VGEN3EN | VGEN3CONFIG | VCAMEN | VCAMCONFIG | VVIDEOEN | VAUDIOEN | VSDEN; pmic_reg_write(REG_MODE_1, val); +} + +static void reset_phy_fec(void) +{ + mxc_request_iomux(MX51_PIN_EIM_A20, IOMUX_CONFIG_ALT1); + mxc_gpio_direction(MX51EVK_PHY_RESET, MXC_GPIO_DIRECTION_OUT);
+ mxc_gpio_set(MX51EVK_PHY_RESET, 0); /* Lower reset line */ + udelay(500);
- reg = readl(GPIO2_BASE_ADDR + 0x0); - reg |= 0x4000; - writel(reg, GPIO2_BASE_ADDR + 0x0); + mxc_gpio_set(MX51EVK_PHY_RESET, 1); /* Set reset line to high */ }
#ifdef CONFIG_FSL_ESDHC @@ -290,9 +290,9 @@ int board_mmc_getcd(u8 *cd, struct mmc *mmc) struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
if (cfg->esdhc_base == MMC_SDHC1_BASE_ADDR) - *cd = readl(GPIO1_BASE_ADDR) & 0x01; + *cd = mxc_gpio_get(MX51EVK_SD1_CD); else - *cd = readl(GPIO1_BASE_ADDR) & 0x40; + *cd = mxc_gpio_get(MX51EVK_SD2_CD);
return 0; } @@ -414,6 +414,7 @@ int board_mmc_init(bd_t *bis) int board_early_init_f(void) { setup_iomux_uart(); + reset_phy_fec(); setup_iomux_fec();
return 0;