OSDN Git Service

power: move QTI charger drivers to a new sub-directory qcom-charger
authorNicholas Troast <ntroast@codeaurora.org>
Fri, 12 Feb 2016 23:34:57 +0000 (15:34 -0800)
committerDavid Keitel <dkeitel@codeaurora.org>
Tue, 22 Mar 2016 18:10:23 +0000 (11:10 -0700)
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>
13 files changed:
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/qcom-charger/Kconfig [new file with mode: 0644]
drivers/power/qcom-charger/Makefile [new file with mode: 0644]
drivers/power/qcom-charger/batterydata-lib.c [moved from drivers/power/batterydata-lib.c with 100% similarity]
drivers/power/qcom-charger/bcl_peripheral.c [moved from drivers/power/bcl_peripheral.c with 100% similarity]
drivers/power/qcom-charger/msm_bcl.c [moved from drivers/power/msm_bcl.c with 100% similarity]
drivers/power/qcom-charger/pmic-voter.c [moved from drivers/power/pmic-voter.c with 100% similarity]
drivers/power/qcom-charger/pmic-voter.h [moved from drivers/power/pmic-voter.h with 100% similarity]
drivers/power/qcom-charger/qpnp-fg.c [moved from drivers/power/qpnp-fg.c with 100% similarity]
drivers/power/qcom-charger/qpnp-smbcharger.c [moved from drivers/power/qpnp-smbcharger.c with 100% similarity]
drivers/power/qcom-charger/smb1351-charger.c [moved from drivers/power/smb1351-charger.c with 100% similarity]
drivers/power/qcom-charger/smb135x-charger.c [moved from drivers/power/smb135x-charger.c with 100% similarity]

index b194a89..931230d 100644 (file)
@@ -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"
index 77477d4..21aceda 100644 (file)
@@ -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 (file)
index 0000000..08932de
--- /dev/null
@@ -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 (file)
index 0000000..e951851
--- /dev/null
@@ -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