Author: rmilecki Date: 2016-02-03 10:33:50 +0100 (Wed, 03 Feb 2016) New Revision: 48622
Modified: trunk/target/linux/generic/files/drivers/net/phy/b53/b53_common.c trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c trunk/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h Log: b53: provide PHY access to swconfig Thanks to this change swconfig can access port PHYs e.g. when setting port link state with a generic helper. Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/generic/files/drivers/net/phy/b53/b53_common.c =================================================================== --- trunk/target/linux/generic/files/drivers/net/phy/b53/b53_common.c 2016-02-03 09:33:38 UTC (rev 48621) +++ trunk/target/linux/generic/files/drivers/net/phy/b53/b53_common.c 2016-02-03 09:33:50 UTC (rev 48622) @@ -794,6 +794,26 @@ } +static int b53_phy_read16(struct switch_dev *dev, int addr, u8 reg, u16 *value) +{ + struct b53_device *priv = sw_to_b53(dev); + + if (priv->ops->phy_read16) + return priv->ops->phy_read16(priv, addr, reg, value); + + return b53_read16(priv, B53_PORT_MII_PAGE(addr), reg, value); +} + +static int b53_phy_write16(struct switch_dev *dev, int addr, u8 reg, u16 value) +{ + struct b53_device *priv = sw_to_b53(dev); + + if (priv->ops->phy_write16) + return priv->ops->phy_write16(priv, addr, reg, value); + + return b53_write16(priv, B53_PORT_MII_PAGE(addr), reg, value); +} + static int b53_global_reset_switch(struct switch_dev *dev) { struct b53_device *priv = sw_to_b53(dev); @@ -1002,6 +1022,8 @@ .apply_config = b53_global_apply_config, .reset_switch = b53_global_reset_switch, .get_port_link = b53_port_get_link, + .phy_read16 = b53_phy_read16, + .phy_write16 = b53_phy_write16, }; static const struct switch_dev_ops b53_switch_ops_65 = { @@ -1025,6 +1047,8 @@ .apply_config = b53_global_apply_config, .reset_switch = b53_global_reset_switch, .get_port_link = b53_port_get_link, + .phy_read16 = b53_phy_read16, + .phy_write16 = b53_phy_write16, }; static const struct switch_dev_ops b53_switch_ops = { @@ -1048,6 +1072,8 @@ .apply_config = b53_global_apply_config, .reset_switch = b53_global_reset_switch, .get_port_link = b53_port_get_link, + .phy_read16 = b53_phy_read16, + .phy_write16 = b53_phy_write16, }; struct b53_chip_data { Modified: trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c =================================================================== --- trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c 2016-02-03 09:33:38 UTC (rev 48621) +++ trunk/target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c 2016-02-03 09:33:50 UTC (rev 48622) @@ -238,6 +238,24 @@ return b53_mdio_op(dev, page, reg, REG_MII_ADDR_WRITE); } +static int b53_mdio_phy_read16(struct b53_device *dev, int addr, u8 reg, + u16 *value) +{ + struct mii_bus *bus = dev->priv; + + *value = mdiobus_read(bus, addr, reg); + + return 0; +} + +static int b53_mdio_phy_write16(struct b53_device *dev, int addr, u8 reg, + u16 value) +{ + struct mii_bus *bus = dev->priv; + + return mdiobus_write(bus, addr, reg, value); +} + static struct b53_io_ops b53_mdio_ops = { .read8 = b53_mdio_read8, .read16 = b53_mdio_read16, @@ -249,6 +267,8 @@ .write32 = b53_mdio_write32, .write48 = b53_mdio_write48, .write64 = b53_mdio_write64, + .phy_read16 = b53_mdio_phy_read16, + .phy_write16 = b53_mdio_phy_write16, }; static int b53_phy_probe(struct phy_device *phydev) Modified: trunk/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h =================================================================== --- trunk/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h 2016-02-03 09:33:38 UTC (rev 48621) +++ trunk/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h 2016-02-03 09:33:50 UTC (rev 48622) @@ -36,6 +36,8 @@ int (*write32)(struct b53_device *dev, u8 page, u8 reg, u32 value); int (*write48)(struct b53_device *dev, u8 page, u8 reg, u64 value); int (*write64)(struct b53_device *dev, u8 page, u8 reg, u64 value); + int (*phy_read16)(struct b53_device *dev, int addr, u8 reg, u16 *value); + int (*phy_write16)(struct b53_device *dev, int addr, u8 reg, u16 value); }; enum { _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
