kernel: add ap6330 support in 5.13 kernel.

warpme · Jun 22, 2021 · d81662d · d81662d
1 parent 85d91b2
commit d81662d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/script/kernel/linux-5.13/Makefile b/script/kernel/linux-5.13/Makefile
@@ -52,6 +52,7 @@ ifeq (1,1)
 # Misc panfrost patches for 5.13 kernel
 PATCHFILES += 0102-drm-panfrost-add-support-for-custom-soft-reset-on-GXM.patch
 PATCHFILES += 0103-drm-panfrost-make-panfrost_job_run_rte_ERR_PTR.patch
+PATCHFILES += 0110-drivers-net-wireless-brcmfmac-add-ap6330-firmware.patch
 endif
 
 ifeq (1,1)

diff --git a/script/kernel/linux-5.13/checksums b/script/kernel/linux-5.13/checksums
@@ -1,6 +1,7 @@
 8366a1024cfafac128c823f973156b84  download/0101-include-media-hevc-uapi-add-aw-rk-brcm-fields.patch
 22db8e2caed09d1ccc83d50c4aa083b4  download/0102-drm-panfrost-add-support-for-custom-soft-reset-on-GXM.patch
 316515d7861aaad0a399f6b3e205176f  download/0103-drm-panfrost-make-panfrost_job_run_rte_ERR_PTR.patch
+e2706a83da3208d8c2735a482aab4ce9  download/0110-drivers-net-wireless-brcmfmac-add-ap6330-firmware.patch
 b3784de0372d33af27d09b521e777cab  download/0125-drm-lima-dvfs-switch-gov-to-performance.patch
 b142e3ad8d62036e6726659542c831db  download/0126-drm-panfrost-dvfs-switch-gov-to-performance.patch
 db3bf28e8889ea333b1123c03d1603f1  download/0310-messon-vdec-add-hvec-support.patch

diff --git a/script/kernel/linux-5.13/files/0110-drivers-net-wireless-brcmfmac-add-ap6330-firmware.patch b/script/kernel/linux-5.13/files/0110-drivers-net-wireless-brcmfmac-add-ap6330-firmware.patch
@@ -0,0 +1,23 @@
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+index a907d7b06..ec71996c7 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+@@ -619,13 +619,17 @@ BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
+ BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");
+ BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
+
++/* AMPAK */
++BRCMF_FW_DEF(AP6330, "brcmfmac-ap6330-sdio");
++
+ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
+ 	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
+ 	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),
+ 	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),
+ 	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0xFFFFFFC0, 43241B5),
+ 	BRCMF_FW_ENTRY(BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, 4329),
+-	BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, 4330),
++	BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFEF, 4330),
++	BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0x10, AP6330),
+ 	BRCMF_FW_ENTRY(BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, 4334),
+ 	BRCMF_FW_ENTRY(BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, 43340),
+ 	BRCMF_FW_ENTRY(BRCM_CC_43341_CHIP_ID, 0xFFFFFFFF, 43340),