From: xuwei9 Date: Thu, 25 Apr 2019 04:29:25 +0000 (+0800) Subject: kernel:Troika remove small charger X-Git-Tag: MMI-RSA31.Q1-48-36-11~135 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=af463c0b72566b4bd5c3131e954af719b7566c4e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git kernel:Troika remove small charger Troika remove small charger Change-Id: Ib28693ebc3e6bfbd08c4917915a18b3d0ff0c3a7 Signed-off-by: xuwei9 Reviewed-on: https://gerrit.mot.com/1342502 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- diff --git a/drivers/power/supply/s2mu00x_battery.c b/drivers/power/supply/s2mu00x_battery.c index 866b19b688bb..0498a7f4a155 100644 --- a/drivers/power/supply/s2mu00x_battery.c +++ b/drivers/power/supply/s2mu00x_battery.c @@ -3909,7 +3909,7 @@ static void set_max_allowed_current_ma(struct s2mu00x_battery_info *chip, chip->temp_allowed_fastchg_current_ma, chip->target_fastchg_current_ma); } - +#if defined(CONFIG_SMALL_CHARGER) static int set_property_on_smallcharger(struct s2mu00x_battery_info *chip, enum power_supply_property prop, int val) { @@ -3935,6 +3935,7 @@ static int set_property_on_smallcharger(struct s2mu00x_battery_info *chip, return rc; } +#endif #define HEARTBEAT_DELAY_MS 30000 #define HEARTBEAT_HOLDOFF_MS 10000 @@ -4364,8 +4365,9 @@ static int s2mu00x_battery_probe(struct platform_device *pdev) battery->input_current = 0; battery->charging_current = 0; battery->topoff_current = 0; +#if defined(CONFIG_SMALL_CHARGER) battery->small_input_flag = 0; - +#endif battery->max_input_current = battery->pdata->max_input_current; battery->max_charging_current = battery->pdata->max_charging_current; #if defined(CONFIG_USE_CCIC)