From 4c43a506ef9f8b626b9bf0c3c9a3d7343a6f5b51 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Fri, 23 Sep 2022 11:39:13 -0700 Subject: [PATCH] ANDROID: GKI: Build-in REGMAP_SPMI REGMAP_SPMI is a hidden symbol normally selected by other SPMI drivers, but it wasn't built-in to GKI like other REGMAP APIs so vendors had to build it downstream. This is a small amount of code and can be modularized later. For allmodconfig, select SPMI via Kconfig.gki instead of gki_defconfig, because otherwise allmodconfig will build SPMI=m and REGMAP_SPMI=y, which is not allowed. Bug: 248307451 Signed-off-by: Alistair Delva Change-Id: Ic3833e3a2dc44386c12a2422562994a1581a549c --- BUILD.bazel | 1 - arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - init/Kconfig.gki | 2 ++ 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 4afcab912f9f..e3256f5e5753 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -66,7 +66,6 @@ define_db845c( "crypto/michael_mic.ko", "drivers/base/regmap/regmap-sdw.ko", "drivers/base/regmap/regmap-slimbus.ko", - "drivers/base/regmap/regmap-spmi.ko", "drivers/bus/mhi/core/mhi.ko", "drivers/clk/qcom/clk-qcom.ko", "drivers/clk/qcom/clk-rpmh.ko", diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index a541caa5fbe7..38178c5340f8 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -394,7 +394,6 @@ CONFIG_HW_RANDOM=y CONFIG_I3C=y CONFIG_SPI=y CONFIG_SPI_MEM=y -CONFIG_SPMI=y # CONFIG_SPMI_MSM_PMIC_ARB is not set # CONFIG_PINCTRL_SUN8I_H3_R is not set # CONFIG_PINCTRL_SUN50I_A64 is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index c144cda7c596..526f5458b7e2 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -356,7 +356,6 @@ CONFIG_HPET=y CONFIG_I3C=y CONFIG_SPI=y CONFIG_SPI_MEM=y -CONFIG_SPMI=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC_PLATFORM=y # CONFIG_HWMON is not set diff --git a/init/Kconfig.gki b/init/Kconfig.gki index 34ea19a16bbe..ce622014516e 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -18,6 +18,8 @@ config GKI_HIDDEN_REGMAP_CONFIGS bool "Hidden Regmap configs needed for GKI" select REGMAP_IRQ select REGMAP_MMIO + select REGMAP_SPMI + select SPMI help Dummy config option used to enable hidden regmap configs. These are normally selected implicitly when a module