Commit 5c5b0c44 authored by Robert Marko's avatar Robert Marko Committed by Paolo Abeni
Browse files

net: dsa: mv88e6xxx: rename mv88e6xxx_g2_scratch_gpio_set_smi 



The name mv88e6xxx_g2_scratch_gpio_set_smi is a bit ambiguous as it appears
to only be applicable to the 6390 family, so lets rename it to
mv88e6390_g2_scratch_gpio_set_smi to make it more obvious.

Signed-off-by: default avatarRobert Marko <robimarko@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 67ea41d1

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -3712,7 +3712,7 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip, 


	if (external) {

		mv88e6xxx_reg_lock(chip);

		err = mv88e6xxx_g2_scratch_gpio_set_smi(chip, true);

		err = mv88e6390_g2_scratch_gpio_set_smi(chip, true);

		mv88e6xxx_reg_unlock(chip);



		if (err)

drivers/net/dsa/mv88e6xxx/global2.h

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ extern const struct mv88e6xxx_avb_ops mv88e6390_avb_ops; 


extern const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops;



int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,

int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,

				      bool external);

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

int mv88e6xxx_g2_atu_stats_set(struct mv88e6xxx_chip *chip, u16 kind, u16 bin);

drivers/net/dsa/mv88e6xxx/global2_scratch.c

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops = { 
};



/**

 * mv88e6xxx_g2_scratch_gpio_set_smi - set gpio muxing for external smi

 * mv88e6390_g2_scratch_gpio_set_smi - set gpio muxing for external smi

 * @chip: chip private data

 * @external: set mux for external smi, or free for gpio usage

 *
@@ -248,7 +248,7 @@ const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops = { 
 * an external SMI interface, or they may be made free for other

 * GPIO uses.

 */

int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,

int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,

				      bool external)

{

	int misc_cfg = MV88E6352_G2_SCRATCH_MISC_CFG;