From 5cd9c9057bad68148b2f01c8b19886923787af3f Mon Sep 17 00:00:00 2001 From: Subbaraman Narayanamurthy Date: Wed, 9 Mar 2016 16:03:21 -0800 Subject: [PATCH] Revert "power: move QTI charger drivers to a new sub-directory qcom-charger" This reverts commit e4d364b91cf5fabcca10ff8fee31af1ca25b3d1b. --- drivers/power/Kconfig | 57 ++++++++++++++++- drivers/power/Makefile | 9 ++- .../{qcom-charger => }/batterydata-lib.c | 0 .../power/{qcom-charger => }/bcl_peripheral.c | 0 drivers/power/{qcom-charger => }/msm_bcl.c | 0 drivers/power/{qcom-charger => }/pmic-voter.c | 0 drivers/power/{qcom-charger => }/pmic-voter.h | 0 drivers/power/qcom-charger/Kconfig | 64 ------------------- drivers/power/qcom-charger/Makefile | 6 -- drivers/power/{qcom-charger => }/qpnp-fg.c | 0 .../{qcom-charger => }/qpnp-smbcharger.c | 0 .../{qcom-charger => }/smb1351-charger.c | 0 .../{qcom-charger => }/smb135x-charger.c | 0 13 files changed, 63 insertions(+), 73 deletions(-) rename drivers/power/{qcom-charger => }/batterydata-lib.c (100%) rename drivers/power/{qcom-charger => }/bcl_peripheral.c (100%) rename drivers/power/{qcom-charger => }/msm_bcl.c (100%) rename drivers/power/{qcom-charger => }/pmic-voter.c (100%) rename drivers/power/{qcom-charger => }/pmic-voter.h (100%) delete mode 100644 drivers/power/qcom-charger/Kconfig delete mode 100644 drivers/power/qcom-charger/Makefile rename drivers/power/{qcom-charger => }/qpnp-fg.c (100%) rename drivers/power/{qcom-charger => }/qpnp-smbcharger.c (100%) rename drivers/power/{qcom-charger => }/smb1351-charger.c (100%) rename drivers/power/{qcom-charger => }/smb135x-charger.c (100%) diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 931230d55f90..b194a89a103a 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -520,10 +520,65 @@ config AXP20X_POWER This driver provides support for the power supply features of AXP20x PMIC. +config QPNP_SMBCHARGER + tristate "QPNP SMB Charger driver" + depends on SPMI + help + Say Y here to enable the dual path switch mode battery charger which + supports USB detection and battery charging up to 3A. + The driver also offers relevant information to userspace via the + power supply framework. + +config QPNP_FG + tristate "QPNP fuel gauge driver" + depends on SPMI + 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 + fuel gauge. The state of charge is reported through a BMS power + supply property and also sends uevents when the capacity is updated. + +config SMB135X_CHARGER + tristate "SMB135X Battery Charger" + depends on I2C + help + Say Y to include support for SMB135X Battery Charger. + SMB135X is a dual path switching mode charger capable of charging + the battery with 3Amps of current. + The driver supports charger enable/disable. + The driver reports the charger status via the power supply framework. + A charger status change triggers an IRQ via the device STAT pin. + +config SMB1351_USB_CHARGER + tristate "smb1351 usb charger (with VBUS detection)" + depends on I2C + help + Say Y to enable support for the SMB1351 switching mode based charger. + The driver supports charging control (enable/disable) and + charge-current limiting. It also provides USB VBUS detection and + notification support. The driver controls SMB1351 via I2C and + supports device-tree interface. + +config MSM_BCL_CTL + bool "BCL Framework driver" + help + Say Y here to enable this BCL Framework driver. This driver provides + interface, which can be used by the BCL h/w drivers to implement the + basic functionalities. This framework abstracts the underlying + hardware for the top level modules. + +config MSM_BCL_PERIPHERAL_CTL + bool "BCL driver to control the PMIC BCL peripheral" + depends on SPMI + depends on MSM_BCL_CTL + help + Say Y here to enable this BCL PMIC peripheral driver. This driver + provides routines to configure and monitor the BCL + PMIC peripheral. + source "drivers/power/reset/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..77477d485ac5 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -72,5 +72,10 @@ obj-$(CONFIG_CHARGER_TPS65217) += tps65217_charger.o 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_QPNP_SMBCHARGER) += qpnp-smbcharger.o pmic-voter.o +obj-$(CONFIG_QPNP_FG) += qpnp-fg.o +obj-$(CONFIG_SMB135X_CHARGER) += smb135x-charger.o +obj-$(CONFIG_SMB1351_USB_CHARGER) += smb1351-charger.o +obj-$(CONFIG_MSM_BCL_CTL) += msm_bcl.o +obj-$(CONFIG_MSM_BCL_PERIPHERAL_CTL) += bcl_peripheral.o +obj-$(CONFIG_ARCH_QCOM) += qcom/ diff --git a/drivers/power/qcom-charger/batterydata-lib.c b/drivers/power/batterydata-lib.c similarity index 100% rename from drivers/power/qcom-charger/batterydata-lib.c rename to drivers/power/batterydata-lib.c diff --git a/drivers/power/qcom-charger/bcl_peripheral.c b/drivers/power/bcl_peripheral.c similarity index 100% rename from drivers/power/qcom-charger/bcl_peripheral.c rename to drivers/power/bcl_peripheral.c diff --git a/drivers/power/qcom-charger/msm_bcl.c b/drivers/power/msm_bcl.c similarity index 100% rename from drivers/power/qcom-charger/msm_bcl.c rename to drivers/power/msm_bcl.c diff --git a/drivers/power/qcom-charger/pmic-voter.c b/drivers/power/pmic-voter.c similarity index 100% rename from drivers/power/qcom-charger/pmic-voter.c rename to drivers/power/pmic-voter.c diff --git a/drivers/power/qcom-charger/pmic-voter.h b/drivers/power/pmic-voter.h similarity index 100% rename from drivers/power/qcom-charger/pmic-voter.h rename to drivers/power/pmic-voter.h diff --git a/drivers/power/qcom-charger/Kconfig b/drivers/power/qcom-charger/Kconfig deleted file mode 100644 index 08932de855bb..000000000000 --- a/drivers/power/qcom-charger/Kconfig +++ /dev/null @@ -1,64 +0,0 @@ -menu "Qualcomm Technologies Inc Charger and FG Drivers" - -config QPNP_SMBCHARGER - tristate "QPNP SMB Charger driver" - depends on SPMI - select POWER_SUPPLY - help - Say Y here to enable the dual path switch mode battery charger which - supports USB detection and battery charging up to 3A. - The driver also offers relevant information to userspace via the - power supply framework. - -config QPNP_FG - tristate "QPNP fuel gauge driver" - depends on SPMI - select POWER_SUPPLY - 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 - fuel gauge. The state of charge is reported through a BMS power - supply property and also sends uevents when the capacity is updated. - -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 - the battery with 3Amps of current. - The driver supports charger enable/disable. - The driver reports the charger status via the power supply framework. - A charger status change triggers an IRQ via the device STAT pin. - -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 - charge-current limiting. It also provides USB VBUS detection and - notification support. The driver controls SMB1351 via I2C and - supports device-tree interface. - -config MSM_BCL_CTL - bool "BCL Framework driver" - help - Say Y here to enable this BCL Framework driver. This driver provides - interface, which can be used by the BCL h/w drivers to implement the - basic functionalities. This framework abstracts the underlying - hardware for the top level modules. - -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 - PMIC peripheral. - -endmenu diff --git a/drivers/power/qcom-charger/Makefile b/drivers/power/qcom-charger/Makefile deleted file mode 100644 index e951851a9ef8..000000000000 --- a/drivers/power/qcom-charger/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -obj-$(CONFIG_QPNP_SMBCHARGER) += qpnp-smbcharger.o batterydata-lib.o pmic-voter.o -obj-$(CONFIG_QPNP_FG) += qpnp-fg.o -obj-$(CONFIG_SMB135X_CHARGER) += smb135x-charger.o pmic-voter.o -obj-$(CONFIG_SMB1351_USB_CHARGER) += smb1351-charger.o pmic-voter.o -obj-$(CONFIG_MSM_BCL_CTL) += msm_bcl.o -obj-$(CONFIG_MSM_BCL_PERIPHERAL_CTL) += bcl_peripheral.o diff --git a/drivers/power/qcom-charger/qpnp-fg.c b/drivers/power/qpnp-fg.c similarity index 100% rename from drivers/power/qcom-charger/qpnp-fg.c rename to drivers/power/qpnp-fg.c diff --git a/drivers/power/qcom-charger/qpnp-smbcharger.c b/drivers/power/qpnp-smbcharger.c similarity index 100% rename from drivers/power/qcom-charger/qpnp-smbcharger.c rename to drivers/power/qpnp-smbcharger.c diff --git a/drivers/power/qcom-charger/smb1351-charger.c b/drivers/power/smb1351-charger.c similarity index 100% rename from drivers/power/qcom-charger/smb1351-charger.c rename to drivers/power/smb1351-charger.c diff --git a/drivers/power/qcom-charger/smb135x-charger.c b/drivers/power/smb135x-charger.c similarity index 100% rename from drivers/power/qcom-charger/smb135x-charger.c rename to drivers/power/smb135x-charger.c