mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 13:29:33 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
|
|
index b4d9b475..c8d659ff 100644
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
|
|
@@ -626,6 +626,12 @@ static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = {
|
|
#define BCM4354_FIRMWARE_NAME "brcm/brcmfmac4354-sdio.bin"
|
|
#define BCM4354_NVRAM_NAME "brcm/brcmfmac4354-sdio.txt"
|
|
|
|
+/*
|
|
+ * AMPAK
|
|
+ */
|
|
+#define AP6330_FIRMWARE_NAME "brcm/brcmfmac-ap6330-sdio.bin"
|
|
+#define AP6330_NVRAM_NAME "brcm/brcmfmac-ap6330-sdio.txt"
|
|
+
|
|
MODULE_FIRMWARE(BCM43143_FIRMWARE_NAME);
|
|
MODULE_FIRMWARE(BCM43143_NVRAM_NAME);
|
|
MODULE_FIRMWARE(BCM43241B0_FIRMWARE_NAME);
|
|
@@ -654,6 +660,8 @@ MODULE_FIRMWARE(BCM43455_FIRMWARE_NAME);
|
|
MODULE_FIRMWARE(BCM43455_NVRAM_NAME);
|
|
MODULE_FIRMWARE(BCM4354_FIRMWARE_NAME);
|
|
MODULE_FIRMWARE(BCM4354_NVRAM_NAME);
|
|
+MODULE_FIRMWARE(AP6330_FIRMWARE_NAME);
|
|
+MODULE_FIRMWARE(AP6330_NVRAM_NAME);
|
|
|
|
struct brcmf_firmware_names {
|
|
u32 chipid;
|
|
@@ -676,7 +684,8 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = {
|
|
{ BRCM_CC_43241_CHIP_ID, 0x00000020, BRCMF_FIRMWARE_NVRAM(BCM43241B4) },
|
|
{ BRCM_CC_43241_CHIP_ID, 0xFFFFFFC0, BRCMF_FIRMWARE_NVRAM(BCM43241B5) },
|
|
{ BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4329) },
|
|
- { BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4330) },
|
|
+ { BRCM_CC_4330_CHIP_ID, 0xFFFFFFEF, BRCMF_FIRMWARE_NVRAM(BCM4330) },
|
|
+ { BRCM_CC_4330_CHIP_ID, 0x10, BRCMF_FIRMWARE_NVRAM(AP6330) },
|
|
{ BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) },
|
|
{ BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43340) },
|
|
{ BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) },
|