|
@@ -51,9 +51,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
|
|
PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \
|
|
|
PAD_CTL_SRE_FAST | PAD_CTL_HYS)
|
|
|
|
|
|
-#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
|
|
|
- PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
|
|
|
-
|
|
|
#define WEAK_PULLUP (PAD_CTL_PUS_100K_UP | \
|
|
|
PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \
|
|
|
PAD_CTL_SRE_SLOW)
|
|
@@ -112,24 +109,6 @@ iomux_v3_cfg_t const usdhc3_pads[] = {
|
|
|
};
|
|
|
#endif /* CONFIG_FSL_ESDHC_IMX & CONFIG_SPL_BUILD */
|
|
|
|
|
|
-iomux_v3_cfg_t const enet_pads[] = {
|
|
|
- MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
- MX6_PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
- MX6_PAD_ENET_RXD0__ENET_RX_DATA0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
- MX6_PAD_ENET_RXD1__ENET_RX_DATA1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
- MX6_PAD_ENET_RX_ER__ENET_RX_ER | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
- MX6_PAD_ENET_TX_EN__ENET_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
- MX6_PAD_ENET_TXD0__ENET_TX_DATA0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
- MX6_PAD_ENET_TXD1__ENET_TX_DATA1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
- MX6_PAD_ENET_CRS_DV__ENET_RX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
- MX6_PAD_GPIO_16__ENET_REF_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL),
|
|
|
-};
|
|
|
-
|
|
|
-static void setup_iomux_enet(void)
|
|
|
-{
|
|
|
- imx_iomux_v3_setup_multiple_pads(enet_pads, ARRAY_SIZE(enet_pads));
|
|
|
-}
|
|
|
-
|
|
|
/* mux auxiliary pins to GPIO, so they can be used from the U-Boot cmdline */
|
|
|
iomux_v3_cfg_t const gpio_pads[] = {
|
|
|
/* ADDRESS[17:18] [25] used as GPIO */
|
|
@@ -371,12 +350,8 @@ int board_phy_config(struct phy_device *phydev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-int board_eth_init(bd_t *bis)
|
|
|
+int setup_fec(void)
|
|
|
{
|
|
|
- struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
|
|
|
- uint32_t base = IMX_FEC_BASE;
|
|
|
- struct mii_dev *bus = NULL;
|
|
|
- struct phy_device *phydev = NULL;
|
|
|
int ret;
|
|
|
|
|
|
/* provide the PHY clock from the i.MX 6 */
|
|
@@ -384,34 +359,6 @@ int board_eth_init(bd_t *bis)
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
- /* set gpr1[ENET_CLK_SEL] */
|
|
|
- setbits_le32(&iomuxc_regs->gpr[1], IOMUXC_GPR1_ENET_CLK_SEL_MASK);
|
|
|
-
|
|
|
- setup_iomux_enet();
|
|
|
-
|
|
|
-#ifdef CONFIG_FEC_MXC
|
|
|
- bus = fec_get_miibus(base, -1);
|
|
|
- if (!bus)
|
|
|
- return 0;
|
|
|
-
|
|
|
- /* scan PHY 1..7 */
|
|
|
- phydev = phy_find_by_mask(bus, 0xff, PHY_INTERFACE_MODE_RMII);
|
|
|
- if (!phydev) {
|
|
|
- free(bus);
|
|
|
- puts("no PHY found\n");
|
|
|
- return 0;
|
|
|
- }
|
|
|
-
|
|
|
- phy_reset(phydev);
|
|
|
- printf("using PHY at %d\n", phydev->addr);
|
|
|
- ret = fec_probe(bis, -1, base, bus, phydev);
|
|
|
- if (ret) {
|
|
|
- printf("FEC MXC: %s:failed\n", __func__);
|
|
|
- free(phydev);
|
|
|
- free(bus);
|
|
|
- }
|
|
|
-#endif /* CONFIG_FEC_MXC */
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -633,7 +580,9 @@ int board_init(void)
|
|
|
{
|
|
|
/* address of boot parameters */
|
|
|
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
|
|
|
-
|
|
|
+#if defined(CONFIG_FEC_MXC)
|
|
|
+ setup_fec();
|
|
|
+#endif
|
|
|
#if defined(CONFIG_VIDEO_IPUV3)
|
|
|
setup_display();
|
|
|
#endif
|