
The following changes since commit b0b77fdf3d7d2c1a5e48c3971a677f14e372c164:
Merge tag 'fsl-qoriq-2023-4-6' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq (2023-04-05 22:19:57 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-sh.git master_net/phy/prep-cleanup
for you to fetch changes up to b0177a24d48e4ce13bfd7fce0d9c17dc0996f9a5:
phy: Add .set_mode and .set_speed callbacks (2023-04-07 14:23:26 +0200)
---------------------------------------------------------------- Marek Vasut (52): net: phy: aquantia: Staticize PHY driver entries net: phy: ca_phy: Staticize PHY driver entries net: phy: cortina: Staticize PHY driver entries net: phy: teranetics: Staticize PHY driver entries net: phy: Factor manual relocation into separate function net: phy: Iterate over both registered PHYs and struct phy_driver linker list net: phy: adin: Convert to U_BOOT_PHY_DRIVER() net: phy: aquantia: Convert to U_BOOT_PHY_DRIVER() net: phy: atheros: Convert to U_BOOT_PHY_DRIVER() net: phy: b53: Convert to U_BOOT_PHY_DRIVER() net: phy: broadcom: Convert to U_BOOT_PHY_DRIVER() net: phy: ca_phy: Convert to U_BOOT_PHY_DRIVER() net: phy: cortina: Convert to U_BOOT_PHY_DRIVER() net: phy: davicom: Convert to U_BOOT_PHY_DRIVER() net: phy: mv88e61xx: Convert to U_BOOT_PHY_DRIVER() net: phy: et1011c: Convert to U_BOOT_PHY_DRIVER() net: phy: lxt: Convert to U_BOOT_PHY_DRIVER() net: phy: marvell: Convert to U_BOOT_PHY_DRIVER() net: phy: ksz8xxx: Convert to U_BOOT_PHY_DRIVER() net: phy: ksz90x1: Convert to U_BOOT_PHY_DRIVER() net: phy: meson-gxl: Convert to U_BOOT_PHY_DRIVER() net: phy: natsemi: Convert to U_BOOT_PHY_DRIVER() net: phy: nxp-c45-tja11xx: Convert to U_BOOT_PHY_DRIVER() net: phy: nxp-tja11xx: Convert to U_BOOT_PHY_DRIVER() net: phy: realtek: Convert to U_BOOT_PHY_DRIVER() net: phy: smsc: Convert to U_BOOT_PHY_DRIVER() net: phy: teranetics: Convert to U_BOOT_PHY_DRIVER() net: phy: ti: Convert to U_BOOT_PHY_DRIVER() net: phy: vitesse: Convert to U_BOOT_PHY_DRIVER() net: phy: xilinx: Convert to U_BOOT_PHY_DRIVER() net: phy: intel-xway: Convert to U_BOOT_PHY_DRIVER() net: phy: mscc: Convert to U_BOOT_PHY_DRIVER() net: phy: fixed: Convert to U_BOOT_PHY_DRIVER() net: phy: ncsi: Convert to U_BOOT_PHY_DRIVER() net: phy: xilinx-gmii2rgmii: Convert to U_BOOT_PHY_DRIVER() net: phy: genphy: Convert to U_BOOT_PHY_DRIVER() net: phy: gen10g: Convert to U_BOOT_PHY_DRIVER() net: phy: Drop static phy_drivers list net: phy: Drop unused phy_register() net: phy: Re-inline phy_drv_reloc() net: phy: Only call phy_init() on systems needing manual relocation net: mvpp2: Drop PHY_INTERFACE_MODE_SGMII_2500 support net: mvpp2: Replace PHY_INTERFACE_MODE_SFI with 5GBASER/10GBASER/XAUI net: phy: Synchronize PHY interface modes with Linux net: phy: marvell: Import and use marvell_phy.h from Linux net: phy: Add phy_modify_mmd() and phy_modify_mmd_changed() from Linux net: phy: Add phy_read_mmd_poll_timeout() from Linux net: phy: Add MDIO PCS 2.5G and 5G speed macros from Linux net: phy: marvell10g: Adapt Marvell 10G PHY driver from Linux phy: Add empty generic_phy_configure() implementation for PHY disabled case phy: Fix kerneldoc alignment phy: Add .set_mode and .set_speed callbacks
drivers/net/mvpp2.c | 61 +--- drivers/net/phy/Kconfig | 5 + drivers/net/phy/Makefile | 3 +- drivers/net/phy/adin.c | 9 +- drivers/net/phy/aquantia.c | 33 +- drivers/net/phy/atheros.c | 15 +- drivers/net/phy/b53.c | 9 +- drivers/net/phy/broadcom.c | 18 +- drivers/net/phy/ca_phy.c | 11 +- drivers/net/phy/cortina.c | 11 +- drivers/net/phy/davicom.c | 9 +- drivers/net/phy/dp83867.c | 8 +- drivers/net/phy/dp83869.c | 8 +- drivers/net/phy/et1011c.c | 9 +- drivers/net/phy/fixed.c | 8 +- drivers/net/phy/generic_10g.c | 2 +- drivers/net/phy/intel_xway.c | 9 +- drivers/net/phy/lxt.c | 9 +- drivers/net/phy/marvell.c | 84 ++--- drivers/net/phy/marvell10g.c | 605 ++++++++++++++++++++++++++++++++++++ drivers/net/phy/meson-gxl.c | 9 +- drivers/net/phy/micrel_ksz8xxx.c | 29 +- drivers/net/phy/micrel_ksz90x1.c | 14 +- drivers/net/phy/mscc.c | 27 +- drivers/net/phy/mv88e61xx.c | 15 +- drivers/net/phy/natsemi.c | 15 +- drivers/net/phy/ncsi.c | 8 +- drivers/net/phy/nxp-c45-tja11xx.c | 8 +- drivers/net/phy/nxp-tja11xx.c | 12 +- drivers/net/phy/phy.c | 230 ++++++-------- drivers/net/phy/realtek.c | 21 +- drivers/net/phy/smsc.c | 24 +- drivers/net/phy/teranetics.c | 9 +- drivers/net/phy/ti_phy_init.c | 38 +-- drivers/net/phy/vitesse.c | 45 +-- drivers/net/phy/xilinx_gmii2rgmii.c | 9 +- drivers/net/phy/xilinx_phy.c | 10 +- drivers/phy/phy-uclass.c | 22 ++ include/generic-phy.h | 190 +++++++---- include/linux/mdio.h | 18 ++ include/marvell_phy.h | 47 +++ include/phy.h | 77 ++--- include/phy_interface.h | 66 +++- net/eth_common.c | 2 +- 44 files changed, 1149 insertions(+), 722 deletions(-) create mode 100644 drivers/net/phy/marvell10g.c create mode 100644 include/marvell_phy.h

On 4/7/23 16:50, Marek Vasut wrote:
The following changes since commit b0b77fdf3d7d2c1a5e48c3971a677f14e372c164:
Merge tag 'fsl-qoriq-2023-4-6' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq (2023-04-05 22:19:57 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-sh.git master_net/phy/prep-cleanup
Sigh, the branch to pull is master_net/phy/prep-cleanup , not master , i.e. the BODY is correct, SUBJECT was incorrect. I fixed my generator script and pushed u-boot-sh/master to match u-boot/master to avoid any issues.
So, please pull
https://source.denx.de/u-boot/custodians/u-boot-sh.git Branch master_net/phy/prep-cleanup
into u-boot/master
Also, Ramon, as discussed this should be OK, but if there is any objection, please let me know.

On Fri, Apr 07, 2023 at 04:50:55PM +0200, Marek Vasut wrote:
The following changes since commit b0b77fdf3d7d2c1a5e48c3971a677f14e372c164:
Merge tag 'fsl-qoriq-2023-4-6' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq (2023-04-05 22:19:57 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-sh.git master_net/phy/prep-cleanup
for you to fetch changes up to b0177a24d48e4ce13bfd7fce0d9c17dc0996f9a5:
phy: Add .set_mode and .set_speed callbacks (2023-04-07 14:23:26 +0200)
Applied to u-boot/master, thanks!
participants (3)
-
Marek Vasut
-
Marek Vasut
-
Tom Rini