[RAMEN9610-14249][9610] drivers: battery: update pre-processor for small charger
authorKeunho Hwang <keunho.hwang@samsung.com>
Mon, 8 Apr 2019 02:14:56 +0000 (11:14 +0900)
committerhskang <hs1218.kang@samsung.com>
Sun, 21 Apr 2019 09:10:11 +0000 (18:10 +0900)
Change-Id: Ie83dd4460dc8efc87abbf666f3ce699d06f6e181
Signed-off-by: Keunho Hwang <keunho.hwang@samsung.com>
drivers/power/supply/s2mu00x_battery.c

index 5774fb2822a3adec0604dcdb35a9952db4041028..2c953fedcb27af9b7d27c0a91a7855e52576f397 100644 (file)
@@ -278,16 +278,19 @@ static int set_charging_current(struct s2mu00x_battery_info *battery)
        /*Limit input & charging current according to the max current*/
        if (battery->cable_type == POWER_SUPPLY_TYPE_PREPARE_TA ||
                battery->cable_type == POWER_SUPPLY_TYPE_USB_PD) {
+#if defined(CONFIG_USE_CCIC)
                pr_info("%s, %d, %d\n", __func__, input_current, battery->pd_input_current);
                input_current = battery->pd_input_current;
+#endif
 
                if (input_current >= 1500)
                        input_current = input_current - 50;
-
+#if defined(CONFIG_SMALL_CHARGER)
                if (input_current > 2000) {
                        battery->small_input_flag = input_current - 2000;
                        input_current = 2000;
                }
+#endif
        } else {
                if (battery->rp_attach &&
                                !(battery->cable_type == POWER_SUPPLY_TYPE_BATTERY ||
@@ -532,7 +535,9 @@ static int set_battery_status(struct s2mu00x_battery_info *battery,
                battery->input_current = 0;
                battery->charging_current = 0;
                battery->topoff_current = 0;
+#if defined(CONFIG_SMALL_CHARGER)
                battery->small_input_flag = 0;
+#endif
                break;
 
        case POWER_SUPPLY_STATUS_FULL:
@@ -2080,7 +2085,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;