mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 15:21:39 +00:00
f49c6f8e2b
1: update meson 4K support patches: 2, HDMI i2s improvement patches: 3, update vdec patches: 4, update meson audio patches: 5, add meson crypto engine driver 6, remove disabled patches: 7 remove unknown patch or no need 8, remove merged patches: 9, remove unknown patches from khadas should be covered by patches set 2 10, rename patches for better grouping 11, update kernel config accordingly Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
71 lines
3.2 KiB
Diff
71 lines
3.2 KiB
Diff
From 12c5dbdae16c4cd2d9914b7a4e31275f3d2070c6 Mon Sep 17 00:00:00 2001
|
|
From: balbes150 <balbes-150@yandex.ru>
|
|
Date: Mon, 18 Mar 2019 17:40:57 +0300
|
|
Subject: [PATCH 69/91] fix
|
|
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 +
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 +
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 ++
|
|
include/linux/mmc/sdio_ids.h | 1 +
|
|
4 files changed, 5 insertions(+)
|
|
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
|
|
index d64bf23..0e80530 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
|
|
@@ -982,6 +982,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
|
|
BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455),
|
|
BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
|
|
BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),
|
|
+ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359),
|
|
BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_4373),
|
|
BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_43012),
|
|
{ /* end: all zeroes */ }
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
index 22534bf..1461794 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
@@ -1348,6 +1348,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)
|
|
switch (pub->chip) {
|
|
case BRCM_CC_4354_CHIP_ID:
|
|
case BRCM_CC_4356_CHIP_ID:
|
|
+ case BRCM_CC_4359_CHIP_ID:
|
|
case BRCM_CC_4345_CHIP_ID:
|
|
/* explicitly check SR engine enable bit */
|
|
pmu_cc3_mask = BIT(2);
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
index 0cd5b8d..7809aa1 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
@@ -624,6 +624,7 @@ BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
|
|
BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
|
|
BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
|
|
BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");
|
|
+BRCMF_FW_DEF(4359, "brcmfmac4359-sdio");
|
|
BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
|
|
BRCMF_FW_DEF(43012, "brcmfmac43012-sdio");
|
|
|
|
@@ -645,6 +646,7 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
|
|
BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
|
|
BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
|
|
BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
|
|
+ BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
|
|
BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),
|
|
BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012)
|
|
};
|
|
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
|
|
index 4332199..93a5ac7 100644
|
|
--- a/include/linux/mmc/sdio_ids.h
|
|
+++ b/include/linux/mmc/sdio_ids.h
|
|
@@ -41,6 +41,7 @@
|
|
#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf
|
|
#define SDIO_DEVICE_ID_BROADCOM_4354 0x4354
|
|
#define SDIO_DEVICE_ID_BROADCOM_4356 0x4356
|
|
+#define SDIO_DEVICE_ID_BROADCOM_4359 0x4359
|
|
#define SDIO_DEVICE_ID_CYPRESS_4373 0x4373
|
|
#define SDIO_DEVICE_ID_CYPRESS_43012 43012
|
|
|
|
--
|
|
2.7.4
|
|
|