sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wireless/bcm430xx: rename chip minor id to 'x'

Browse Source 
rename 4301x chip minor id to 'x' to compatible more versions of variant of bcm430xx

Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-06-14 14:36:58 +08:00 committed by Xiang Xiao
parent 4659e00fac
commit f6b8cc1407
6 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/wireless/ieee80211/bcm43xxx/Kconfig
View File

@ -11,8 +11,8 @@ config IEEE80211_BROADCOM_HAVE_CLM
bool bool
default n default n
config IEEE80211_BROADCOM_BCM43013 config IEEE80211_BROADCOM_BCM4301X
bool "Broadcom 43013 chip support" bool "Broadcom 4301x chip support"
depends on IEEE80211_BROADCOM_FULLMAC depends on IEEE80211_BROADCOM_FULLMAC
default n default n
select IEEE80211_BROADCOM_HAVE_CLM select IEEE80211_BROADCOM_HAVE_CLM
@ -37,7 +37,7 @@ config IEEE80211_BROADCOM_BCM43455
config IEEE80211_BROADCOM_FWFILES config IEEE80211_BROADCOM_FWFILES
bool "Firmware files" bool "Firmware files"
default y default y
depends on IEEE80211_BROADCOM_BCM43013 || \ depends on IEEE80211_BROADCOM_BCM4301X || \
IEEE80211_BROADCOM_BCM43362 || \ IEEE80211_BROADCOM_BCM43362 || \
IEEE80211_BROADCOM_BCM43438 || \ IEEE80211_BROADCOM_BCM43438 || \
IEEE80211_BROADCOM_BCM43455 IEEE80211_BROADCOM_BCM43455

4
drivers/wireless/ieee80211/bcm43xxx/Make.defs
View File

@ -33,8 +33,8 @@ ifeq ($(CONFIG_IEEE80211_BROADCOM_FULLMAC_SDIO),y)
CSRCS += bcmf_sdpcm.c CSRCS += bcmf_sdpcm.c
endif endif
ifeq ($(CONFIG_IEEE80211_BROADCOM_BCM43013),y) ifeq ($(CONFIG_IEEE80211_BROADCOM_BCM4301X),y)
CSRCS += bcmf_chip_43013.c CSRCS += bcmf_chip_4301x.c
endif endif
ifeq ($(CONFIG_IEEE80211_BROADCOM_BCM43362),y) ifeq ($(CONFIG_IEEE80211_BROADCOM_BCM43362),y)

20
drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_43013.c → drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_4301x.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_43013.c * drivers/wireless/ieee80211/bcm43xxx/bcmf_chip_4301x.c
* *
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
@ -37,15 +37,15 @@
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
extern const char bcm43013_nvram_image[]; extern const char bcm4301x_nvram_image[];
extern const unsigned int bcm43013_nvram_image_len; extern const unsigned int bcm4301x_nvram_image_len;
#ifndef CONFIG_IEEE80211_BROADCOM_FWFILES #ifndef CONFIG_IEEE80211_BROADCOM_FWFILES
extern const uint8_t bcm43013_firmware_image[]; extern const uint8_t bcm4301x_firmware_image[];
extern const unsigned int bcm43013_firmware_image_len; extern const unsigned int bcm4301x_firmware_image_len;
#endif #endif
const struct bcmf_sdio_chip bcmf_43013_config_sdio = const struct bcmf_sdio_chip bcmf_4301x_config_sdio =
{ {
/* General chip stats */ /* General chip stats */
@ -69,12 +69,12 @@ const struct bcmf_sdio_chip bcmf_43013_config_sdio =
/* TODO find something smarter than using image_len references */ /* TODO find something smarter than using image_len references */
.nvram_image = (FAR uint8_t *)bcm43013_nvram_image, .nvram_image = (FAR uint8_t *)bcm4301x_nvram_image,
.nvram_image_size = (FAR unsigned int *)&bcm43013_nvram_image_len, .nvram_image_size = (FAR unsigned int *)&bcm4301x_nvram_image_len,
#ifndef CONFIG_IEEE80211_BROADCOM_FWFILES #ifndef CONFIG_IEEE80211_BROADCOM_FWFILES
.firmware_image = (FAR uint8_t *)bcm43013_firmware_image, .firmware_image = (FAR uint8_t *)bcm4301x_firmware_image,
.firmware_image_size = (FAR unsigned int *)&bcm43013_firmware_image_len, .firmware_image_size = (FAR unsigned int *)&bcm4301x_firmware_image_len,
#endif #endif
}; };

10
drivers/wireless/ieee80211/bcm43xxx/bcmf_core.c
View File

