From 18a522d05af3d9c4e58d2bcdf6f319c096597a8c Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Wed, 16 Nov 2022 07:41:29 +0000 Subject: [PATCH] ANDROID: GKI: Convert RF switch subsys as module Convert RF swithc subsys as GKI module. CONFIG_RFKILL: RF switch subsystem support To have control over RF switches found on many WiFi and Bluetooth cards. Bug: 232431151 Test: TH Change-Id: I6fb84f82d7a65b3d4f17261d361be1c44c6b77bb Signed-off-by: Ramji Jiyani (cherry picked from commit 6a0f9b1a5aa6f2377f6de01471c07ed550137b42) --- android/gki_system_dlkm_modules | 1 + arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- modules.bzl | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules index e72658954e35..2a3cd4a42882 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -19,6 +19,7 @@ net/can/can-gw.ko net/can/can-raw.ko net/mac80211/mac80211.ko net/nfc/nfc.ko +net/rfkill/rfkill.ko net/tipc/diag.ko net/tipc/tipc.ko net/wireless/cfg80211.ko diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 9963c62e851f..569e0b7f358c 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -271,7 +271,7 @@ CONFIG_NL80211_TESTMODE=y # CONFIG_CFG80211_DEFAULT_PS is not set # CONFIG_CFG80211_CRDA_SUPPORT is not set CONFIG_MAC80211=m -CONFIG_RFKILL=y +CONFIG_RFKILL=m CONFIG_NFC=m CONFIG_PCI=y CONFIG_PCIEPORTBUS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 66bd0e5df1e3..8dc799d20796 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -261,7 +261,7 @@ CONFIG_NL80211_TESTMODE=y # CONFIG_CFG80211_DEFAULT_PS is not set # CONFIG_CFG80211_CRDA_SUPPORT is not set CONFIG_MAC80211=m -CONFIG_RFKILL=y +CONFIG_RFKILL=m CONFIG_NFC=m CONFIG_PCI=y CONFIG_PCIEPORTBUS=y diff --git a/modules.bzl b/modules.bzl index d58218c25336..a5a8dacdb5fd 100644 --- a/modules.bzl +++ b/modules.bzl @@ -21,6 +21,7 @@ COMMON_GKI_MODULES_LIST = [ "net/can/can-raw.ko", "net/mac80211/mac80211.ko", "net/nfc/nfc.ko", + "net/rfkill/rfkill.ko", "net/tipc/diag.ko", "net/tipc/tipc.ko", "net/wireless/cfg80211.ko",