Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4567d686 authored by Volodymyr Bendiuga's avatar Volodymyr Bendiuga Committed by David S. Miller
Browse files

phy: increase size of MII_BUS_ID_SIZE and bus_id 



Some bus names are pretty long and do not fit into
17 chars. Increase therefore MII_BUS_ID_SIZE and
phy_fixup.bus_id to larger number. Now mii_bus.id
can host larger name.

Signed-off-by: default avatarVolodymyr Bendiuga <volodymyr.bendiuga@gmail.com>
Signed-off-by: default avatarMagnus Öberg <magnus.oberg@westermo.se>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2594d80

include/linux/phy.h

+2 −6
Original line number Diff line number Diff line
@@ -158,11 +158,7 @@ static inline const char *phy_modes(phy_interface_t interface) 
/* Used when trying to connect to a specific phy (mii bus id:phy device id) */

#define PHY_ID_FMT "%s:%02x"



/*

 * Need to be a little smaller than phydev->dev.bus_id to leave room

 * for the ":%02x"

 */

#define MII_BUS_ID_SIZE	(20 - 3)

#define MII_BUS_ID_SIZE	61



/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit

   IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips. */
@@ -632,7 +628,7 @@ struct phy_driver { 
/* A Structure for boards to register fixups with the PHY Lib */

struct phy_fixup {

	struct list_head list;

	char bus_id[20];

	char bus_id[MII_BUS_ID_SIZE + 3];

	u32 phy_uid;

	u32 phy_uid_mask;

	int (*run)(struct phy_device *phydev);