net: dsa: bcm_sf2: Ensure correct sub-node is parsed
PATCH 1/1 net: dsa: bcm_sf2: Ensure correct sub-node is parsed
When the bcm_sf2 was converted into a proper platform device driver and used the new dsa_register_switch() interface, we would still be parsing the legacy DSA node that contained all the port information since the platform firmware has intentionally maintained backward and forward compatibility to client programs. Ensure that we do parse the correct node, which is "ports" per the revised DSA binding.
--- drivers/net/dsa/bcm_sf2.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/dsa/bcm_sf2.c +6 -1
@@ -1079,6 +1079,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)const struct bcm_sf2_of_data *data;struct b53_platform_data *pdata;struct dsa_switch_ops *ops; +struct device_node *ports;struct bcm_sf2_priv *priv;struct b53_device *dev;struct dsa_switch *ds;
@@ -1146,7 +1147,11 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)set_bit (0 , priv->cfp.used);set_bit (0 , priv->cfp.unique); -bcm_sf2_identify_ports (priv, dn->child); + ports =of_find_node_by_name (dn,"ports" ); +if (ports) { +bcm_sf2_identify_ports (priv, ports); +of_node_put (ports); + } priv->irq0 =irq_of_parse_and_map (dn,0 ); priv->irq1 =irq_of_parse_and_map (dn,1 );
Signature · 1 line
2.17.1
Quoted 9 lines · Florian Fainelli
When the
bcm_sf2was converted into a proper platform device driver and used the newdsa_register_switch()interface, we would still be parsing the legacy DSA node that contained all the port information since the platform firmware has intentionally maintained backward and forward compatibility to client programs. Ensure that we do parse the correct node, which is "ports" per the revised DSA binding.Fixes d9338023fb8e ("net: dsa: bcm_sf2: Make it a real platform device driver")Signed-off-by Florian Fainelli <[email protected]>
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Sun, 5 Apr 2020 13:00:30 -0700
Quoted 9 lines
When the
bcm_sf2was converted into a proper platform device driver and used the newdsa_register_switch()interface, we would still be parsing the legacy DSA node that contained all the port information since the platform firmware has intentionally maintained backward and forward compatibility to client programs. Ensure that we do parse the correct node, which is "ports" per the revised DSA binding.Fixes d9338023fb8e ("net: dsa: bcm_sf2: Make it a real platform device driver")Signed-off-by Florian Fainelli <[email protected]>
Applied and queued up for -stable, thanks Florian.