Commit e6df1b4a authored by Potin Lai's avatar Potin Lai Committed by David S. Miller
Browse files

net: mdio: aspeed: Add c45 support 



Add Clause 45 support for Aspeed mdio driver.

Signed-off-by: default avatarPotin Lai <potin.lai@quantatw.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb057193

drivers/net/mdio/mdio-aspeed.c

+32 −5
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 
#define   ASPEED_MDIO_CTRL_OP		GENMASK(27, 26)

#define     MDIO_C22_OP_WRITE		0b01

#define     MDIO_C22_OP_READ		0b10

#define     MDIO_C45_OP_ADDR		0b00

#define     MDIO_C45_OP_WRITE		0b01

#define     MDIO_C45_OP_PREAD		0b10

#define     MDIO_C45_OP_READ		0b11

#define   ASPEED_MDIO_CTRL_PHYAD	GENMASK(25, 21)

#define   ASPEED_MDIO_CTRL_REGAD	GENMASK(20, 16)

#define   ASPEED_MDIO_CTRL_MIIWDATA	GENMASK(15, 0)
@@ -66,8 +70,8 @@ static int aspeed_mdio_op(struct mii_bus *bus, u8 st, u8 op, u8 phyad, u8 regad, 
static int aspeed_mdio_get_data(struct mii_bus *bus)

{

	struct aspeed_mdio *ctx = bus->priv;

	int rc;

	u32 data;

	int rc;



	rc = readl_poll_timeout(ctx->base + ASPEED_MDIO_DATA, data,

				data & ASPEED_MDIO_DATA_IDLE,
@@ -100,15 +104,37 @@ static int aspeed_mdio_write_c22(struct mii_bus *bus, int addr, int regnum, 


static int aspeed_mdio_read_c45(struct mii_bus *bus, int addr, int regnum)

{

	/* TODO: add c45 support */

	return -EOPNOTSUPP;

	u8 c45_dev = (regnum >> 16) & 0x1F;

	u16 c45_addr = regnum & 0xFFFF;

	int rc;



	rc = aspeed_mdio_op(bus, ASPEED_MDIO_CTRL_ST_C45, MDIO_C45_OP_ADDR,

			    addr, c45_dev, c45_addr);

	if (rc < 0)

		return rc;



	rc = aspeed_mdio_op(bus, ASPEED_MDIO_CTRL_ST_C45, MDIO_C45_OP_READ,

			    addr, c45_dev, 0);

	if (rc < 0)

		return rc;



	return aspeed_mdio_get_data(bus);

}



static int aspeed_mdio_write_c45(struct mii_bus *bus, int addr, int regnum,

				 u16 val)

{

	/* TODO: add c45 support */

	return -EOPNOTSUPP;

	u8 c45_dev = (regnum >> 16) & 0x1F;

	u16 c45_addr = regnum & 0xFFFF;

	int rc;



	rc = aspeed_mdio_op(bus, ASPEED_MDIO_CTRL_ST_C45, MDIO_C45_OP_ADDR,

			    addr, c45_dev, c45_addr);

	if (rc < 0)

		return rc;



	return aspeed_mdio_op(bus, ASPEED_MDIO_CTRL_ST_C45, MDIO_C45_OP_WRITE,

			      addr, c45_dev, val);

}



static int aspeed_mdio_read(struct mii_bus *bus, int addr, int regnum)
@@ -153,6 +179,7 @@ static int aspeed_mdio_probe(struct platform_device *pdev) 
	bus->parent = &pdev->dev;

	bus->read = aspeed_mdio_read;

	bus->write = aspeed_mdio_write;

	bus->probe_capabilities = MDIOBUS_C22_C45;



	rc = of_mdiobus_register(bus, pdev->dev.of_node);

	if (rc) {