Skip to content

L
linux
Commit 60d18ddb authored by Bitterblue Smith's avatar Bitterblue Smith Committed by Kalle Valo
Browse files
Options

wifi: rtl8xxxu: Use u32_get_bits in *_identify_chip 

It simplifies the code a bit.
Suggested-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarBitterblue Smith <rtl8821cerfe2@gmail.com>
Reviewed-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/68f94284-3728-7b75-2b7b-64fae8af6bc5@gmail.com
parent 9b00565a
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 15 deletions
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
View file @ 60d18ddb
...@@ -335,8 +335,7 @@ static int rtl8188fu_identify_chip(struct rtl8xxxu_priv *priv) ...@@ -335,8 +335,7 @@ static int rtl8188fu_identify_chip(struct rtl8xxxu_priv *priv)
priv->has_wifi = 1; priv->has_wifi = 1;
sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG); sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);
priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >> priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);
SYS_CFG_CHIP_VERSION_SHIFT;
if (sys_cfg & SYS_CFG_TRP_VAUX_EN) { if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {
dev_info(dev, "Unsupported test chip\n"); dev_info(dev, "Unsupported test chip\n");
ret = -ENOTSUPP; ret = -ENOTSUPP;
......
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
View file @ 60d18ddb
...@@ -333,8 +333,7 @@ static int rtl8192cu_identify_chip(struct rtl8xxxu_priv *priv) ...@@ -333,8 +333,7 @@ static int rtl8192cu_identify_chip(struct rtl8xxxu_priv *priv)
int ret = 0; int ret = 0;
sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG); sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);
priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >> priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);
SYS_CFG_CHIP_VERSION_SHIFT;
if (sys_cfg & SYS_CFG_TRP_VAUX_EN) { if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {
dev_info(dev, "Unsupported test chip\n"); dev_info(dev, "Unsupported test chip\n");
ret = -ENOTSUPP; ret = -ENOTSUPP;
...@@ -371,7 +370,7 @@ static int rtl8192cu_identify_chip(struct rtl8xxxu_priv *priv) ...@@ -371,7 +370,7 @@ static int rtl8192cu_identify_chip(struct rtl8xxxu_priv *priv)
rtl8xxxu_identify_vendor_1bit(priv, vendor); rtl8xxxu_identify_vendor_1bit(priv, vendor);
val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS); val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS);
priv->rom_rev = (val32 & GPIO_RF_RL_ID) >> 28; priv->rom_rev = u32_get_bits(val32, GPIO_RF_RL_ID);
rtl8xxxu_config_endpoints_sie(priv); rtl8xxxu_config_endpoints_sie(priv);
......
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
View file @ 60d18ddb
...@@ -485,8 +485,7 @@ static int rtl8192eu_identify_chip(struct rtl8xxxu_priv *priv) ...@@ -485,8 +485,7 @@ static int rtl8192eu_identify_chip(struct rtl8xxxu_priv *priv)
int ret = 0; int ret = 0;
sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG); sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);
priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >> priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);
SYS_CFG_CHIP_VERSION_SHIFT;
if (sys_cfg & SYS_CFG_TRP_VAUX_EN) { if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {
dev_info(dev, "Unsupported test chip\n"); dev_info(dev, "Unsupported test chip\n");
ret = -ENOTSUPP; ret = -ENOTSUPP;
...@@ -512,7 +511,7 @@ static int rtl8192eu_identify_chip(struct rtl8xxxu_priv *priv) ...@@ -512,7 +511,7 @@ static int rtl8192eu_identify_chip(struct rtl8xxxu_priv *priv)
rtl8xxxu_identify_vendor_2bits(priv, vendor); rtl8xxxu_identify_vendor_2bits(priv, vendor);
val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS); val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS);
priv->rom_rev = (val32 & GPIO_RF_RL_ID) >> 28; priv->rom_rev = u32_get_bits(val32, GPIO_RF_RL_ID);
rtl8xxxu_config_endpoints_sie(priv); rtl8xxxu_config_endpoints_sie(priv);
......
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
View file @ 60d18ddb
...@@ -136,8 +136,7 @@ static int rtl8723au_identify_chip(struct rtl8xxxu_priv *priv) ...@@ -136,8 +136,7 @@ static int rtl8723au_identify_chip(struct rtl8xxxu_priv *priv)
int ret = 0; int ret = 0;
sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG); sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);
priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >> priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);
SYS_CFG_CHIP_VERSION_SHIFT;
if (sys_cfg & SYS_CFG_TRP_VAUX_EN) { if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {
dev_info(dev, "Unsupported test chip\n"); dev_info(dev, "Unsupported test chip\n");
ret = -ENOTSUPP; ret = -ENOTSUPP;
...@@ -165,7 +164,7 @@ static int rtl8723au_identify_chip(struct rtl8xxxu_priv *priv) ...@@ -165,7 +164,7 @@ static int rtl8723au_identify_chip(struct rtl8xxxu_priv *priv)
rtl8xxxu_identify_vendor_1bit(priv, vendor); rtl8xxxu_identify_vendor_1bit(priv, vendor);
val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS); val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS);
priv->rom_rev = (val32 & GPIO_RF_RL_ID) >> 28; priv->rom_rev = u32_get_bits(val32, GPIO_RF_RL_ID);
rtl8xxxu_config_endpoints_sie(priv); rtl8xxxu_config_endpoints_sie(priv);
......
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
View file @ 60d18ddb
...@@ -311,8 +311,7 @@ static int rtl8723bu_identify_chip(struct rtl8xxxu_priv *priv) ...@@ -311,8 +311,7 @@ static int rtl8723bu_identify_chip(struct rtl8xxxu_priv *priv)
int ret = 0; int ret = 0;
sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG); sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG);
priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >> priv->chip_cut = u32_get_bits(sys_cfg, SYS_CFG_CHIP_VERSION_MASK);
SYS_CFG_CHIP_VERSION_SHIFT;
if (sys_cfg & SYS_CFG_TRP_VAUX_EN) { if (sys_cfg & SYS_CFG_TRP_VAUX_EN) {
dev_info(dev, "Unsupported test chip\n"); dev_info(dev, "Unsupported test chip\n");
ret = -ENOTSUPP; ret = -ENOTSUPP;
...@@ -338,7 +337,7 @@ static int rtl8723bu_identify_chip(struct rtl8xxxu_priv *priv) ...@@ -338,7 +337,7 @@ static int rtl8723bu_identify_chip(struct rtl8xxxu_priv *priv)
rtl8xxxu_identify_vendor_2bits(priv, vendor); rtl8xxxu_identify_vendor_2bits(priv, vendor);
val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS); val32 = rtl8xxxu_read32(priv, REG_GPIO_OUTSTS);
priv->rom_rev = (val32 & GPIO_RF_RL_ID) >> 28; priv->rom_rev = u32_get_bits(val32, GPIO_RF_RL_ID);
rtl8xxxu_config_endpoints_sie(priv); rtl8xxxu_config_endpoints_sie(priv);
......
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
View file @ 60d18ddb
...@@ -315,7 +315,6 @@ ...@@ -315,7 +315,6 @@
#define SYS_CFG_SPS_SEL BIT(24) /* 1:LDO regulator mode; #define SYS_CFG_SPS_SEL BIT(24) /* 1:LDO regulator mode;
0:Switching regulator mode*/ 0:Switching regulator mode*/
#define SYS_CFG_CHIP_VERSION_MASK 0xf000 /* Bit 12 - 15 */ #define SYS_CFG_CHIP_VERSION_MASK 0xf000 /* Bit 12 - 15 */
#define SYS_CFG_CHIP_VERSION_SHIFT 12
#define REG_GPIO_OUTSTS 0x00f4 /* For RTL8723 only. */ #define REG_GPIO_OUTSTS 0x00f4 /* For RTL8723 only. */
#define GPIO_EFS_HCI_SEL (BIT(0) | BIT(1)) #define GPIO_EFS_HCI_SEL (BIT(0) | BIT(1))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7