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

Commit 2a4614e4 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: prefix Port Association Vector macros 



For implicit namespacing and clarity, prefix the common Port Association
Vector Register macros with MV88E6XXX_PORT_ASSOC_VECTOR.

Document the register and prefer ordered hex masks values for all
Marvell 16-bit registers.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2cb8cb14

drivers/net/dsa/mv88e6xxx/chip.c

+2 −1
Original line number Diff line number Diff line
@@ -1892,7 +1892,8 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) 
	if (dsa_is_cpu_port(ds, port))

		reg = 0;



	err = mv88e6xxx_port_write(chip, port, PORT_ASSOC_VECTOR, reg);

	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_ASSOC_VECTOR,

				   reg);

	if (err)

		return err;

drivers/net/dsa/mv88e6xxx/port.h

+8 −6
Original line number Diff line number Diff line
@@ -183,12 +183,14 @@ 
/* Offset 0x0A: Egress Rate Control 2 */

#define MV88E6XXX_PORT_EGRESS_RATE_CTL2		0x0a



#define PORT_ASSOC_VECTOR	0x0b

#define PORT_ASSOC_VECTOR_HOLD_AT_1		BIT(15)

#define PORT_ASSOC_VECTOR_INT_AGE_OUT		BIT(14)

#define PORT_ASSOC_VECTOR_LOCKED_PORT		BIT(13)

#define PORT_ASSOC_VECTOR_IGNORE_WRONG		BIT(12)

#define PORT_ASSOC_VECTOR_REFRESH_LOCKED	BIT(11)

/* Offset 0x0B: Port Association Vector */

#define MV88E6XXX_PORT_ASSOC_VECTOR			0x0b

#define MV88E6XXX_PORT_ASSOC_VECTOR_HOLD_AT_1		0x8000

#define MV88E6XXX_PORT_ASSOC_VECTOR_INT_AGE_OUT		0x4000

#define MV88E6XXX_PORT_ASSOC_VECTOR_LOCKED_PORT		0x2000

#define MV88E6XXX_PORT_ASSOC_VECTOR_IGNORE_WRONG	0x1000

#define MV88E6XXX_PORT_ASSOC_VECTOR_REFRESH_LOCKED	0x0800



#define PORT_ATU_CONTROL	0x0c

#define PORT_PRI_OVERRIDE	0x0d

#define PORT_ETH_TYPE		0x0f