Revert "power: move QTI charger drivers to a new sub-directory qcom-charger"

This reverts commit e4d364b91cf5fabcca10ff8fee31af1ca25b3d1b.

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"

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/

drivers/power/qcom-charger/Kconfig

@@ -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

drivers/power/qcom-charger/Makefile

@@ -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