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

Commit 3bbb8867 authored by Marek Behún's avatar Marek Behún Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: rename port cmode macro 



This is a cosmetic update. We are removing the last underscore from
macros MV88E6XXX_PORT_STS_CMODE_100BASE_X and
MV88E6XXX_PORT_STS_CMODE_1000BASE_X. The 2500base-x version does not
have that underscore. Also PHY_INTERFACE_MODE_ macros do not have it
there.

Signed-off-by: default avatarMarek Behún <marek.behun@nic.cz>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3cf7d8f

drivers/net/dsa/mv88e6xxx/port.c

+2 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, 


	switch (mode) {

	case PHY_INTERFACE_MODE_1000BASEX:

		cmode = MV88E6XXX_PORT_STS_CMODE_1000BASE_X;

		cmode = MV88E6XXX_PORT_STS_CMODE_1000BASEX;

		break;

	case PHY_INTERFACE_MODE_SGMII:

		cmode = MV88E6XXX_PORT_STS_CMODE_SGMII;
@@ -618,7 +618,7 @@ int mv88e6352_port_link_state(struct mv88e6xxx_chip *chip, int port, 
		else

			state->interface = PHY_INTERFACE_MODE_RGMII;

		break;

	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:

	case MV88E6XXX_PORT_STS_CMODE_1000BASEX:

		state->interface = PHY_INTERFACE_MODE_1000BASEX;

		break;

	case MV88E6XXX_PORT_STS_CMODE_SGMII:

drivers/net/dsa/mv88e6xxx/port.h

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ 
#define MV88E6XXX_PORT_STS_FLOW_CTL		0x0010

#define MV88E6XXX_PORT_STS_CMODE_MASK		0x000f

#define MV88E6XXX_PORT_STS_CMODE_RGMII		0x0007

#define MV88E6XXX_PORT_STS_CMODE_100BASE_X	0x0008

#define MV88E6XXX_PORT_STS_CMODE_1000BASE_X	0x0009

#define MV88E6XXX_PORT_STS_CMODE_100BASEX	0x0008

#define MV88E6XXX_PORT_STS_CMODE_1000BASEX	0x0009

#define MV88E6XXX_PORT_STS_CMODE_SGMII		0x000a

#define MV88E6XXX_PORT_STS_CMODE_2500BASEX	0x000b

#define MV88E6XXX_PORT_STS_CMODE_XAUI		0x000c

drivers/net/dsa/mv88e6xxx/serdes.c

+24 −24
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ static bool mv88e6352_port_has_serdes(struct mv88e6xxx_chip *chip, int port) 
{

	u8 cmode = chip->ports[port].cmode;



	if ((cmode == MV88E6XXX_PORT_STS_CMODE_100BASE_X) ||

	    (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X) ||

	if ((cmode == MV88E6XXX_PORT_STS_CMODE_100BASEX) ||

	    (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASEX) ||

	    (cmode == MV88E6XXX_PORT_STS_CMODE_SGMII))

		return true;
@@ -293,7 +293,7 @@ int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port, u8 *lane) 
	if (port != 5)

		return -ENODEV;



	if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

	if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

	    cmode == MV88E6XXX_PORT_STS_CMODE_SGMII ||

	    cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX) {

		*lane = MV88E6341_PORT5_LANE;
@@ -309,7 +309,7 @@ int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip *chip, int port, u8 *lane) 


	switch (port) {

	case 9:

		if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX) {

			*lane = MV88E6390_PORT9_LANE0;
@@ -317,7 +317,7 @@ int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip *chip, int port, u8 *lane) 
		}

		break;

	case 10:

		if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX) {

			*lane = MV88E6390_PORT10_LANE0;
@@ -341,71 +341,71 @@ int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port, u8 *lane) 


	switch (port) {

	case 2:

		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_2500BASEX) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX) {

				*lane = MV88E6390_PORT9_LANE1;

				return 0;

			}

		}

		break;

	case 3:

		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_RXAUI) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX) {

				*lane = MV88E6390_PORT9_LANE2;

				return 0;

			}

		}

		break;

	case 4:

		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_RXAUI) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX) {

				*lane = MV88E6390_PORT9_LANE3;

				return 0;

			}

		}

		break;

	case 5:

		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_2500BASEX) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX) {

				*lane = MV88E6390_PORT10_LANE1;

				return 0;

			}

		}

		break;

	case 6:

		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_RXAUI) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX) {

				*lane = MV88E6390_PORT10_LANE2;

				return 0;

			}

		}

		break;

	case 7:

		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_RXAUI) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X) {

			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX) {

				*lane = MV88E6390_PORT10_LANE3;

				return 0;

			}

		}

		break;

	case 9:

		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||

		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_XAUI ||
@@ -415,7 +415,7 @@ int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port, u8 *lane) 
		}

		break;

	case 10:

		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||

		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_SGMII ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||

		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_XAUI ||
@@ -499,7 +499,7 @@ int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on) 


	switch (cmode) {

	case MV88E6XXX_PORT_STS_CMODE_SGMII:

	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:

	case MV88E6XXX_PORT_STS_CMODE_1000BASEX:

	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:

		return mv88e6390_serdes_power_sgmii(chip, lane, on);

	case MV88E6XXX_PORT_STS_CMODE_XAUI:
@@ -558,7 +558,7 @@ static void mv88e6390_serdes_irq_link_sgmii(struct mv88e6xxx_chip *chip, 
	case MV88E6XXX_PORT_STS_CMODE_SGMII:

		mode = PHY_INTERFACE_MODE_SGMII;

		break;

	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:

	case MV88E6XXX_PORT_STS_CMODE_1000BASEX:

		mode = PHY_INTERFACE_MODE_1000BASEX;

		break;

	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:
@@ -601,7 +601,7 @@ int mv88e6390_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port, 


	switch (cmode) {

	case MV88E6XXX_PORT_STS_CMODE_SGMII:

	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:

	case MV88E6XXX_PORT_STS_CMODE_1000BASEX:

	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:

		err = mv88e6390_serdes_irq_enable_sgmii(chip, lane);

	}
@@ -617,7 +617,7 @@ int mv88e6390_serdes_irq_disable(struct mv88e6xxx_chip *chip, int port, 


	switch (cmode) {

	case MV88E6XXX_PORT_STS_CMODE_SGMII:

	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:

	case MV88E6XXX_PORT_STS_CMODE_1000BASEX:

	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:

		err = mv88e6390_serdes_irq_disable_sgmii(chip, lane);

	}
@@ -652,7 +652,7 @@ static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id) 


	switch (cmode) {

	case MV88E6XXX_PORT_STS_CMODE_SGMII:

	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:

	case MV88E6XXX_PORT_STS_CMODE_1000BASEX:

	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:

		err = mv88e6390_serdes_irq_status_sgmii(chip, lane, &status);

		if (err)