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

net: dsa: mv88e6xxx: add Amethyst specific SMI GPIO function 



The existing mv88e6390_g2_scratch_gpio_set_smi() cannot be used on the
88E6393X as it requires certain P0_MODE, it also checks the CPU mode
as it impacts the bit setting value.

This is all irrelevant for Amethyst (MV88E6191X/6193X/6393X) as only
the default value of the SMI_PHY Config bit is set to CPU_MGD bootstrap
pin value but it can be changed without restrictions so that GPIO pins
9 and 10 are used as SMI pins.

So, introduce Amethyst specific function and call that if the Amethyst
family wants to setup the external PHY.

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

drivers/net/dsa/mv88e6xxx/chip.c

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


	if (external) {

		mv88e6xxx_reg_lock(chip);

		if (chip->info->family == MV88E6XXX_FAMILY_6393)

			err = mv88e6393x_g2_scratch_gpio_set_smi(chip, true);

		else

			err = mv88e6390_g2_scratch_gpio_set_smi(chip, true);

		mv88e6xxx_reg_unlock(chip);

drivers/net/dsa/mv88e6xxx/global2.h

+2 −0
Original line number Diff line number Diff line
@@ -380,6 +380,8 @@ extern const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops; 


int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,

				      bool external);

int mv88e6393x_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);

int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip, u16 *stats);

drivers/net/dsa/mv88e6xxx/global2_scratch.c

+31 −0
Original line number Diff line number Diff line
@@ -290,6 +290,37 @@ int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip, 
	return mv88e6xxx_g2_scratch_write(chip, misc_cfg, val);

}



/**

 * mv88e6393x_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

 *

 * MV88E6191X/6193X/6393X GPIO pins 9 and 10 can be configured as an

 * external SMI interface or as regular GPIO-s.

 *

 * They however have a different register layout then the existing

 * function.

 */



int mv88e6393x_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,

				       bool external)

{

	int misc_cfg = MV88E6352_G2_SCRATCH_MISC_CFG;

	int err;

	u8 val;



	err = mv88e6xxx_g2_scratch_read(chip, misc_cfg, &val);

	if (err)

		return err;



	if (external)

		val &= ~MV88E6352_G2_SCRATCH_MISC_CFG_NORMALSMI;

	else

		val |= MV88E6352_G2_SCRATCH_MISC_CFG_NORMALSMI;



	return mv88e6xxx_g2_scratch_write(chip, misc_cfg, val);

}



/**

 * mv88e6352_g2_scratch_port_has_serdes - indicate if a port can have a serdes

 * @chip: chip private data