diff options
author | Nicholas Troast <ntroast@codeaurora.org> | 2016-02-12 15:34:57 -0800 |
---|---|---|
committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:10:23 -0700 |
commit | 8e10bff713017286c4e27b84400bb33444912f8a (patch) | |
tree | 5b1fcca97d98485140fc348fe50b116e2134e37b | |
parent | a40a7640f246928b63f9fe5712dca3c95686f6d3 (diff) |
power: move QTI charger drivers to a new sub-directory qcom-charger
QTI charger drivers have outgrown thier home in power and deserve their
own sub-directory. Move all QTI charger drivers and their depedencies to
a new sub-directory of power called qcom-charger.
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
-rw-r--r-- | drivers/power/Kconfig | 57 | ||||
-rw-r--r-- | drivers/power/Makefile | 9 | ||||
-rw-r--r-- | drivers/power/qcom-charger/Kconfig | 64 | ||||
-rw-r--r-- | drivers/power/qcom-charger/Makefile | 6 | ||||
-rw-r--r-- | drivers/power/qcom-charger/batterydata-lib.c (renamed from drivers/power/batterydata-lib.c) | 0 | ||||
-rw-r--r-- | drivers/power/qcom-charger/bcl_peripheral.c (renamed from drivers/power/bcl_peripheral.c) | 0 | ||||
-rw-r--r-- | drivers/power/qcom-charger/msm_bcl.c (renamed from drivers/power/msm_bcl.c) | 0 | ||||
-rw-r--r-- | drivers/power/qcom-charger/pmic-voter.c (renamed from drivers/power/pmic-voter.c) | 0 | ||||
-rw-r--r-- | drivers/power/qcom-charger/pmic-voter.h (renamed from drivers/power/pmic-voter.h) | 0 | ||||
-rw-r--r-- | drivers/power/qcom-charger/qpnp-fg.c (renamed from drivers/power/qpnp-fg.c) | 0 | ||||
-rw-r--r-- | drivers/power/qcom-charger/qpnp-smbcharger.c (renamed from drivers/power/qpnp-smbcharger.c) | 0 | ||||
-rw-r--r-- | drivers/power/qcom-charger/smb1351-charger.c (renamed from drivers/power/smb1351-charger.c) | 0 | ||||
-rw-r--r-- | drivers/power/qcom-charger/smb135x-charger.c (renamed from drivers/power/smb135x-charger.c) | 0 |
13 files changed, 73 insertions, 63 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index b194a89a103a..931230d55f90 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -520,65 +520,10 @@ 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 77477d485ac5..21aceda44c9e 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -72,10 +72,5 @@ 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_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/ +obj-$(CONFIG_ARCH_QCOM) += qcom/ +obj-y += qcom-charger/ diff --git a/drivers/power/qcom-charger/Kconfig b/drivers/power/qcom-charger/Kconfig new file mode 100644 index 000000000000..08932de855bb --- /dev/null +++ b/drivers/power/qcom-charger/Kconfig @@ -0,0 +1,64 @@ +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 new file mode 100644 index 000000000000..e951851a9ef8 --- /dev/null +++ b/drivers/power/qcom-charger/Makefile @@ -0,0 +1,6 @@ +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/batterydata-lib.c b/drivers/power/qcom-charger/batterydata-lib.c index 226581468fda..226581468fda 100644 --- a/drivers/power/batterydata-lib.c +++ b/drivers/power/qcom-charger/batterydata-lib.c diff --git a/drivers/power/bcl_peripheral.c b/drivers/power/qcom-charger/bcl_peripheral.c index 85d018a1a8b8..85d018a1a8b8 100644 --- a/drivers/power/bcl_peripheral.c +++ b/drivers/power/qcom-charger/bcl_peripheral.c diff --git a/drivers/power/msm_bcl.c b/drivers/power/qcom-charger/msm_bcl.c index 6b7cefdc0250..6b7cefdc0250 100644 --- a/drivers/power/msm_bcl.c +++ b/drivers/power/qcom-charger/msm_bcl.c diff --git a/drivers/power/pmic-voter.c b/drivers/power/qcom-charger/pmic-voter.c index 8723ea9938b0..8723ea9938b0 100644 --- a/drivers/power/pmic-voter.c +++ b/drivers/power/qcom-charger/pmic-voter.c diff --git a/drivers/power/pmic-voter.h b/drivers/power/qcom-charger/pmic-voter.h index 30cfecad4287..30cfecad4287 100644 --- a/drivers/power/pmic-voter.h +++ b/drivers/power/qcom-charger/pmic-voter.h diff --git a/drivers/power/qpnp-fg.c b/drivers/power/qcom-charger/qpnp-fg.c index f2f8c3da492b..f2f8c3da492b 100644 --- a/drivers/power/qpnp-fg.c +++ b/drivers/power/qcom-charger/qpnp-fg.c diff --git a/drivers/power/qpnp-smbcharger.c b/drivers/power/qcom-charger/qpnp-smbcharger.c index 0c3d41ac0583..0c3d41ac0583 100644 --- a/drivers/power/qpnp-smbcharger.c +++ b/drivers/power/qcom-charger/qpnp-smbcharger.c diff --git a/drivers/power/smb1351-charger.c b/drivers/power/qcom-charger/smb1351-charger.c index 0f18844b9afa..0f18844b9afa 100644 --- a/drivers/power/smb1351-charger.c +++ b/drivers/power/qcom-charger/smb1351-charger.c diff --git a/drivers/power/smb135x-charger.c b/drivers/power/qcom-charger/smb135x-charger.c index 39598f3bd569..39598f3bd569 100644 --- a/drivers/power/smb135x-charger.c +++ b/drivers/power/qcom-charger/smb135x-charger.c |