From bdcd45dd04e0fa6a13cd3dc2f490009d6dd4e33c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 30 Oct 2019 11:02:38 +0100 Subject: [PATCH] mt76: mt7615: add missing register init for dual-wiphy support Initialize low-power beacon mode setting Signed-off-by: Felix Fietkau --- mt7615/init.c | 6 +++--- mt7615/regs.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mt7615/init.c b/mt7615/init.c index 45a6d7ae..365161d7 100644 --- a/mt7615/init.c +++ b/mt7615/init.c @@ -13,9 +13,9 @@ static void mt7615_phy_init(struct mt7615_dev *dev) { - /* disable band 0 rf low power beacon mode */ - mt76_rmw(dev, MT_WF_PHY_WF2_RFCTRL0, MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN, - MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN); + /* disable rf low power beacon mode */ + mt76_set(dev, MT_WF_PHY_WF2_RFCTRL0(0), MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN); + mt76_set(dev, MT_WF_PHY_WF2_RFCTRL0(1), MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN); } static void mt7615_mac_init(struct mt7615_dev *dev) diff --git a/mt7615/regs.h b/mt7615/regs.h index afb1eb08..a805561d 100644 --- a/mt7615/regs.h +++ b/mt7615/regs.h @@ -81,7 +81,7 @@ #define MT_WF_PHY_BASE 0x10000 #define MT_WF_PHY(ofs) (MT_WF_PHY_BASE + (ofs)) -#define MT_WF_PHY_WF2_RFCTRL0 MT_WF_PHY(0x1900) +#define MT_WF_PHY_WF2_RFCTRL0(n) MT_WF_PHY(0x1900 + ((n) * 0x400)) #define MT_WF_PHY_WF2_RFCTRL0_LPBCN_EN BIT(9) #define MT_WF_PHY_R0_PHYMUX_5(_phy) MT_WF_PHY(0x0614 + ((_phy) << 9))