| Message ID | 20250123182234.597665-1-afd@ti.com |
|---|---|
| State | Accepted |
| Commit | 5ab90f40121a9f6a9b368274cd92d0f435dc7cfa |
| Headers | show |
| Series | phy: ti: gmii-sel: Do not use syscon helper to build regmap | expand |
On 12:22-20250123, Andrew Davis wrote: > The syscon helper device_node_to_regmap() is used to fetch a regmap > registered to a device node. It also currently creates this regmap > if the node did not already have a regmap associated with it. This > should only be used on "syscon" nodes. This driver is not such a > device and instead uses device_node_to_regmap() on its own node as > a hacky way to create a regmap for itself. > > This will not work going forward and so we should create our regmap > the normal way by defining our regmap_config, fetching our memory > resource, then using the normal regmap_init_mmio() function. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- Tested-by: Nishanth Menon <nm@ti.com> Vinod, This is part of the fixes TI K3 platforms boot issues reported in https://lore.kernel.org/all/b2413460-ec8b-4c77-99b8-4c32b262439a@ti.com/ on the latest linus master v6.13-5001-gd0d106a2bd21 + linux next-20250123 Total set of patches tested with: https://lore.kernel.org/all/20250119182121.3956546-1-vaishnav.a@ti.com/ https://lore.kernel.org/r/20250123181726.597144-1-afd@ti.com https://lore.kernel.org/r/20250123181913.597304-1-afd@ti.com https://lore.kernel.org/r/20250123182059.597491-1-afd@ti.com https://lore.kernel.org/r/20250123182234.597665-1-afd@ti.com Could we get this routed to master as fixes asap please to get a sane 6.14? Cc Rob and Lee > drivers/phy/ti/phy-gmii-sel.c | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/phy/ti/phy-gmii-sel.c b/drivers/phy/ti/phy-gmii-sel.c > index e0ca59ae31531..ff5d5e29629fa 100644 > --- a/drivers/phy/ti/phy-gmii-sel.c > +++ b/drivers/phy/ti/phy-gmii-sel.c > @@ -424,6 +424,12 @@ static int phy_gmii_sel_init_ports(struct phy_gmii_sel_priv *priv) > return 0; > } > > +static const struct regmap_config phy_gmii_sel_regmap_cfg = { > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > static int phy_gmii_sel_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > @@ -468,7 +474,14 @@ static int phy_gmii_sel_probe(struct platform_device *pdev) > > priv->regmap = syscon_node_to_regmap(node->parent); > if (IS_ERR(priv->regmap)) { > - priv->regmap = device_node_to_regmap(node); > + void __iomem *base; > + > + base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(base)) > + return dev_err_probe(dev, PTR_ERR(base), > + "failed to get base memory resource\n"); > + > + priv->regmap = regmap_init_mmio(dev, base, &phy_gmii_sel_regmap_cfg); > if (IS_ERR(priv->regmap)) > return dev_err_probe(dev, PTR_ERR(priv->regmap), > "Failed to get syscon\n"); > -- > 2.39.2 >
On Thu, 23 Jan 2025 12:22:34 -0600, Andrew Davis wrote: > The syscon helper device_node_to_regmap() is used to fetch a regmap > registered to a device node. It also currently creates this regmap > if the node did not already have a regmap associated with it. This > should only be used on "syscon" nodes. This driver is not such a > device and instead uses device_node_to_regmap() on its own node as > a hacky way to create a regmap for itself. > > [...] Applied, thanks! [1/1] phy: ti: gmii-sel: Do not use syscon helper to build regmap commit: 5ab90f40121a9f6a9b368274cd92d0f435dc7cfa Best regards,
diff --git a/drivers/phy/ti/phy-gmii-sel.c b/drivers/phy/ti/phy-gmii-sel.c index e0ca59ae31531..ff5d5e29629fa 100644 --- a/drivers/phy/ti/phy-gmii-sel.c +++ b/drivers/phy/ti/phy-gmii-sel.c @@ -424,6 +424,12 @@ static int phy_gmii_sel_init_ports(struct phy_gmii_sel_priv *priv) return 0; } +static const struct regmap_config phy_gmii_sel_regmap_cfg = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + static int phy_gmii_sel_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -468,7 +474,14 @@ static int phy_gmii_sel_probe(struct platform_device *pdev) priv->regmap = syscon_node_to_regmap(node->parent); if (IS_ERR(priv->regmap)) { - priv->regmap = device_node_to_regmap(node); + void __iomem *base; + + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return dev_err_probe(dev, PTR_ERR(base), + "failed to get base memory resource\n"); + + priv->regmap = regmap_init_mmio(dev, base, &phy_gmii_sel_regmap_cfg); if (IS_ERR(priv->regmap)) return dev_err_probe(dev, PTR_ERR(priv->regmap), "Failed to get syscon\n");
The syscon helper device_node_to_regmap() is used to fetch a regmap registered to a device node. It also currently creates this regmap if the node did not already have a regmap associated with it. This should only be used on "syscon" nodes. This driver is not such a device and instead uses device_node_to_regmap() on its own node as a hacky way to create a regmap for itself. This will not work going forward and so we should create our regmap the normal way by defining our regmap_config, fetching our memory resource, then using the normal regmap_init_mmio() function. Signed-off-by: Andrew Davis <afd@ti.com> --- drivers/phy/ti/phy-gmii-sel.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)