2019-03-09 10:05:59

by Maxim Zhukov

Subject: [PATCH 0/2] 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(-)

--
2.21.0

2019-03-09 10:04:47

by Maxim Zhukov

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

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(+)

diff --git a/drivers/staging/mt7621-pci/Kconfig b/drivers/staging/mt7621-pci/Kconfig
index d33533872a16..c8fa17cfa807 100644
--- a/drivers/staging/mt7621-pci/Kconfig
+++ b/drivers/staging/mt7621-pci/Kconfig
@@ -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.
--
2.21.0

2019-03-09 10:04:47

by Maxim Zhukov

Subject: [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(-)

diff --git a/drivers/staging/mt7621-eth/mdio.c b/drivers/staging/mt7621-eth/mdio.c
index 5fea6a447eed..142d7a082dd3 100644
--- a/drivers/staging/mt7621-eth/mdio.c
+++ b/drivers/staging/mt7621-eth/mdio.c
@@ -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);
}
--
2.21.0

2019-03-18 07:00:11

by Greg Kroah-Hartman

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

On Sat, Mar 09, 2019 at 12:53:59PM +0300, Maxim Zhukov wrote:
> 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