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

Commit 0466080c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-mv88e6xxx-some-fixes' 



Uwe Kleine-König says:

====================
net: dsa: mv88e6xxx: some fixes

these patches target net-next and got approved by Andrew Lunn.

Compared to (implicit) v1, I dropped the patch that I didn't know if it
was right because of missing documentation on my side. But Andrew
already cared for that in a patch that is now adfccf11 in net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6349a169 36d6ea94

drivers/net/dsa/mv88e6xxx/chip.c

+2 −2
Original line number Diff line number Diff line
@@ -3427,7 +3427,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { 
	[MV88E6141] = {

		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6141,

		.family = MV88E6XXX_FAMILY_6341,

		.name = "Marvell 88E6341",

		.name = "Marvell 88E6141",

		.num_databases = 4096,

		.num_ports = 6,

		.num_internal_phys = 5,
@@ -4175,7 +4175,7 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) 
	}



	/* Has to be performed before the MDIO bus is created, because

	 * the PHYs will link there interrupts to these interrupt

	 * the PHYs will link their interrupts to these interrupt

	 * controllers

	 */

	mutex_lock(&chip->reg_lock);

drivers/net/dsa/mv88e6xxx/global2.c

+1 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip) 


	err = request_threaded_irq(chip->device_irq, NULL,

				   mv88e6xxx_g2_irq_thread_fn,

				   IRQF_ONESHOT, "mv88e6xxx-g1", chip);

				   IRQF_ONESHOT, "mv88e6xxx-g2", chip);

	if (err)

		goto out;