diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-21 11:44:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-21 11:44:54 -0400 |
| commit | e50f66e364be80e02dd0834b84b830f3aade82ea (patch) | |
| tree | cd44087cdc8180618f31faae2eb49598cb3ec5c5 /drivers | |
| parent | feeacc7ec70560c535c0eb7a4d847ad17cacbeff (diff) | |
| parent | ac47bd230cd3430589c63f81e57b3d30e0abe0db (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- mrvl_uart.sh: Remove script (Pali)
- Fix Espressobin build for configs where ENV is not in SPI (Rogier)
- mvebu: a37xx: Add support for reading OTP (Pali)
- mvebu: uDPU: Ethernet fixes and misc DT and defconfig changes (Robert)
- mvebu: Add support for reading LD0 and LD1 eFuse (Pali)
- kwboot: Replace fstat()+st_size by lseek()+SEEK_END (Pali)
- mvebu: turris_omnia: Enable CONFIG_CMD_FUSE (Pali)
- arm: Add CONFIG_SPL_SYS_NO_VECTOR_TABLE used on 32bit MVEBU (Pali)
- mvebu: a37xx: Add support for writing Security OTP values (Pali)
- mvebu: turris: Misc enhancements and cleanups / fixes (Pali)
- Sheevaplug : Use Marvell uclass mvgbe and PHY driver for Ethernet (Tony)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/mvneta.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index e2ac4d801d..15dc714058 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -286,6 +286,7 @@ struct mvneta_port { struct phy_device *phydev; #if CONFIG_IS_ENABLED(DM_GPIO) struct gpio_desc phy_reset_gpio; + struct gpio_desc sfp_tx_disable_gpio; #endif struct mii_dev *bus; }; @@ -1693,6 +1694,9 @@ static int mvneta_probe(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); struct mvneta_port *pp = dev_get_priv(dev); +#if CONFIG_IS_ENABLED(DM_GPIO) + struct ofnode_phandle_args sfp_args; +#endif void *blob = (void *)gd->fdt_blob; int node = dev_of_offset(dev); struct mii_dev *bus; @@ -1767,6 +1771,11 @@ static int mvneta_probe(struct udevice *dev) return ret; #if CONFIG_IS_ENABLED(DM_GPIO) + ret = dev_read_phandle_with_args(dev, "sfp", NULL, 0, 0, &sfp_args); + if (!ret && ofnode_is_enabled(sfp_args.node)) + gpio_request_by_name_nodev(sfp_args.node, "tx-disable-gpio", 0, + &pp->sfp_tx_disable_gpio, GPIOD_IS_OUT); + gpio_request_by_name(dev, "phy-reset-gpios", 0, &pp->phy_reset_gpio, GPIOD_IS_OUT); @@ -1775,6 +1784,9 @@ static int mvneta_probe(struct udevice *dev) mdelay(10); dm_gpio_set_value(&pp->phy_reset_gpio, 0); } + + if (dm_gpio_is_valid(&pp->sfp_tx_disable_gpio)) + dm_gpio_set_value(&pp->sfp_tx_disable_gpio, 0); #endif return board_network_enable(bus); |