Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55c0b6ae authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo
Browse files

rtl8xxxu: Use has_s0s1 for REG_S0S1 issues only 



Instead use tx_desc_size() to distinguish between gen1
(8723a/8192c/8188c) and gen2 (8723b/8192e) parts.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 57e42a21

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c

+4 −3
Original line number Diff line number Diff line
@@ -2758,7 +2758,8 @@ static int rtl8xxxu_identify_chip(struct rtl8xxxu_priv *priv) 
	} else if (val32 & SYS_CFG_TYPE_ID) {

		bonding = rtl8xxxu_read32(priv, REG_HPON_FSM);

		bonding &= HPON_FSM_BONDING_MASK;

		if (priv->fops->has_s0s1) {

		if (priv->fops->tx_desc_size ==

		    sizeof(struct rtl8xxxu_txdesc40)) {

			if (bonding == HPON_FSM_BONDING_1T2R) {

				sprintf(priv->chip_name, "8191EU");

				priv->rf_paths = 2;
@@ -7993,7 +7994,7 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw) 
	/*

	 * This should enable thermal meter

	 */

	if (priv->fops->has_s0s1)

	if (priv->fops->tx_desc_size == sizeof(struct rtl8xxxu_txdesc40))

		rtl8xxxu_write_rfreg(priv,

				     RF_A, RF6052_REG_T_METER_8723B, 0x37cf8);

	else
@@ -9867,7 +9868,7 @@ static struct rtl8xxxu_fileops rtl8192eu_fops = { 
	.mbox_ext_reg = REG_HMBOX_EXT0_8723B,

	.mbox_ext_width = 4,

	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc40),

	.has_s0s1 = 1,

	.has_s0s1 = 0,

	.adda_1t_init = 0x0fc01616,

	.adda_1t_path_on = 0x0fc01616,

	.adda_2t_path_on_a = 0x0fc01616,