From 2fd29c7b6a9f3efbfccde474dff0062ce0ecea98 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 18 Jul 2024 12:07:14 +0530 Subject: [PATCH] ANDROID: GKI: Enable POWER_SEQUENCING=m BT_HCIUART_QCA now has a dependency on POWER_SEQUENCING to enable power sequencer for WCN7850, WCN6855, and QCA6390 BT modules used in newer gen Qualcomm SoCs. Bug: 146449535 Signed-off-by: Amit Pundir Change-Id: I49e178cfc5ef0dfee1c00dede8398460a59fe4c2 --- BUILD.bazel | 2 -- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 1 + modules.bzl | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 9fca950b8b20..f5c41ffb0d33 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -533,8 +533,6 @@ _DB845C_MODULE_OUTS = [ "drivers/power/reset/qcom-pon.ko", "drivers/power/reset/reboot-mode.ko", "drivers/power/reset/syscon-reboot-mode.ko", - "drivers/power/sequencing/pwrseq-core.ko", - "drivers/power/sequencing/pwrseq-qcom-wcn.ko", "drivers/power/supply/qcom_battmgr.ko", "drivers/regulator/gpio-regulator.ko", "drivers/regulator/qcom-rpmh-regulator.ko", diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 08e7116a02b2..286cd46baf66 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -420,6 +420,8 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_POWER_RESET_HISI=y CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_SEQUENCING=m +# CONFIG_POWER_SEQUENCING_QCOM_WCN is not set # CONFIG_HWMON is not set CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 3ffe4bc37ee3..640bd85ae825 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -391,6 +391,7 @@ CONFIG_SPI_SLAVE=y CONFIG_PTP_1588_CLOCK=m CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC_PLATFORM=y +CONFIG_POWER_SEQUENCING=m # CONFIG_HWMON is not set CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_STATISTICS=y diff --git a/modules.bzl b/modules.bzl index 058b264f3593..f97fbc46e270 100644 --- a/modules.bzl +++ b/modules.bzl @@ -36,6 +36,7 @@ _COMMON_GKI_MODULES_LIST = [ "drivers/net/usb/rtl8150.ko", "drivers/net/usb/usbnet.ko", "drivers/net/wwan/wwan.ko", + "drivers/power/sequencing/pwrseq-core.ko", "drivers/pps/pps_core.ko", "drivers/ptp/ptp.ko", "drivers/usb/class/cdc-acm.ko",