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

   1 From 4667a1db2f550d23e01ba655fce331196ead6e92 Mon Sep 17 00:00:00 2001
   2 From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
   3 Date: Fri, 9 Feb 2024 02:03:40 -0300
   4 Subject: net: dsa: realtek: keep variant reference in
   5  realtek_priv
   6
   7 Instead of copying values from the variant, we can keep a reference in
   8 realtek_priv.
   9
  10 This is a preliminary change for sharing code betwen interfaces. It will
  11 allow to move most of the probe into a common module while still allow
  12 code specific to each interface to read variant fields.
  13
  14 Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
  15 Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
  16 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
  17 Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
  18 Signed-off-by: David S. Miller <davem@davemloft.net>
  19 ---
  20  drivers/net/dsa/realtek/realtek-mdio.c |  4 +---
  21  drivers/net/dsa/realtek/realtek-smi.c  | 10 ++++------
  22  drivers/net/dsa/realtek/realtek.h      |  5 ++---
  23  3 files changed, 7 insertions(+), 12 deletions(-)
  24
  25 --- a/drivers/net/dsa/realtek/realtek-mdio.c
  26 +++ b/drivers/net/dsa/realtek/realtek-mdio.c
  27 @@ -196,9 +196,7 @@ int realtek_mdio_probe(struct mdio_devic
  28         priv->dev = &mdiodev->dev;
  29         priv->chip_data = (void *)priv + sizeof(*priv);
  30
  31 -       priv->clk_delay = var->clk_delay;
  32 -       priv->cmd_read = var->cmd_read;
  33 -       priv->cmd_write = var->cmd_write;
  34 +       priv->variant = var;
  35         priv->ops = var->ops;
  36
  37         priv->write_reg_noack = realtek_mdio_write;
  38 --- a/drivers/net/dsa/realtek/realtek-smi.c
  39 +++ b/drivers/net/dsa/realtek/realtek-smi.c
  40 @@ -46,7 +46,7 @@
  41
  42  static inline void realtek_smi_clk_delay(struct realtek_priv *priv)
  43  {
  44 -       ndelay(priv->clk_delay);
  45 +       ndelay(priv->variant->clk_delay);
  46  }
  47
  48  static void realtek_smi_start(struct realtek_priv *priv)
  49 @@ -209,7 +209,7 @@ static int realtek_smi_read_reg(struct r
  50         realtek_smi_start(priv);
  51
  52         /* Send READ command */
  53 -       ret = realtek_smi_write_byte(priv, priv->cmd_read);
  54 +       ret = realtek_smi_write_byte(priv, priv->variant->cmd_read);
  55         if (ret)
  56                 goto out;
  57
  58 @@ -250,7 +250,7 @@ static int realtek_smi_write_reg(struct
  59         realtek_smi_start(priv);
  60
  61         /* Send WRITE command */
  62 -       ret = realtek_smi_write_byte(priv, priv->cmd_write);
  63 +       ret = realtek_smi_write_byte(priv, priv->variant->cmd_write);
  64         if (ret)
  65                 goto out;
  66
  67 @@ -459,9 +459,7 @@ int realtek_smi_probe(struct platform_de
  68
  69         /* Link forward and backward */
  70         priv->dev = dev;
  71 -       priv->clk_delay = var->clk_delay;
  72 -       priv->cmd_read = var->cmd_read;
  73 -       priv->cmd_write = var->cmd_write;
  74 +       priv->variant = var;
  75         priv->ops = var->ops;
  76
  77         priv->setup_interface = realtek_smi_setup_mdio;
  78 --- a/drivers/net/dsa/realtek/realtek.h
  79 +++ b/drivers/net/dsa/realtek/realtek.h
  80 @@ -58,9 +58,8 @@ struct realtek_priv {
  81         struct mii_bus          *bus;
  82         int                     mdio_addr;
  83
  84 -       unsigned int            clk_delay;
  85 -       u8                      cmd_read;
  86 -       u8                      cmd_write;
  87 +       const struct realtek_variant *variant;
  88 +
  89         spinlock_t              lock; /* Locks around command writes */
  90         struct dsa_switch       *ds;
  91         struct irq_domain       *irqdomain;