In order to support both ACPI and DT, modify the generic
DSA code to use device_/fwnode_ equivalent routines.
No functional change is introduced by this patch.
Signed-off-by: Marcin Wojtas <[email protected]>
---
drivers/net/dsa/mv88e6xxx/chip.c | 53 ++++++++++----------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 0b49d243e00b..556defa4379d 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3278,7 +3278,7 @@ static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port)
static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
{
- struct device_node *phy_handle = NULL;
+ struct fwnode_handle *phy_handle = NULL;
struct dsa_switch *ds = chip->ds;
struct dsa_port *dp;
int tx_amp;
@@ -3475,15 +3475,15 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
if (chip->info->ops->serdes_set_tx_amplitude) {
dp = dsa_to_port(ds, port);
if (dp)
- phy_handle = of_parse_phandle(dp->dn, "phy-handle", 0);
+ phy_handle = fwnode_find_reference(dp->fwnode, "phy-handle", 0);
- if (phy_handle && !of_property_read_u32(phy_handle,
- "tx-p2p-microvolt",
- &tx_amp))
+ if (!IS_ERR(phy_handle) && !fwnode_property_read_u32(phy_handle,
+ "tx-p2p-microvolt",
+ &tx_amp))
err = chip->info->ops->serdes_set_tx_amplitude(chip,
port, tx_amp);
- if (phy_handle) {
- of_node_put(phy_handle);
+ if (!IS_ERR(phy_handle)) {
+ fwnode_handle_put(phy_handle);
if (err)
return err;
}
@@ -3867,10 +3867,11 @@ static int mv88e6xxx_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
}
static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
- struct device_node *np,
+ struct fwnode_handle *fwnode,
bool external)
{
static int index;
+ struct device_node *np = to_of_node(fwnode);
struct mv88e6xxx_mdio_bus *mdio_bus;
struct mii_bus *bus;
int err;
@@ -3949,18 +3950,18 @@ static void mv88e6xxx_mdios_unregister(struct mv88e6xxx_chip *chip)
}
static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,
- struct device_node *np)
+ struct fwnode_handle *fwnode)
{
- struct device_node *child;
+ struct fwnode_handle *child;
int err;
/* Always register one mdio bus for the internal/default mdio
* bus. This maybe represented in the device tree, but is
* optional.
*/
- child = of_get_child_by_name(np, "mdio");
+ child = fwnode_get_named_child_node(fwnode, "mdio");
err = mv88e6xxx_mdio_register(chip, child, false);
- of_node_put(child);
+ fwnode_handle_put(child);
if (err)
return err;
@@ -3968,13 +3969,13 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,
* which say they are compatible with the external mdio
* bus.
*/
- for_each_available_child_of_node(np, child) {
- if (of_device_is_compatible(
- child, "marvell,mv88e6xxx-mdio-external")) {
+ fwnode_for_each_available_child_node(fwnode, child) {
+ if (fwnode_property_match_string(child, "compatible",
+ "marvell,mv88e6xxx-mdio-external") == 0) {
err = mv88e6xxx_mdio_register(chip, child, true);
if (err) {
mv88e6xxx_mdios_unregister(chip);
- of_node_put(child);
+ fwnode_handle_put(child);
return err;
}
}
@@ -6962,16 +6963,16 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
struct dsa_mv88e6xxx_pdata *pdata = mdiodev->dev.platform_data;
const struct mv88e6xxx_info *compat_info = NULL;
struct device *dev = &mdiodev->dev;
- struct device_node *np = dev->of_node;
+ struct fwnode_handle *fwnode = dev->fwnode;
struct mv88e6xxx_chip *chip;
int port;
int err;
- if (!np && !pdata)
+ if (!fwnode && !pdata)
return -EINVAL;
- if (np)
- compat_info = of_device_get_match_data(dev);
+ if (fwnode)
+ compat_info = device_get_match_data(dev);
if (pdata) {
compat_info = pdata_device_get_match_data(dev);
@@ -7030,9 +7031,9 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
mv88e6xxx_phy_init(chip);
if (chip->info->ops->get_eeprom) {
- if (np)
- of_property_read_u32(np, "eeprom-length",
- &chip->eeprom_len);
+ if (fwnode)
+ device_property_read_u32(dev, "eeprom-length",
+ &chip->eeprom_len);
else
chip->eeprom_len = pdata->eeprom_len;
}
@@ -7043,8 +7044,8 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
if (err)
goto out;
- if (np) {
- chip->irq = of_irq_get(np, 0);
+ if (fwnode) {
+ chip->irq = fwnode_irq_get(fwnode, 0);
if (chip->irq == -EPROBE_DEFER) {
err = chip->irq;
goto out;
@@ -7082,7 +7083,7 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
if (err)
goto out_g1_atu_prob_irq;
- err = mv88e6xxx_mdios_register(chip, np);
+ err = mv88e6xxx_mdios_register(chip, fwnode);
if (err)
goto out_g1_vtu_prob_irq;
--
2.29.0
On Mon, Jun 20, 2022 at 05:02:24PM +0200, Marcin Wojtas wrote:
> In order to support both ACPI and DT, modify the generic
> DSA code to use device_/fwnode_ equivalent routines.
> No functional change is introduced by this patch.
...
> int err;
>
> - if (!np && !pdata)
> + if (!fwnode && !pdata)
> return -EINVAL;
Sounds like redundant check
if (pdata)
...
else
compat_info = ...
if (!compat_info)
return -EINVAL
?
> - if (np)
> - compat_info = of_device_get_match_data(dev);
> + if (fwnode)
> + compat_info = device_get_match_data(dev);
>
> if (pdata) {
Missed 'else' even in the original code (see above)?
> compat_info = pdata_device_get_match_data(dev);
--
With Best Regards,
Andy Shevchenko
On Mon, Jun 20, 2022 at 05:02:24PM +0200, Marcin Wojtas wrote:
> In order to support both ACPI and DT, modify the generic
> DSA code to use device_/fwnode_ equivalent routines.
> No functional change is introduced by this patch.
...
> @@ -6962,16 +6963,16 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
> struct dsa_mv88e6xxx_pdata *pdata = mdiodev->dev.platform_data;
> const struct mv88e6xxx_info *compat_info = NULL;
> struct device *dev = &mdiodev->dev;
> - struct device_node *np = dev->of_node;
> + struct fwnode_handle *fwnode = dev->fwnode;
Forgot to mention: dev_fwnode() or respective device_property_ API, please.
--
With Best Regards,
Andy Shevchenko
pon., 20 cze 2022 o 20:04 Andy Shevchenko
<[email protected]> napisał(a):
>
> On Mon, Jun 20, 2022 at 05:02:24PM +0200, Marcin Wojtas wrote:
> > In order to support both ACPI and DT, modify the generic
> > DSA code to use device_/fwnode_ equivalent routines.
> > No functional change is introduced by this patch.
>
> ...
>
> > @@ -6962,16 +6963,16 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
> > struct dsa_mv88e6xxx_pdata *pdata = mdiodev->dev.platform_data;
> > const struct mv88e6xxx_info *compat_info = NULL;
> > struct device *dev = &mdiodev->dev;
> > - struct device_node *np = dev->of_node;
> > + struct fwnode_handle *fwnode = dev->fwnode;
>
> Forgot to mention: dev_fwnode() or respective device_property_ API, please.
>
I'll update changes to use the device_property_ API.
Thanks,
Marcin
pon., 20 cze 2022 o 20:03 Andy Shevchenko
<[email protected]> napisał(a):
>
> On Mon, Jun 20, 2022 at 05:02:24PM +0200, Marcin Wojtas wrote:
> > In order to support both ACPI and DT, modify the generic
> > DSA code to use device_/fwnode_ equivalent routines.
> > No functional change is introduced by this patch.
>
> ...
>
> > int err;
> >
> > - if (!np && !pdata)
> > + if (!fwnode && !pdata)
> > return -EINVAL;
>
> Sounds like redundant check
>
> if (pdata)
> ...
> else
> compat_info = ...
> if (!compat_info)
> return -EINVAL
>
> ?
>
> > - if (np)
> > - compat_info = of_device_get_match_data(dev);
> > + if (fwnode)
> > + compat_info = device_get_match_data(dev);
> >
> > if (pdata) {
>
> Missed 'else' even in the original code (see above)?
>
fwnode/np is mutually exclusive with pdata, but imo nothing wrong with
adding 'else' here or update the condition as suggested above.
Thanks,
Marcin
> > compat_info = pdata_device_get_match_data(dev);
>
>
> --
> With Best Regards,
> Andy Shevchenko
>
>