From a09956c8569aec55cf6143d402d8720479872f09 Mon Sep 17 00:00:00 2001 From: David Collins Date: Tue, 15 Sep 2020 11:59:40 -0700 Subject: [PATCH 1/2] regulator: fixed: remove QTI_FIXED_REGULATOR definition Now that all fixed regulator devices which utilize proxy-consumer properties have switched to be qti-fixed-regulator devices, the definition of QTI_FIXED_REGULATOR can be removed from fixed.c. Change-Id: I5847ead86723b63771d69f4076eafd26139baa80 Signed-off-by: David Collins --- drivers/regulator/fixed.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index bef8c4b11206..46d4dac9d0f8 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -14,13 +14,6 @@ * systems with no controllable regulators. */ -/* - * Define QTI_FIXED_REGULATOR here to avoid a loss of proxy-consumer voting - * regression for existing fixed-regulator device tree devices. Once such - * devices are switched to qti-fixed-regulator, this line can be removed. - */ -#define QTI_FIXED_REGULATOR - #include #include #include From 8ba2ba40191cf6870726b18b41f9c5ea2cb29a96 Mon Sep 17 00:00:00 2001 From: David Collins Date: Mon, 14 Sep 2020 11:35:55 -0700 Subject: [PATCH 2/2] defconfig: lahaina-gki: disable the fixed regulator driver Remove CONFIG_REGULATOR_FIXED_VOLTAGE=m from lahaina_GKI.config since CONFIG_REGULATOR_FIXED_VOLTAGE=y is present in gki_defconfig. The config entry in lahaina_GKI.config results in fixed.ko being compiled. However, it fails to load at runtime since the statically compiled version of the fixed regulator driver is already loaded along with the GKI base kernel image. Change-Id: I561d642f98d42d924baca20ec91717f64946041d Signed-off-by: David Collins --- arch/arm64/configs/vendor/lahaina_GKI.config | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config index c4720df58ba1..f325e4963435 100644 --- a/arch/arm64/configs/vendor/lahaina_GKI.config +++ b/arch/arm64/configs/vendor/lahaina_GKI.config @@ -99,7 +99,6 @@ CONFIG_MSM_SERVICE_NOTIFIER=m CONFIG_QSEE_IPC_IRQ=m CONFIG_RPMSG_QCOM_GLINK_SPSS=m CONFIG_REGULATOR_RPMH=m -CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REGULATOR_QTI_FIXED_VOLTAGE=m CONFIG_REGULATOR_QCOM_PM8008=m CONFIG_REGULATOR_QPNP_AMOLED=m