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

Commit df63b0d9 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: add mv88e6250_g1_ieee_pri_map 



Quite a few of the existing supported chips that use
mv88e6085_g1_ieee_pri_map as ->ieee_pri_map (including, incidentally,
mv88e6085 itself) actually have a reset value of 0xfa50 in the
G1_IEEE_PRI register.

The data sheet for the mv88e6095, however, does describe a reset value
of 0xfa41.

So rather than changing the value in the existing callback, introduce
a new variant with the 0xfa50 value. That will be used by the upcoming
mv88e6250, and existing chips can be switched over one by one,
preferably double-checking both the data sheet and actual hardware in
each case - if anybody actually feels this is important enough to
care.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarRasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3dd7400b

drivers/net/dsa/mv88e6xxx/global1.c

+6 −0
Original line number Diff line number Diff line
@@ -299,6 +299,12 @@ int mv88e6085_g1_ieee_pri_map(struct mv88e6xxx_chip *chip) 
	return mv88e6xxx_g1_write(chip, MV88E6XXX_G1_IEEE_PRI, 0xfa41);

}



int mv88e6250_g1_ieee_pri_map(struct mv88e6xxx_chip *chip)

{

	/* Reset the IEEE Tag priorities to defaults */

	return mv88e6xxx_g1_write(chip, MV88E6XXX_G1_IEEE_PRI, 0xfa50);

}



/* Offset 0x1a: Monitor Control */

/* Offset 0x1a: Monitor & MGMT Control on some devices */

drivers/net/dsa/mv88e6xxx/global1.h

+2 −0
Original line number Diff line number Diff line
@@ -277,7 +277,9 @@ int mv88e6390_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port); 
int mv88e6390_g1_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip);



int mv88e6085_g1_ip_pri_map(struct mv88e6xxx_chip *chip);



int mv88e6085_g1_ieee_pri_map(struct mv88e6xxx_chip *chip);

int mv88e6250_g1_ieee_pri_map(struct mv88e6xxx_chip *chip);



int mv88e6185_g1_set_cascade_port(struct mv88e6xxx_chip *chip, int port);