system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-07 20:05:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'net-dsa-bcm_sf2-Additional-DT-changes'

Browse source 
Florian Fainelli says:

====================
net: dsa: bcm_sf2: Additional DT changes

This patch series includes some additional changes to the bcm_sf2 in
order to support the Device Tree firmwares provided on such platforms.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2020-09-23 17:51:16 -07:00
parent 9d33ffaaf3 0fa45ee3c1
commit 3fc826f121
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/net/dsa/bcm_sf2.c
View file

@ -457,6 +457,7 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
{
struct device_node *port;
unsigned int port_num;
struct property *prop;
phy_interface_t mode;
int err;
@ -483,6 +484,16 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
if (of_property_read_bool(port, "brcm,use-bcm-hdr"))
priv->brcm_tag_mask |= 1 << port_num;
/* Ensure that port 5 is not picked up as a DSA CPU port
* flavour but a regular port instead. We should be using
* devlink to be able to set the port flavour.
*/
if (port_num == 5 && priv->type == BCM7278_DEVICE_ID) {
prop = of_find_property(port, "ethernet", NULL);
if (prop)
of_remove_property(port, prop);
}
}
}
@ -527,7 +538,7 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)
* driver.
*/
if (of_machine_is_compatible("brcm,bcm7445d0"))
priv->indir_phy_mask |= (1 << BRCM_PSEUDO_PHY_ADDR);
priv->indir_phy_mask |= (1 << BRCM_PSEUDO_PHY_ADDR) | (1 << 0);
else
priv->indir_phy_mask = 0;