From 6b20d301a39d7fc2f9e3ed3346b3857ad0695bf6 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 16 Jul 2020 20:31:50 +0000 Subject: [PATCH] ANDROID: Kconfig.gki: Remove GKI_QCOM_CLKS_CONFIGS and QCOM_RPMHPD from GKI_HACKS config option This removes GKI_QCOM_CLKS_CONFIGS and the one QCOM_RPMHPD config it selects from the GKI_HACKS config entry, as we will move it to being a module. Bug: 161478631 Bug: 161128971 Signed-off-by: John Stultz Change-Id: Idc2eedf3ed3bfd3e88f9a577934943f86df16ab3 --- init/Kconfig.gki | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/init/Kconfig.gki b/init/Kconfig.gki index b7a89a890bb1..115a58f23431 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -81,15 +81,6 @@ config GKI_HIDDEN_QCOM_CONFIGS These are normally selected implicitly when a module that relies on it is configured. -config GKI_QCOM_CLKS_CONFIGS - bool "QCOM clk drivers needed for GKI due to powerdomain restrictions" - select QCOM_RPMHPD if (ARCH_QCOM) - help - This config option selects various QCOM clk drivers that - cannot be built as a module currently due to power-domain - deferred probing limitations. - See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e01afc32502555beb2057ddd74401be38475d851 - config GKI_HIDDEN_MEDIA_CONFIGS bool "Hidden Media configs needed for GKI" select VIDEOBUF2_CORE @@ -184,7 +175,6 @@ config GKI_HACKS_TO_FIX select GKI_HIDDEN_QCOM_CONFIGS select GKI_HIDDEN_MEDIA_CONFIGS select GKI_HIDDEN_VIRTUAL_CONFIGS - select GKI_QCOM_CLKS_CONFIGS select GKI_HIDDEN_USB_CONFIGS select GKI_HIDDEN_SOC_BUS_CONFIGS select GKI_HIDDEN_RPMSG_CONFIGS