From 2800cc279503555b16554eb0c69667bb25d77546 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Tue, 16 Feb 2021 16:19:49 +0100 Subject: [PATCH] Rockchip: RK3399: add support for PCIE wifi devices Now that we have PCIE support for RK3399 we can also add support for same PCIE wifi chipsets - this also adds some firmware to RK3399 images which is required by some of them. --- .../RK3399/config/kernel-firmware-any.dat | 12 ++++++ .../RK3399/linux/default/linux.aarch64.conf | 42 ++++++++++++++----- 2 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 projects/Rockchip/devices/RK3399/config/kernel-firmware-any.dat diff --git a/projects/Rockchip/devices/RK3399/config/kernel-firmware-any.dat b/projects/Rockchip/devices/RK3399/config/kernel-firmware-any.dat new file mode 100644 index 0000000000..5e0d28bb35 --- /dev/null +++ b/projects/Rockchip/devices/RK3399/config/kernel-firmware-any.dat @@ -0,0 +1,12 @@ +rockchip/* +ath10k/QCA6174 +ath10k/QCA9377 +ath10k/QCA9887 +ath10k/QCA9888 +ath10k/QCA988X +ath10k/QCA9984 +ath10k/QCA99X0 +iwlwifi-4965-2.ucode +iwlwifi-5* +iwlwifi-6* +mwlwifi/ diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index a5966422ec..34f8a80793 100644 --- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf @@ -2091,7 +2091,8 @@ CONFIG_AR5523=m # CONFIG_WIL6210 is not set CONFIG_ATH10K=m CONFIG_ATH10K_CE=y -# CONFIG_ATH10K_PCI is not set +CONFIG_ATH10K_PCI=m +# CONFIG_ATH10K_AHB is not set # CONFIG_ATH10K_SDIO is not set CONFIG_ATH10K_USB=m # CONFIG_ATH10K_DEBUG is not set @@ -2125,18 +2126,39 @@ CONFIG_BRCMUTIL=m # CONFIG_BRCMSMAC is not set CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y CONFIG_BRCMFMAC_SDIO=y CONFIG_BRCMFMAC_USB=y -# CONFIG_BRCMFMAC_PCIE is not set +CONFIG_BRCMFMAC_PCIE=y # CONFIG_BRCM_TRACING is not set # CONFIG_BRCMDBG is not set CONFIG_WLAN_VENDOR_CISCO=y CONFIG_WLAN_VENDOR_INTEL=y # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set -# CONFIG_IWL4965 is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m # CONFIG_IWL3945 is not set -# CONFIG_IWLWIFI is not set + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +# end of iwl3945 / iwl4965 Debugging Options + +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y +# CONFIG_IWLWIFI_BCAST_FILTERING is not set + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +# end of Debugging Options + CONFIG_WLAN_VENDOR_INTERSIL=y # CONFIG_HOSTAP is not set # CONFIG_HERMES is not set @@ -2158,7 +2180,7 @@ CONFIG_LIBERTAS_THINFIRM=m CONFIG_LIBERTAS_THINFIRM_USB=m CONFIG_MWIFIEX=m # CONFIG_MWIFIEX_SDIO is not set -# CONFIG_MWIFIEX_PCIE is not set +CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_USB=m # CONFIG_MWL8K is not set CONFIG_WLAN_VENDOR_MEDIATEK=y @@ -2171,17 +2193,17 @@ CONFIG_MT76x02_LIB=m CONFIG_MT76x02_USB=m CONFIG_MT76x0_COMMON=m CONFIG_MT76x0U=m -# CONFIG_MT76x0E is not set +CONFIG_MT76x0E=m CONFIG_MT76x2_COMMON=m -# CONFIG_MT76x2E is not set +CONFIG_MT76x2E=m CONFIG_MT76x2U=m -# CONFIG_MT7603E is not set +CONFIG_MT7603E=m CONFIG_MT7615_COMMON=m -# CONFIG_MT7615E is not set +CONFIG_MT7615E=m CONFIG_MT7663_USB_SDIO_COMMON=m CONFIG_MT7663U=m CONFIG_MT7663S=m -# CONFIG_MT7915E is not set +CONFIG_MT7915E=m CONFIG_WLAN_VENDOR_MICROCHIP=y # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set