Commit 02fbf819 authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

mt76: mt7663s: rely on mcu reg access utility 



rely on mcu reg access utility and drop the duplicated code.

Acked-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 87f9bf24

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+0 −28
Original line number Diff line number Diff line
@@ -2769,31 +2769,3 @@ int mt7615_mcu_set_roc(struct mt7615_phy *phy, struct ieee80211_vif *vif, 
	return mt76_mcu_send_msg(&dev->mt76, MCU_CMD_SET_ROC, &req,

				 sizeof(req), false);

}
 


u32 mt7615_mcu_reg_rr(struct mt76_dev *dev, u32 offset)

{

	struct {

		__le32 addr;

		__le32 val;

	} __packed req = {

		.addr = cpu_to_le32(offset),

	};



	return mt76_mcu_send_msg(dev, MCU_CMD_REG_READ, &req, sizeof(req),

				 true);

}

EXPORT_SYMBOL_GPL(mt7615_mcu_reg_rr);



void mt7615_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val)

{

	struct {

		__le32 addr;

		__le32 val;

	} __packed req = {

		.addr = cpu_to_le32(offset),

		.val = cpu_to_le32(val),

	};



	mt76_mcu_send_msg(dev, MCU_CMD_REG_WRITE, &req, sizeof(req), false);

}

EXPORT_SYMBOL_GPL(mt7615_mcu_reg_wr);

drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h

+0 −2
Original line number Diff line number Diff line
@@ -553,8 +553,6 @@ int mt7615_mac_set_beacon_filter(struct mt7615_phy *phy, 
int mt7615_mcu_set_bss_pm(struct mt7615_dev *dev, struct ieee80211_vif *vif,

			  bool enable);

int __mt7663_load_firmware(struct mt7615_dev *dev);

u32 mt7615_mcu_reg_rr(struct mt76_dev *dev, u32 offset);

void mt7615_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val);

void mt7615_coredump_work(struct work_struct *work);



void mt7622_trigger_hif_int(struct mt7615_dev *dev, bool en);

drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c

+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ int mt7663s_mcu_init(struct mt7615_dev *dev) 
		.mcu_skb_send_msg = mt7663s_mcu_send_message,

		.mcu_parse_response = mt7615_mcu_parse_response,

		.mcu_restart = mt7615_mcu_restart,

		.mcu_rr = mt7615_mcu_reg_rr,

		.mcu_wr = mt7615_mcu_reg_wr,

		.mcu_rr = mt76_connac_mcu_reg_rr,

		.mcu_wr = mt76_connac_mcu_reg_wr,

	};

	struct mt7615_mcu_ops *mcu_ops;

	int ret;