git.openwrt.org Git - openwrt/staging/wigyori.git/blob

   1 From 5c5b0c444be3e851046f1c1074459b8d15d2a0f9 Mon Sep 17 00:00:00 2001
   2 From: Robert Marko <robimarko@gmail.com>
   3 Date: Tue, 27 Feb 2024 18:54:21 +0100
   4 Subject: [PATCH 1/2] net: dsa: mv88e6xxx: rename
   5  mv88e6xxx_g2_scratch_gpio_set_smi
   6
   7 The name mv88e6xxx_g2_scratch_gpio_set_smi is a bit ambiguous as it appears
   8 to only be applicable to the 6390 family, so lets rename it to
   9 mv88e6390_g2_scratch_gpio_set_smi to make it more obvious.
  10
  11 Signed-off-by: Robert Marko <robimarko@gmail.com>
  12 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  13 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  14 ---
  15  drivers/net/dsa/mv88e6xxx/chip.c            | 2 +-
  16  drivers/net/dsa/mv88e6xxx/global2.h         | 2 +-
  17  drivers/net/dsa/mv88e6xxx/global2_scratch.c | 4 ++--
  18  3 files changed, 4 insertions(+), 4 deletions(-)
  19
  20 --- a/drivers/net/dsa/mv88e6xxx/chip.c
  21 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
  22 @@ -3669,7 +3669,7 @@ static int mv88e6xxx_mdio_register(struc
  23
  24         if (external) {
  25                 mv88e6xxx_reg_lock(chip);
  26 -               err = mv88e6xxx_g2_scratch_gpio_set_smi(chip, true);
  27 +               err = mv88e6390_g2_scratch_gpio_set_smi(chip, true);
  28                 mv88e6xxx_reg_unlock(chip);
  29
  30                 if (err)
  31 --- a/drivers/net/dsa/mv88e6xxx/global2.h
  32 +++ b/drivers/net/dsa/mv88e6xxx/global2.h
  33 @@ -378,7 +378,7 @@ extern const struct mv88e6xxx_avb_ops mv
  34
  35  extern const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops;
  36
  37 -int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
  38 +int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
  39                                       bool external);
  40  int mv88e6352_g2_scratch_port_has_serdes(struct mv88e6xxx_chip *chip, int port);
  41  int mv88e6xxx_g2_atu_stats_set(struct mv88e6xxx_chip *chip, u16 kind, u16 bin);
  42 --- a/drivers/net/dsa/mv88e6xxx/global2_scratch.c
  43 +++ b/drivers/net/dsa/mv88e6xxx/global2_scratch.c
  44 @@ -240,7 +240,7 @@ const struct mv88e6xxx_gpio_ops mv88e635
  45  };
  46
  47  /**
  48 - * mv88e6xxx_g2_scratch_gpio_set_smi - set gpio muxing for external smi
  49 + * mv88e6390_g2_scratch_gpio_set_smi - set gpio muxing for external smi
  50   * @chip: chip private data
  51   * @external: set mux for external smi, or free for gpio usage
  52   *
  53 @@ -248,7 +248,7 @@ const struct mv88e6xxx_gpio_ops mv88e635
  54   * an external SMI interface, or they may be made free for other
  55   * GPIO uses.
  56   */
  57 -int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
  58 +int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,
  59                                       bool external)
  60  {
  61         int misc_cfg = MV88E6352_G2_SCRATCH_MISC_CFG;