From: ywj <ywj@rock-chips.com>
Date: Tue, 10 Feb 2015 01:23:33 +0000 (+0800)
Subject: add usb charge config
X-Git-Tag: firefly_0821_release~4263^2~53
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb6303521db989a9e6b426537503fa7f648bd42c;p=firefly-linux-kernel-4.4.55.git

add usb charge config
---

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 4f4ffb692431..a2ea67471c39 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -404,6 +404,14 @@ config BATTERY_RK30_ADC_FAC
         help
           Say Y to enable support for the battery on the RK30.
 
+config BATTERY_RK30_USB_CHARGE
+        tristate "RK30 USB CHARGE"
+        depends on BATTERY_RK30_ADC||BATTERY_RK30_ADC_FAC
+        default y
+        help
+          say Y to enable suspport for the USB battery charge
+
+
 config CHARGER_BQ2415X
 	tristate "TI BQ2415x battery charger driver"
 	depends on I2C
diff --git a/drivers/power/rk30_factory_adc_battery.c b/drivers/power/rk30_factory_adc_battery.c
index d1c8cce46b2f..29eccb739a9e 100755
--- a/drivers/power/rk30_factory_adc_battery.c
+++ b/drivers/power/rk30_factory_adc_battery.c
@@ -2459,6 +2459,7 @@ err_sysfs:
 err_ac_failed:
 	power_supply_unregister(&data ->ac);
 
+err_usb_failed:
 err_battery_failed:
 	power_supply_unregister(&data ->bat);