Integrate linux-seco-rk/ap/update-mwifiex
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 1
− 1
[DRIVERS] rockchip pcie: remove hard dependency from rfkill-rk
The rockchip PCIe driver currently causes a link error when built without rfkill-rk (CONFIG_RFKILL_RK). Error: pcie-dw-rockchip.c:2263: undefined reference to `rfkill_get_wifi_power_state'
Instead of setting rfkill-rk as a dependency in Kconfig (as in 7ed6cad012537c4482a05bbecd5439a2fd2836d7, reverted), make it an optional dependency by surrounding the rfkill-rk-specific code with #ifdef
--
Revert "[Kconfig] PCIE_DW_ROCKCHIP: Add dependency on RFKILL_RK"
This reverts commit 7ed6cad012537c4482a05bbecd5439a2fd2836d7.
--
[C31][WIFI] restore configuration for new MWIFIEX driver
Restore the wifi configuration from 21eaa7593581379721921efcc5c764f79fc9aa5b for new MWIFIEX driver (built externally in yocto)
--
[DEFCONFIG] disable the rockchip RFKILL-RK driver
The rfkill-rk driver enables rfkill for some rockchip wireless chipsets. On C31, when enabled, it causes the wifi and bt to crash with the following error: [WLAN_RFKILL]: rockchip_wifi_get_oob_irq: rfkill-wlan driver has not Successful initialized
--
[DEFCONFIG] disable MWIFIEX
Disable the MWIFIEX driver to allow using the new version of the driver with a recipe in meta-seco-rk that builds the driver as an out-of-tree module for E09 and C31.
The old, in-tree version of the driver is no longer needed.