Commit 797ea240 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

mt76: merge mt76x0/regs.h into mt76x02_regs.h 



Add missed definitions for mt76x0 into mt76x02_regs.h. Remove
mt76x0/regs.h and fixup mt76x0 code to adjust to some diffrent
registers/fields names.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 89e1b1bc

drivers/net/wireless/mediatek/mt76/mt76x0/init.c

+8 −8
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ static void mt76x0_init_usb_dma(struct mt76x0_dev *dev) 


	val = mt76_rr(dev, MT_USB_DMA_CFG);



	val |= MT_USB_DMA_CFG_RX_DROP_OR_PADDING;

	val |= MT_USB_DMA_CFG_RX_DROP_OR_PAD;

	mt76_wr(dev, MT_USB_DMA_CFG, val);

	val &= ~MT_USB_DMA_CFG_RX_DROP_OR_PADDING;

	val &= ~MT_USB_DMA_CFG_RX_DROP_OR_PAD;

	mt76_wr(dev, MT_USB_DMA_CFG, val);

}
@@ -274,12 +274,12 @@ static int mt76x0_init_wcid_attr_mem(struct mt76x0_dev *dev) 


static void mt76x0_reset_counters(struct mt76x0_dev *dev)

{

	mt76_rr(dev, MT_RX_STA_CNT0);

	mt76_rr(dev, MT_RX_STA_CNT1);

	mt76_rr(dev, MT_RX_STA_CNT2);

	mt76_rr(dev, MT_TX_STA_CNT0);

	mt76_rr(dev, MT_TX_STA_CNT1);

	mt76_rr(dev, MT_TX_STA_CNT2);

	mt76_rr(dev, MT_RX_STAT_0);

	mt76_rr(dev, MT_RX_STAT_1);

	mt76_rr(dev, MT_RX_STAT_2);

	mt76_rr(dev, MT_TX_STA_0);

	mt76_rr(dev, MT_TX_STA_1);

	mt76_rr(dev, MT_TX_STA_2);

}



int mt76x0_mac_start(struct mt76x0_dev *dev)

drivers/net/wireless/mediatek/mt76/mt76x0/mac.c

+5 −5
Original line number Diff line number Diff line
@@ -355,8 +355,8 @@ void mt76x0_mac_work(struct work_struct *work) 
		u32 span;

		u64 *stat_base;

	} spans[] = {

		{ MT_RX_STA_CNT0,	3,	dev->stats.rx_stat },

		{ MT_TX_STA_CNT0,	3,	dev->stats.tx_stat },

		{ MT_RX_STAT_0,	3,	dev->stats.rx_stat },

		{ MT_TX_STA_0,	3,	dev->stats.tx_stat },

		{ MT_TX_AGG_STAT,	1,	dev->stats.aggr_stat },

		{ MT_MPDU_DENSITY_CNT,	1,	dev->stats.zero_len_del },

		{ MT_TX_AGG_CNT_BASE0,	8,	&dev->stats.aggr_n[0] },
@@ -566,7 +566,7 @@ u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb, 
	return len;

}



static enum mt76_cipher_type

static enum mt76x02_cipher_type

mt76_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)

{

	memset(key_data, 0, 32);
@@ -595,7 +595,7 @@ mt76_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data) 
int mt76x0_mac_wcid_set_key(struct mt76x0_dev *dev, u8 idx,

			  struct ieee80211_key_conf *key)

{

	enum mt76_cipher_type cipher;

	enum mt76x02_cipher_type cipher;

	u8 key_data[32];

	u8 iv_data[8];

	u32 val;
@@ -636,7 +636,7 @@ int mt76x0_mac_wcid_set_key(struct mt76x0_dev *dev, u8 idx, 
int mt76x0_mac_shared_key_setup(struct mt76x0_dev *dev, u8 vif_idx, u8 key_idx,

			      struct ieee80211_key_conf *key)

{

	enum mt76_cipher_type cipher;

	enum mt76x02_cipher_type cipher;

	u8 key_data[32];

	u32 val;

drivers/net/wireless/mediatek/mt76/mt76x0/main.c

+2 −2
Original line number Diff line number Diff line
@@ -166,8 +166,8 @@ mt76x0_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	if (changed & BSS_CHANGED_BASIC_RATES) {

		mt76_wr(dev, MT_LEGACY_BASIC_RATE, info->basic_rates);

		mt76_wr(dev, MT_HT_FBK_CFG0, 0x65432100);

		mt76_wr(dev, MT_HT_FBK_CFG1, 0xedcba980);

		mt76_wr(dev, MT_VHT_HT_FBK_CFG0, 0x65432100);

		mt76_wr(dev, MT_VHT_HT_FBK_CFG1, 0xedcba980);

		mt76_wr(dev, MT_LG_FBK_CFG0, 0xedcba988);

		mt76_wr(dev, MT_LG_FBK_CFG1, 0x00002100);

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -591,9 +591,9 @@ static int mt76x0_load_firmware(struct mt76x0_dev *dev) 
	mt76_wr(dev, MT_FCE_SKIP_FS, 3);



	val = mt76_rr(dev, MT_USB_DMA_CFG);

	val |= MT_USB_DMA_CFG_TX_WL_DROP;

	val |= MT_USB_DMA_CFG_UDMA_TX_WL_DROP;

	mt76_wr(dev, MT_USB_DMA_CFG, val);

	val &= ~MT_USB_DMA_CFG_TX_WL_DROP;

	val &= ~MT_USB_DMA_CFG_UDMA_TX_WL_DROP;

	mt76_wr(dev, MT_USB_DMA_CFG, val);



	ret = mt76x0_upload_firmware(dev, (const struct mt76_fw *)fw->data);

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

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
#include <linux/debugfs.h>



#include "../mt76.h"

#include "../mt76x02_regs.h"

#include "../mt76x02_mac.h"

#include "regs.h"



#define MT_CALIBRATE_INTERVAL		(4 * HZ)

CRA Git | Maintained and supported by SUSTech CRA and CCSE