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

Commit 067e474a authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: prefix Global 2 Device Mapping macros 



Prefix and document the Global 2 Device Mapping macros.

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

drivers/net/dsa/mv88e6xxx/global2.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int mv88e6xxx_g2_device_mapping_write(struct mv88e6xxx_chip *chip, 
{

	u16 val = (target << 8) | (port & 0xf);



	return mv88e6xxx_g2_update(chip, GLOBAL2_DEVICE_MAPPING, val);

	return mv88e6xxx_g2_update(chip, MV88E6XXX_G2_DEVICE_MAPPING, val);

}



static int mv88e6xxx_g2_set_device_mapping(struct mv88e6xxx_chip *chip)

drivers/net/dsa/mv88e6xxx/global2.h

+6 −4
Original line number Diff line number Diff line
@@ -31,10 +31,12 @@ 
#define GLOBAL2_SWITCH_MGMT_FLOW_CONTROL_MSG	BIT(13)

#define GLOBAL2_SWITCH_MGMT_FORCE_FLOW_CTRL_PRI	BIT(7)

#define GLOBAL2_SWITCH_MGMT_RSVD2CPU		BIT(3)

#define GLOBAL2_DEVICE_MAPPING	0x06

#define GLOBAL2_DEVICE_MAPPING_UPDATE		BIT(15)

#define GLOBAL2_DEVICE_MAPPING_TARGET_SHIFT	8

#define GLOBAL2_DEVICE_MAPPING_PORT_MASK	0x0f



/* Offset 0x06: Device Mapping Table Register */

#define MV88E6XXX_G2_DEVICE_MAPPING		0x06

#define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE	0x8000

#define MV88E6XXX_G2_DEVICE_MAPPING_DEV_MASK	0x1f00

#define MV88E6XXX_G2_DEVICE_MAPPING_PORT_MASK	0x000f



/* Offset 0x07: Trunk Mask Table Register */

#define MV88E6XXX_G2_TRUNK_MASK			0x07