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 <adelva@google.com>
Change-Id: Ic3833e3a2dc44386c12a2422562994a1581a549c
This commit is contained in:
Alistair Delva
2022-09-23 11:39:13 -07:00
parent 066ab8e6b6
commit 4c43a506ef
4 changed files with 2 additions and 3 deletions

View File

@@ -66,7 +66,6 @@ define_db845c(
"crypto/michael_mic.ko", "crypto/michael_mic.ko",
"drivers/base/regmap/regmap-sdw.ko", "drivers/base/regmap/regmap-sdw.ko",
"drivers/base/regmap/regmap-slimbus.ko", "drivers/base/regmap/regmap-slimbus.ko",
"drivers/base/regmap/regmap-spmi.ko",
"drivers/bus/mhi/core/mhi.ko", "drivers/bus/mhi/core/mhi.ko",
"drivers/clk/qcom/clk-qcom.ko", "drivers/clk/qcom/clk-qcom.ko",
"drivers/clk/qcom/clk-rpmh.ko", "drivers/clk/qcom/clk-rpmh.ko",

View File

@@ -394,7 +394,6 @@ CONFIG_HW_RANDOM=y
CONFIG_I3C=y CONFIG_I3C=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_MEM=y CONFIG_SPI_MEM=y
CONFIG_SPMI=y
# CONFIG_SPMI_MSM_PMIC_ARB is not set # CONFIG_SPMI_MSM_PMIC_ARB is not set
# CONFIG_PINCTRL_SUN8I_H3_R is not set # CONFIG_PINCTRL_SUN8I_H3_R is not set
# CONFIG_PINCTRL_SUN50I_A64 is not set # CONFIG_PINCTRL_SUN50I_A64 is not set

View File

@@ -356,7 +356,6 @@ CONFIG_HPET=y
CONFIG_I3C=y CONFIG_I3C=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_SPI_MEM=y CONFIG_SPI_MEM=y
CONFIG_SPMI=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y
CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_GENERIC_PLATFORM=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set

View File

@@ -18,6 +18,8 @@ config GKI_HIDDEN_REGMAP_CONFIGS
bool "Hidden Regmap configs needed for GKI" bool "Hidden Regmap configs needed for GKI"
select REGMAP_IRQ select REGMAP_IRQ
select REGMAP_MMIO select REGMAP_MMIO
select REGMAP_SPMI
select SPMI
help help
Dummy config option used to enable hidden regmap configs. Dummy config option used to enable hidden regmap configs.
These are normally selected implicitly when a module These are normally selected implicitly when a module