Skip to content

Commit

Permalink
phy: sparx5-serdes: add constants to match data
Browse files Browse the repository at this point in the history
We need to handle a few different constants that differ for Sparx5 and
lan969x. Add a new struct: sparx5_serdes_consts for this purpose. We
populate it with an initial field for the number of SERDES'es: sd_max.

Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Link: https://lore.kernel.org/r/20240909-sparx5-lan969x-serdes-driver-v2-2-d695bcb57b84@microchip.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
Daniel Machon authored and Vinod Koul committed Oct 21, 2024
1 parent d41bb5e commit 8e65baf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/phy/microchip/sparx5_serdes.c
Original file line number Diff line number Diff line change
Expand Up @@ -2510,6 +2510,9 @@ static struct sparx5_serdes_io_resource sparx5_serdes_iomap[] = {
static const struct sparx5_serdes_match_data sparx5_desc = {
.iomap = sparx5_serdes_iomap,
.iomap_size = ARRAY_SIZE(sparx5_serdes_iomap),
.consts = {
.sd_max = 33,
},
};

/* Client lookup function, uses serdes index */
Expand All @@ -2526,7 +2529,7 @@ static struct phy *sparx5_serdes_xlate(struct device *dev,
sidx = args->args[0];

/* Check validity: ERR_PTR(-ENODEV) if not valid */
for (idx = 0; idx < SPX5_SERDES_MAX; idx++) {
for (idx = 0; idx < priv->data->consts.sd_max; idx++) {
struct sparx5_serdes_macro *macro =
phy_get_drvdata(priv->phys[idx]);

Expand Down Expand Up @@ -2594,7 +2597,7 @@ static int sparx5_serdes_probe(struct platform_device *pdev)

priv->regs[iomap->id] = iomem + iomap->offset;
}
for (idx = 0; idx < SPX5_SERDES_MAX; idx++) {
for (idx = 0; idx < priv->data->consts.sd_max; idx++) {
err = sparx5_phy_create(priv, idx, &priv->phys[idx]);
if (err)
return err;
Expand Down
5 changes: 5 additions & 0 deletions drivers/phy/microchip/sparx5_serdes.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ enum sparx5_serdes_mode {
SPX5_SD_MODE_SFI,
};

struct sparx5_serdes_consts {
int sd_max;
};

struct sparx5_serdes_match_data {
const struct sparx5_serdes_consts consts;
const struct sparx5_serdes_io_resource *iomap;
int iomap_size;
};
Expand Down

0 comments on commit 8e65baf

Please sign in to comment.