From d4b9ff94dff74035e465eb341036b79e30ac3d14 Mon Sep 17 00:00:00 2001 From: Nicholas Troast Date: Tue, 10 Jan 2017 09:56:57 -0800 Subject: [PATCH] power: align qcom drivers with msm-4.9 kernel The power directory structure has changed in kernel version 4.9. Align msm-4.4 with this new directory structure. Change-Id: Iba729f8ef33245ea78cdc05276ba8f5593191509 Signed-off-by: Nicholas Troast --- .../qcom}/qpnp-fg-gen3.txt | 0 .../{qcom-charger => supply/qcom}/qpnp-fg.txt | 0 .../qcom}/qpnp-qnovo.txt | 0 .../qcom}/qpnp-smb2.txt | 0 .../qcom}/qpnp-smbcharger.txt | 0 .../qcom}/smb1351-charger.txt | 0 .../qcom}/smb135x-charger.txt | 0 .../qcom}/smb138x-charger.txt | 0 arch/arm/configs/msmcortex_defconfig | 11 ++++++----- arch/arm/configs/sdm660-perf_defconfig | 7 +++---- arch/arm/configs/sdm660_defconfig | 7 +++---- arch/arm64/configs/msm-perf_defconfig | 6 +++--- arch/arm64/configs/msm_defconfig | 6 +++--- arch/arm64/configs/msmcortex-perf_defconfig | 6 +++--- arch/arm64/configs/msmcortex_defconfig | 6 +++--- arch/arm64/configs/sdm660-perf_defconfig | 8 +++----- arch/arm64/configs/sdm660_defconfig | 8 +++----- drivers/power/Kconfig | 2 +- drivers/power/Makefile | 2 +- drivers/power/supply/Kconfig | 1 + drivers/power/supply/Makefile | 1 + .../{qcom-charger => supply/qcom}/Kconfig | 19 +++++-------------- .../{qcom-charger => supply/qcom}/Makefile | 0 .../qcom}/battery_current_limit.c | 0 .../qcom}/batterydata-lib.c | 0 .../qcom}/bcl_peripheral.c | 0 .../{qcom-charger => supply/qcom}/fg-core.h | 0 .../{qcom-charger => supply/qcom}/fg-memif.c | 0 .../{qcom-charger => supply/qcom}/fg-reg.h | 0 .../{qcom-charger => supply/qcom}/fg-util.c | 0 .../{qcom-charger => supply/qcom}/msm_bcl.c | 0 .../qcom}/pmic-voter.c | 0 .../qcom}/pmic-voter.h | 0 .../qcom}/qpnp-fg-gen3.c | 0 .../{qcom-charger => supply/qcom}/qpnp-fg.c | 0 .../qcom}/qpnp-qnovo.c | 0 .../{qcom-charger => supply/qcom}/qpnp-smb2.c | 0 .../qcom}/qpnp-smbcharger.c | 0 .../{qcom-charger => supply/qcom}/smb-lib.c | 0 .../{qcom-charger => supply/qcom}/smb-lib.h | 0 .../{qcom-charger => supply/qcom}/smb-reg.h | 0 .../qcom}/smb1351-charger.c | 0 .../qcom}/smb135x-charger.c | 0 .../qcom}/smb138x-charger.c | 0 .../qcom}/storm-watch.c | 0 .../qcom}/storm-watch.h | 0 46 files changed, 39 insertions(+), 51 deletions(-) rename Documentation/devicetree/bindings/power/{qcom-charger => supply/qcom}/qpnp-fg-gen3.txt (100%) rename Documentation/devicetree/bindings/power/{qcom-charger => supply/qcom}/qpnp-fg.txt (100%) rename Documentation/devicetree/bindings/power/{qcom-charger => supply/qcom}/qpnp-qnovo.txt (100%) rename Documentation/devicetree/bindings/power/{qcom-charger => supply/qcom}/qpnp-smb2.txt (100%) rename Documentation/devicetree/bindings/power/{qcom-charger => supply/qcom}/qpnp-smbcharger.txt (100%) rename Documentation/devicetree/bindings/power/{qcom-charger => supply/qcom}/smb1351-charger.txt (100%) rename Documentation/devicetree/bindings/power/{qcom-charger => supply/qcom}/smb135x-charger.txt (100%) rename Documentation/devicetree/bindings/power/{qcom-charger => supply/qcom}/smb138x-charger.txt (100%) create mode 100644 drivers/power/supply/Kconfig create mode 100644 drivers/power/supply/Makefile rename drivers/power/{qcom-charger => supply/qcom}/Kconfig (92%) rename drivers/power/{qcom-charger => supply/qcom}/Makefile (100%) rename drivers/power/{qcom-charger => supply/qcom}/battery_current_limit.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/batterydata-lib.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/bcl_peripheral.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/fg-core.h (100%) rename drivers/power/{qcom-charger => supply/qcom}/fg-memif.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/fg-reg.h (100%) rename drivers/power/{qcom-charger => supply/qcom}/fg-util.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/msm_bcl.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/pmic-voter.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/pmic-voter.h (100%) rename drivers/power/{qcom-charger => supply/qcom}/qpnp-fg-gen3.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/qpnp-fg.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/qpnp-qnovo.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/qpnp-smb2.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/qpnp-smbcharger.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/smb-lib.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/smb-lib.h (100%) rename drivers/power/{qcom-charger => supply/qcom}/smb-reg.h (100%) rename drivers/power/{qcom-charger => supply/qcom}/smb1351-charger.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/smb135x-charger.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/smb138x-charger.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/storm-watch.c (100%) rename drivers/power/{qcom-charger => supply/qcom}/storm-watch.h (100%) diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg-gen3.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg-gen3.txt similarity index 100% rename from Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg-gen3.txt rename to Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg-gen3.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg.txt similarity index 100% rename from Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg.txt rename to Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-qnovo.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-qnovo.txt similarity index 100% rename from Documentation/devicetree/bindings/power/qcom-charger/qpnp-qnovo.txt rename to Documentation/devicetree/bindings/power/supply/qcom/qpnp-qnovo.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-smb2.txt similarity index 100% rename from Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt rename to Documentation/devicetree/bindings/power/supply/qcom/qpnp-smb2.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smbcharger.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-smbcharger.txt similarity index 100% rename from Documentation/devicetree/bindings/power/qcom-charger/qpnp-smbcharger.txt rename to Documentation/devicetree/bindings/power/supply/qcom/qpnp-smbcharger.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/smb1351-charger.txt b/Documentation/devicetree/bindings/power/supply/qcom/smb1351-charger.txt similarity index 100% rename from Documentation/devicetree/bindings/power/qcom-charger/smb1351-charger.txt rename to Documentation/devicetree/bindings/power/supply/qcom/smb1351-charger.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/smb135x-charger.txt b/Documentation/devicetree/bindings/power/supply/qcom/smb135x-charger.txt similarity index 100% rename from Documentation/devicetree/bindings/power/qcom-charger/smb135x-charger.txt rename to Documentation/devicetree/bindings/power/supply/qcom/smb135x-charger.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/smb138x-charger.txt b/Documentation/devicetree/bindings/power/supply/qcom/smb138x-charger.txt similarity index 100% rename from Documentation/devicetree/bindings/power/qcom-charger/smb138x-charger.txt rename to Documentation/devicetree/bindings/power/supply/qcom/smb138x-charger.txt diff --git a/arch/arm/configs/msmcortex_defconfig b/arch/arm/configs/msmcortex_defconfig index 1831f2c63ca5..fec429d7bd0c 100644 --- a/arch/arm/configs/msmcortex_defconfig +++ b/arch/arm/configs/msmcortex_defconfig @@ -292,15 +292,15 @@ CONFIG_PINCTRL_MSM8998=y CONFIG_PINCTRL_SDM660=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y -CONFIG_APSS_CORE_EA=y -CONFIG_MSM_APM=y -CONFIG_QPNP_SMBCHARGER=y -CONFIG_SMB135X_CHARGER=y -CONFIG_SMB1351_USB_CHARGER=y +CONFIG_POWER_SUPPLY=y +CONFIG_QPNP_FG_GEN3=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y CONFIG_QPNP_SMB2=y CONFIG_SMB138X_CHARGER=y +CONFIG_QPNP_QNOVO=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_THERMAL=y CONFIG_MFD_SPMI_PMIC=y @@ -477,6 +477,7 @@ CONFIG_QCOM_DEVFREQ_DEVBW=y CONFIG_EXTCON=y CONFIG_IIO=y CONFIG_QCOM_RRADC=y +CONFIG_QCOM_TADC=y CONFIG_PWM=y CONFIG_PWM_QPNP=y CONFIG_ARM_GIC_V3_ACL=y diff --git a/arch/arm/configs/sdm660-perf_defconfig b/arch/arm/configs/sdm660-perf_defconfig index d555a1b179d8..cd09f085e6af 100644 --- a/arch/arm/configs/sdm660-perf_defconfig +++ b/arch/arm/configs/sdm660-perf_defconfig @@ -318,20 +318,19 @@ CONFIG_SPMI=y CONFIG_PINCTRL_SDM660=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y +CONFIG_POWER_SUPPLY=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_SYSCON=y -CONFIG_APSS_CORE_EA=y -CONFIG_MSM_APM=y -CONFIG_QPNP_SMBCHARGER=y -CONFIG_SMB135X_CHARGER=y CONFIG_SMB1351_USB_CHARGER=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y CONFIG_BATTERY_BCL=y CONFIG_QPNP_SMB2=y CONFIG_SMB138X_CHARGER=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y diff --git a/arch/arm/configs/sdm660_defconfig b/arch/arm/configs/sdm660_defconfig index 2c94274b0637..8055774d9cdb 100644 --- a/arch/arm/configs/sdm660_defconfig +++ b/arch/arm/configs/sdm660_defconfig @@ -316,20 +316,19 @@ CONFIG_SPMI=y CONFIG_PINCTRL_SDM660=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y +CONFIG_POWER_SUPPLY=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_SYSCON=y -CONFIG_APSS_CORE_EA=y -CONFIG_MSM_APM=y -CONFIG_QPNP_SMBCHARGER=y -CONFIG_SMB135X_CHARGER=y CONFIG_SMB1351_USB_CHARGER=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y CONFIG_BATTERY_BCL=y CONFIG_QPNP_SMB2=y CONFIG_SMB138X_CHARGER=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig index 07e413e31234..56bbe8054264 100644 --- a/arch/arm64/configs/msm-perf_defconfig +++ b/arch/arm64/configs/msm-perf_defconfig @@ -326,15 +326,15 @@ CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y -CONFIG_MSM_PM=y -CONFIG_APSS_CORE_EA=y -CONFIG_MSM_APM=y CONFIG_QPNP_SMBCHARGER=y CONFIG_QPNP_FG=y CONFIG_SMB135X_CHARGER=y CONFIG_SMB1351_USB_CHARGER=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y +CONFIG_MSM_PM=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y CONFIG_SENSORS_EPM_ADC=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_LIMITS_MONITOR=y diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig index 76d949319dfa..c39a9311e056 100644 --- a/arch/arm64/configs/msm_defconfig +++ b/arch/arm64/configs/msm_defconfig @@ -313,15 +313,15 @@ CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y -CONFIG_MSM_PM=y -CONFIG_APSS_CORE_EA=y -CONFIG_MSM_APM=y CONFIG_QPNP_SMBCHARGER=y CONFIG_QPNP_FG=y CONFIG_SMB135X_CHARGER=y CONFIG_SMB1351_USB_CHARGER=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y +CONFIG_MSM_PM=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y CONFIG_SENSORS_EPM_ADC=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_LIMITS_MONITOR=y diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig index 9700145bfdf6..d71cfed7614d 100644 --- a/arch/arm64/configs/msmcortex-perf_defconfig +++ b/arch/arm64/configs/msmcortex-perf_defconfig @@ -316,9 +316,6 @@ CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y -CONFIG_MSM_PM=y -CONFIG_APSS_CORE_EA=y -CONFIG_MSM_APM=y CONFIG_QPNP_FG_GEN3=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y @@ -326,6 +323,9 @@ CONFIG_BATTERY_BCL=y CONFIG_QPNP_SMB2=y CONFIG_SMB138X_CHARGER=y CONFIG_QPNP_QNOVO=y +CONFIG_MSM_PM=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_CPU_THERMAL=y CONFIG_LIMITS_MONITOR=y diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig index 7761c2360675..cbff6b3a5b74 100644 --- a/arch/arm64/configs/msmcortex_defconfig +++ b/arch/arm64/configs/msmcortex_defconfig @@ -318,9 +318,6 @@ CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y -CONFIG_MSM_PM=y -CONFIG_APSS_CORE_EA=y -CONFIG_MSM_APM=y CONFIG_QPNP_FG_GEN3=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y @@ -328,6 +325,9 @@ CONFIG_BATTERY_BCL=y CONFIG_QPNP_SMB2=y CONFIG_SMB138X_CHARGER=y CONFIG_QPNP_QNOVO=y +CONFIG_MSM_PM=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_CPU_THERMAL=y CONFIG_LIMITS_MONITOR=y diff --git a/arch/arm64/configs/sdm660-perf_defconfig b/arch/arm64/configs/sdm660-perf_defconfig index 7d203e49d595..6a8b4aca2119 100644 --- a/arch/arm64/configs/sdm660-perf_defconfig +++ b/arch/arm64/configs/sdm660-perf_defconfig @@ -318,12 +318,7 @@ CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y -CONFIG_MSM_PM=y -CONFIG_APSS_CORE_EA=y -CONFIG_MSM_APM=y -CONFIG_QPNP_SMBCHARGER=y CONFIG_QPNP_FG_GEN3=y -CONFIG_SMB135X_CHARGER=y CONFIG_SMB1351_USB_CHARGER=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y @@ -331,6 +326,9 @@ CONFIG_BATTERY_BCL=y CONFIG_QPNP_SMB2=y CONFIG_SMB138X_CHARGER=y CONFIG_QPNP_QNOVO=y +CONFIG_MSM_PM=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_CPU_THERMAL=y CONFIG_LIMITS_MONITOR=y diff --git a/arch/arm64/configs/sdm660_defconfig b/arch/arm64/configs/sdm660_defconfig index c295ba7e0d70..1b3c96a28475 100644 --- a/arch/arm64/configs/sdm660_defconfig +++ b/arch/arm64/configs/sdm660_defconfig @@ -320,12 +320,7 @@ CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y -CONFIG_MSM_PM=y -CONFIG_APSS_CORE_EA=y -CONFIG_MSM_APM=y -CONFIG_QPNP_SMBCHARGER=y CONFIG_QPNP_FG_GEN3=y -CONFIG_SMB135X_CHARGER=y CONFIG_SMB1351_USB_CHARGER=y CONFIG_MSM_BCL_CTL=y CONFIG_MSM_BCL_PERIPHERAL_CTL=y @@ -333,6 +328,9 @@ CONFIG_BATTERY_BCL=y CONFIG_QPNP_SMB2=y CONFIG_SMB138X_CHARGER=y CONFIG_QPNP_QNOVO=y +CONFIG_MSM_PM=y +CONFIG_APSS_CORE_EA=y +CONFIG_MSM_APM=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_CPU_THERMAL=y CONFIG_LIMITS_MONITOR=y diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 931230d55f90..91fdeaf67037 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -521,9 +521,9 @@ config AXP20X_POWER AXP20x PMIC. source "drivers/power/reset/Kconfig" +source "drivers/power/supply/Kconfig" endif # POWER_SUPPLY source "drivers/power/avs/Kconfig" source "drivers/power/qcom/Kconfig" -source "drivers/power/qcom-charger/Kconfig" diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 21aceda44c9e..f7adecea0a70 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -73,4 +73,4 @@ obj-$(CONFIG_POWER_RESET) += reset/ obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o obj-$(CONFIG_AXP288_CHARGER) += axp288_charger.o obj-$(CONFIG_ARCH_QCOM) += qcom/ -obj-y += qcom-charger/ +obj-$(CONFIG_POWER_SUPPLY) += supply/ diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig new file mode 100644 index 000000000000..ec128bf6a93a --- /dev/null +++ b/drivers/power/supply/Kconfig @@ -0,0 +1 @@ +source "drivers/power/supply/qcom/Kconfig" diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile new file mode 100644 index 000000000000..c8f025f309e7 --- /dev/null +++ b/drivers/power/supply/Makefile @@ -0,0 +1 @@ +obj-y += qcom/ diff --git a/drivers/power/qcom-charger/Kconfig b/drivers/power/supply/qcom/Kconfig similarity index 92% rename from drivers/power/qcom-charger/Kconfig rename to drivers/power/supply/qcom/Kconfig index 7a0b1464ad86..b919c688e627 100644 --- a/drivers/power/qcom-charger/Kconfig +++ b/drivers/power/supply/qcom/Kconfig @@ -1,9 +1,8 @@ -menu "Qualcomm Technologies Inc Charger and FG Drivers" +menu "Qualcomm Technologies Inc Charger and Fuel Gauge support" config QPNP_SMBCHARGER tristate "QPNP SMB Charger driver" - depends on SPMI - select POWER_SUPPLY + depends on MFD_SPMI_PMIC help Say Y here to enable the dual path switch mode battery charger which supports USB detection and battery charging up to 3A. @@ -12,8 +11,7 @@ config QPNP_SMBCHARGER config QPNP_FG tristate "QPNP fuel gauge driver" - depends on SPMI - select POWER_SUPPLY + depends on MFD_SPMI_PMIC help Say Y here to enable the Fuel Gauge driver. This adds support for battery fuel gauging and state of charge of battery connected to the @@ -22,8 +20,7 @@ config QPNP_FG config QPNP_FG_GEN3 tristate "QPNP GEN3 fuel gauge driver" - depends on SPMI - select REGMAP_SPMI + depends on MFD_SPMI_PMIC help Say Y here to enable the GEN3 Fuel Gauge driver. This adds support for battery fuel gauging and state of charge of battery connected to @@ -33,7 +30,6 @@ config QPNP_FG_GEN3 config SMB135X_CHARGER tristate "SMB135X Battery Charger" depends on I2C - select POWER_SUPPLY help Say Y to include support for SMB135X Battery Charger. SMB135X is a dual path switching mode charger capable of charging @@ -45,7 +41,6 @@ config SMB135X_CHARGER config SMB1351_USB_CHARGER tristate "smb1351 usb charger (with VBUS detection)" depends on I2C - select POWER_SUPPLY help Say Y to enable support for the SMB1351 switching mode based charger. The driver supports charging control (enable/disable) and @@ -65,7 +60,6 @@ config MSM_BCL_PERIPHERAL_CTL bool "BCL driver to control the PMIC BCL peripheral" depends on SPMI depends on MSM_BCL_CTL - select POWER_SUPPLY help Say Y here to enable this BCL PMIC peripheral driver. This driver provides routines to configure and monitor the BCL @@ -83,14 +77,12 @@ config BATTERY_BCL config QPNP_SMB2 tristate "SMB2 Battery Charger" depends on MFD_SPMI_PMIC - select POWER_SUPPLY help Enables support for the SMB2 charging peripheral config SMB138X_CHARGER tristate "SMB138X Battery Charger" depends on MFD_I2C_PMIC - select POWER_SUPPLY help Say Y to include support for SMB138X Battery Charger. SMB1380 is a dual phase 6A battery charger, and SMB1381 is a single @@ -101,8 +93,7 @@ config SMB138X_CHARGER config QPNP_QNOVO bool "QPNP QNOVO driver" - depends on SPMI - select POWER_SUPPLY + depends on MFD_SPMI_PMIC help Say Y here to enable the Qnovo pulse charging engine. Qnovo driver accepts pulse parameters via sysfs entries and programs the hardware diff --git a/drivers/power/qcom-charger/Makefile b/drivers/power/supply/qcom/Makefile similarity index 100% rename from drivers/power/qcom-charger/Makefile rename to drivers/power/supply/qcom/Makefile diff --git a/drivers/power/qcom-charger/battery_current_limit.c b/drivers/power/supply/qcom/battery_current_limit.c similarity index 100% rename from drivers/power/qcom-charger/battery_current_limit.c rename to drivers/power/supply/qcom/battery_current_limit.c diff --git a/drivers/power/qcom-charger/batterydata-lib.c b/drivers/power/supply/qcom/batterydata-lib.c similarity index 100% rename from drivers/power/qcom-charger/batterydata-lib.c rename to drivers/power/supply/qcom/batterydata-lib.c diff --git a/drivers/power/qcom-charger/bcl_peripheral.c b/drivers/power/supply/qcom/bcl_peripheral.c similarity index 100% rename from drivers/power/qcom-charger/bcl_peripheral.c rename to drivers/power/supply/qcom/bcl_peripheral.c diff --git a/drivers/power/qcom-charger/fg-core.h b/drivers/power/supply/qcom/fg-core.h similarity index 100% rename from drivers/power/qcom-charger/fg-core.h rename to drivers/power/supply/qcom/fg-core.h diff --git a/drivers/power/qcom-charger/fg-memif.c b/drivers/power/supply/qcom/fg-memif.c similarity index 100% rename from drivers/power/qcom-charger/fg-memif.c rename to drivers/power/supply/qcom/fg-memif.c diff --git a/drivers/power/qcom-charger/fg-reg.h b/drivers/power/supply/qcom/fg-reg.h similarity index 100% rename from drivers/power/qcom-charger/fg-reg.h rename to drivers/power/supply/qcom/fg-reg.h diff --git a/drivers/power/qcom-charger/fg-util.c b/drivers/power/supply/qcom/fg-util.c similarity index 100% rename from drivers/power/qcom-charger/fg-util.c rename to drivers/power/supply/qcom/fg-util.c diff --git a/drivers/power/qcom-charger/msm_bcl.c b/drivers/power/supply/qcom/msm_bcl.c similarity index 100% rename from drivers/power/qcom-charger/msm_bcl.c rename to drivers/power/supply/qcom/msm_bcl.c diff --git a/drivers/power/qcom-charger/pmic-voter.c b/drivers/power/supply/qcom/pmic-voter.c similarity index 100% rename from drivers/power/qcom-charger/pmic-voter.c rename to drivers/power/supply/qcom/pmic-voter.c diff --git a/drivers/power/qcom-charger/pmic-voter.h b/drivers/power/supply/qcom/pmic-voter.h similarity index 100% rename from drivers/power/qcom-charger/pmic-voter.h rename to drivers/power/supply/qcom/pmic-voter.h diff --git a/drivers/power/qcom-charger/qpnp-fg-gen3.c b/drivers/power/supply/qcom/qpnp-fg-gen3.c similarity index 100% rename from drivers/power/qcom-charger/qpnp-fg-gen3.c rename to drivers/power/supply/qcom/qpnp-fg-gen3.c diff --git a/drivers/power/qcom-charger/qpnp-fg.c b/drivers/power/supply/qcom/qpnp-fg.c similarity index 100% rename from drivers/power/qcom-charger/qpnp-fg.c rename to drivers/power/supply/qcom/qpnp-fg.c diff --git a/drivers/power/qcom-charger/qpnp-qnovo.c b/drivers/power/supply/qcom/qpnp-qnovo.c similarity index 100% rename from drivers/power/qcom-charger/qpnp-qnovo.c rename to drivers/power/supply/qcom/qpnp-qnovo.c diff --git a/drivers/power/qcom-charger/qpnp-smb2.c b/drivers/power/supply/qcom/qpnp-smb2.c similarity index 100% rename from drivers/power/qcom-charger/qpnp-smb2.c rename to drivers/power/supply/qcom/qpnp-smb2.c diff --git a/drivers/power/qcom-charger/qpnp-smbcharger.c b/drivers/power/supply/qcom/qpnp-smbcharger.c similarity index 100% rename from drivers/power/qcom-charger/qpnp-smbcharger.c rename to drivers/power/supply/qcom/qpnp-smbcharger.c diff --git a/drivers/power/qcom-charger/smb-lib.c b/drivers/power/supply/qcom/smb-lib.c similarity index 100% rename from drivers/power/qcom-charger/smb-lib.c rename to drivers/power/supply/qcom/smb-lib.c diff --git a/drivers/power/qcom-charger/smb-lib.h b/drivers/power/supply/qcom/smb-lib.h similarity index 100% rename from drivers/power/qcom-charger/smb-lib.h rename to drivers/power/supply/qcom/smb-lib.h diff --git a/drivers/power/qcom-charger/smb-reg.h b/drivers/power/supply/qcom/smb-reg.h similarity index 100% rename from drivers/power/qcom-charger/smb-reg.h rename to drivers/power/supply/qcom/smb-reg.h diff --git a/drivers/power/qcom-charger/smb1351-charger.c b/drivers/power/supply/qcom/smb1351-charger.c similarity index 100% rename from drivers/power/qcom-charger/smb1351-charger.c rename to drivers/power/supply/qcom/smb1351-charger.c diff --git a/drivers/power/qcom-charger/smb135x-charger.c b/drivers/power/supply/qcom/smb135x-charger.c similarity index 100% rename from drivers/power/qcom-charger/smb135x-charger.c rename to drivers/power/supply/qcom/smb135x-charger.c diff --git a/drivers/power/qcom-charger/smb138x-charger.c b/drivers/power/supply/qcom/smb138x-charger.c similarity index 100% rename from drivers/power/qcom-charger/smb138x-charger.c rename to drivers/power/supply/qcom/smb138x-charger.c diff --git a/drivers/power/qcom-charger/storm-watch.c b/drivers/power/supply/qcom/storm-watch.c similarity index 100% rename from drivers/power/qcom-charger/storm-watch.c rename to drivers/power/supply/qcom/storm-watch.c diff --git a/drivers/power/qcom-charger/storm-watch.h b/drivers/power/supply/qcom/storm-watch.h similarity index 100% rename from drivers/power/qcom-charger/storm-watch.h rename to drivers/power/supply/qcom/storm-watch.h