Skip to contentSkip to conversation

staging, mt7621: fix build

PATCH In review Maxim Zhukov 2 participants 4 messages Mar 9, 2019 – Mar 18, 2019

Subsystems (2)
Staging Arm MediaTek
lore
Share & tools
lore

Maxim Zhukov

author
#0 lore raw

cover staging, mt7621: fix build

Build fixes for mt7621

Maxim Zhukov (2):
staging, mt7621-eth: fix api for linkmode bitmap staging, mt7621-pci: fix build without pci support

 drivers/staging/mt7621-eth/mdio.c  | 12 +++++++++---
 drivers/staging/mt7621-pci/Kconfig |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH 1/2 staging, mt7621-eth: fix api for linkmode bitmap

Start using new api for linkmode bitmap

Fixed build after 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")

Signed-off-by Maxim Zhukov <[email protected]>
---
 drivers/staging/mt7621-eth/mdio.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/staging/mt7621-eth/mdio.c +9 -3
index 5fea6a447eed..142d7a082dd3 100644
@@ -89,8 +89,12 @@ int mtk_connect_phy_node(struct mtk_eth *eth, struct mtk_mac *mac,
 		return -ENODEV;
 	}
 
-	phydev->supported &= PHY_1000BT_FEATURES;
-	phydev->advertising = phydev->supported;
+	linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
+			 phydev->supported);
+	linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
+			 phydev->supported);
+
+	linkmode_copy(phydev->advertising, phydev->supported);
 
 	dev_info(eth->dev,
 		 "connected port %d to PHY at %s [uid=%08x, driver=%s]\n",

@@ -113,7 +117,9 @@ static void phy_init(struct mtk_eth *eth, struct mtk_mac *mac,
 	phy->speed = 0;
 	phy->duplex = 0;
 	phy_set_max_speed(phy, SPEED_100);
-	phy->advertising = phy->supported | ADVERTISED_Autoneg;
+	linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
+			 phy->advertising);
+
 
 	phy_start_aneg(phy);
 }
Signature · 1 line
2.21.0
maintainer
#2 lore raw

Re: [PATCH 1/2] staging, mt7621-eth: fix api for linkmode bitmap

Quoted 8 lines · Maxim Zhukov

Start using new api for linkmode bitmap

Fixed build after 3c1bcc8614db ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")

Signed-off-by Maxim Zhukov <[email protected]>
---
 drivers/staging/mt7621-eth/mdio.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

This driver is now dropped from the tree, so no need to fix any build issues :)

thanks,

greg k-h

author
#3 lore raw

PATCH 2/2 staging, mt7621-pci: fix build without pci support

In reply to Maxim Zhukov

Add depends on PCI for PCI_MT7621

Signed-off-by Maxim Zhukov <[email protected]>
---
 drivers/staging/mt7621-pci/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/staging/mt7621-pci/Kconfig +1 -0
index d33533872a16..c8fa17cfa807 100644
@@ -1,6 +1,7 @@
 config PCI_MT7621
 	tristate "MediaTek MT7621 PCI Controller"
 	depends on RALINK
+	depends on PCI
 	select PCI_DRIVERS_GENERIC
 	help
 	  This selects a driver for the MediaTek MT7621 PCI Controller.
Signature · 1 line
2.21.0