@ -439,13 +439,14 @@ int bcmf_core_upload_firmware(FAR struct bcmf_sdio_dev_s *sbus)
switch (sbus->cur_chip_id) switch (sbus->cur_chip_id)
{ {
#if defined(CONFIG_IEEE80211_BROADCOM_BCM43013) || \ #if defined(CONFIG_IEEE80211_BROADCOM_BCM4301X) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43362) || \ defined(CONFIG_IEEE80211_BROADCOM_BCM43362) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43438) defined(CONFIG_IEEE80211_BROADCOM_BCM43438)
case SDIO_DEVICE_ID_BROADCOM_43012:
case SDIO_DEVICE_ID_BROADCOM_43013:
case SDIO_DEVICE_ID_BROADCOM_43362: case SDIO_DEVICE_ID_BROADCOM_43362:
case SDIO_DEVICE_ID_BROADCOM_43430: case SDIO_DEVICE_ID_BROADCOM_43430:
case SDIO_DEVICE_ID_BROADCOM_43013:
/* Disable ARMCM3 core and reset SOCRAM core to set device in /* Disable ARMCM3 core and reset SOCRAM core to set device in
* firmware upload mode * firmware upload mode
*/ */
@ -523,13 +524,14 @@ int bcmf_core_upload_firmware(FAR struct bcmf_sdio_dev_s *sbus)
switch (sbus->cur_chip_id) switch (sbus->cur_chip_id)
{ {
#if defined(CONFIG_IEEE80211_BROADCOM_BCM43013) || \ #if defined(CONFIG_IEEE80211_BROADCOM_BCM4301X) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43362) || \ defined(CONFIG_IEEE80211_BROADCOM_BCM43362) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43438) defined(CONFIG_IEEE80211_BROADCOM_BCM43438)
case SDIO_DEVICE_ID_BROADCOM_43012:
case SDIO_DEVICE_ID_BROADCOM_43013:
case SDIO_DEVICE_ID_BROADCOM_43362: case SDIO_DEVICE_ID_BROADCOM_43362:
case SDIO_DEVICE_ID_BROADCOM_43430: case SDIO_DEVICE_ID_BROADCOM_43430:
case SDIO_DEVICE_ID_BROADCOM_43013:
up_mdelay(10); up_mdelay(10);
bcmf_core_reset(sbus, WLAN_ARMCM3_CORE_ID, 0, 0, 0); bcmf_core_reset(sbus, WLAN_ARMCM3_CORE_ID, 0, 0, 0);

11
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
View File

@ -75,8 +75,8 @@
/* Supported chip configurations */ /* Supported chip configurations */
#ifdef CONFIG_IEEE80211_BROADCOM_BCM43013 #ifdef CONFIG_IEEE80211_BROADCOM_BCM4301X
extern const struct bcmf_sdio_chip bcmf_43013_config_sdio; extern const struct bcmf_sdio_chip bcmf_4301x_config_sdio;
#endif #endif
#ifdef CONFIG_IEEE80211_BROADCOM_BCM43362 #ifdef CONFIG_IEEE80211_BROADCOM_BCM43362
extern const struct bcmf_sdio_chip bcmf_43362_config_sdio; extern const struct bcmf_sdio_chip bcmf_43362_config_sdio;
@ -816,10 +816,11 @@ int bcmf_chipinitialize(FAR struct bcmf_sdio_dev_s *sbus)
switch (chipid) switch (chipid)
{ {
#ifdef CONFIG_IEEE80211_BROADCOM_BCM43013 #ifdef CONFIG_IEEE80211_BROADCOM_BCM4301X
case SDIO_DEVICE_ID_BROADCOM_43012:
case SDIO_DEVICE_ID_BROADCOM_43013: case SDIO_DEVICE_ID_BROADCOM_43013:
wlinfo("bcm43013 chip detected\n"); wlinfo("bcm%d chip detected\n", chipid);
sbus->chip = (struct bcmf_sdio_chip *)&bcmf_43013_config_sdio; sbus->chip = (struct bcmf_sdio_chip *)&bcmf_4301x_config_sdio;
break; break;
#endif #endif

3
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h
View File

@ -36,6 +36,7 @@
/* SDIO device ID */ /* SDIO device ID */
#define SDIO_DEVICE_ID_BROADCOM_43012 43012
#define SDIO_DEVICE_ID_BROADCOM_43013 43013 #define SDIO_DEVICE_ID_BROADCOM_43013 43013
#define SDIO_DEVICE_ID_BROADCOM_43143 43143 #define SDIO_DEVICE_ID_BROADCOM_43143 43143
#define SDIO_DEVICE_ID_BROADCOM_43241 0x4324 #define SDIO_DEVICE_ID_BROADCOM_43241 0x4324
@ -86,7 +87,7 @@ enum
CHIPCOMMON_CORE_ID = 0, CHIPCOMMON_CORE_ID = 0,
DOT11MAC_CORE_ID, DOT11MAC_CORE_ID,
SDIOD_CORE_ID, SDIOD_CORE_ID,
#if defined(CONFIG_IEEE80211_BROADCOM_BCM43013) || \ #if defined(CONFIG_IEEE80211_BROADCOM_BCM4301X) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43362) || \ defined(CONFIG_IEEE80211_BROADCOM_BCM43362) || \
defined(CONFIG_IEEE80211_BROADCOM_BCM43438) defined(CONFIG_IEEE80211_BROADCOM_BCM43438)
WLAN_ARMCM3_CORE_ID, WLAN_ARMCM3_CORE_ID,