--- drivers/battery/max77693_charger.c

+++ drivers/battery/max77693_charger.c

@@ -16,10 +16,6 @@

#include "../../arch/arm/mach-msm/board-8064.h"

#endif

-#ifdef CONFIG_FORCE_FAST_CHARGE

-#include <linux/fastchg.h>

-#endif

-

#define ENABLE 1

#define DISABLE 0

@@ -395,14 +391,6 @@ static void max77693_set_charge_current(

max77693_write_reg(charger->max77693->i2c,

MAX77693_CHG_REG_CHG_CNFG_02, reg_data);

} else {

-#ifdef CONFIG_FORCE_FAST_CHARGE

- if (force_fast_charge == 1 && cur < 1000 && charger->cable_type == POWER_SUPPLY_TYPE_USB) {

- cur = 1000;

- pr_info("USB fast charging is ON - %dmA max.\n", cur);

- } else {

- pr_info("USB fast charging is OFF - %dmA max.\n", cur);

- }

-#endif

reg_data |= ((cur * 3 / 100) << 0);

max77693_write_reg(charger->max77693->i2c,

MAX77693_CHG_REG_CHG_CNFG_02, reg_data);

@@ -741,10 +729,16 @@ static int sec_chg_set_property(struct p

cancel_delayed_work_sync(&charger->wpc_work);

/* recheck after cancel_delayed_work_sync */

if (charger->wc_w_state) {

+ union power_supply_propval cable_type;

+ psy_do_property("battery", get,

+ POWER_SUPPLY_PROP_ONLINE, cable_type);

wake_lock(&charger->wpc_wake_lock);

queue_delayed_work(charger->wqueue, &charger->wpc_work,

- msecs_to_jiffies(0));

- charger->wc_w_state = 0;

+ msecs_to_jiffies(500));

+ if (cable_type.intval != POWER_SUPPLY_TYPE_WIRELESS) {

+ charger->wc_w_state = 0;

+ pr_err("%s:cable removed,wireless connected\n", __func__);

+ }

}

}

} else {