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

Commit 1b17aedf authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: provide a PHY setup helper 



Similarly to the VTU, PVT and ATU setup, provide a mv88e6xxx_phy_setup
helper which wraps mv88e6xxx_ppu_enable, so that no more PPU-related
functions are exposed outside of phy.c.

Thus make mv88e6xxx_ppu_enable static.

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

drivers/net/dsa/mv88e6xxx/chip.c

+4 −7
Original line number Diff line number Diff line
@@ -2034,13 +2034,6 @@ static int mv88e6xxx_g1_setup(struct mv88e6xxx_chip *chip) 
	u32 upstream_port = dsa_upstream_port(ds);

	int err;



	/* Enable the PHY Polling Unit if present, don't discard any packets,

	 * and mask all interrupt sources.

	 */

	err = mv88e6xxx_ppu_enable(chip);

	if (err)

		return err;



	if (chip->info->ops->g1_set_cpu_port) {

		err = chip->info->ops->g1_set_cpu_port(chip, upstream_port);

		if (err)
@@ -2140,6 +2133,10 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) 
			goto unlock;

	}



	err = mv88e6xxx_phy_setup(chip);

	if (err)

		goto unlock;



	err = mv88e6xxx_vtu_setup(chip);

	if (err)

		goto unlock;

drivers/net/dsa/mv88e6xxx/phy.c

+6 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int mv88e6xxx_ppu_disable(struct mv88e6xxx_chip *chip) 
	return chip->info->ops->ppu_disable(chip);

}



int mv88e6xxx_ppu_enable(struct mv88e6xxx_chip *chip)

static int mv88e6xxx_ppu_enable(struct mv88e6xxx_chip *chip)

{

	if (!chip->info->ops->ppu_enable)

		return 0;
@@ -241,3 +241,8 @@ void mv88e6xxx_phy_destroy(struct mv88e6xxx_chip *chip) 
	if (chip->info->ops->ppu_enable && chip->info->ops->ppu_disable)

		mv88e6xxx_ppu_state_destroy(chip);

}



int mv88e6xxx_phy_setup(struct mv88e6xxx_chip *chip)

{

	return mv88e6xxx_ppu_enable(chip);

}

drivers/net/dsa/mv88e6xxx/phy.h

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ int mv88e6xxx_phy_ppu_read(struct mv88e6xxx_chip *chip, struct mii_bus *bus, 
			   int addr, int reg, u16 *val);

int mv88e6xxx_phy_ppu_write(struct mv88e6xxx_chip *chip, struct mii_bus *bus,

			    int addr, int reg, u16 val);

int mv88e6xxx_ppu_enable(struct mv88e6xxx_chip *chip);

void mv88e6xxx_phy_init(struct mv88e6xxx_chip *chip);

void mv88e6xxx_phy_destroy(struct mv88e6xxx_chip *chip);

int mv88e6xxx_phy_setup(struct mv88e6xxx_chip *chip);



#endif /*_MV88E6XXX_PHY_H */