ARM64: dts: rk3399-box-rev2: enable hdmi uboot logo display

[firefly-linux-kernel-4.4.55.git] / drivers / power / rt5025-power.c

diff --git a/drivers/power/rt5025-power.c b/drivers/power/rt5025-power.c
index 565912ff50307ea3e3bb92a94a1b988c814c94bb..6d654d7bbe38039b1f967f245fcf0f0aa6beb858 100755 (executable)
--- a/drivers/power/rt5025-power.c
+++ b/drivers/power/rt5025-power.c
@@ -78,6 +78,32 @@ int rt5025_ext_set_charging_buck(int onoff)
 }
 EXPORT_SYMBOL(rt5025_ext_set_charging_buck);
 
+int rt5025_charger_reset_and_reinit(struct rt5025_power_info *pi)
+{
+       struct rt5025_platform_data *pdata = pi->dev->parent->platform_data;
+       int ret;
+
+       RTINFO("\n");
+
+       //do charger reset
+       ret = rt5025_reg_read(pi->i2c, RT5025_REG_CHGCTL4);
+       if (ret < 0)
+               return ret;
+       rt5025_reg_write(pi->i2c, RT5025_REG_CHGCTL4, ret|RT5025_CHGRST_MASK);
+       mdelay(200);
+
+       rt5025_reg_write(pi->i2c, RT5025_REG_CHGCTL2, pdata->power_data->CHGControl2.val);
+       rt5025_reg_write(pi->i2c, RT5025_REG_CHGCTL3, pdata->power_data->CHGControl3.val);
+       rt5025_reg_write(pi->i2c, RT5025_REG_CHGCTL4, pdata->power_data->CHGControl4.val);
+       rt5025_reg_write(pi->i2c, RT5025_REG_CHGCTL5, pdata->power_data->CHGControl5.val);
+       rt5025_reg_write(pi->i2c, RT5025_REG_CHGCTL6, pdata->power_data->CHGControl6.val);
+       //rt5025_reg_write(pi->i2c, RT5025_REG_CHGCTL7, pd->CHGControl7.val);
+       rt5025_assign_bits(pi->i2c, RT5025_REG_CHGCTL7, 0xEF, pdata->power_data->CHGControl7.val);
+       rt5025_reg_write(pi->i2c, 0xA9, 0x60 );
+       return 0;
+}
+EXPORT_SYMBOL(rt5025_charger_reset_and_reinit);
+
 static int rt5025_set_charging_current(struct i2c_client *i2c, int cur_value)
 {
        int ret = 0;
@@ -226,21 +252,39 @@ int rt5025_power_charge_detect(struct rt5025_power_info *info)
        chgstatval = ret;
        RTINFO("chgstat = 0x%02x\n", chgstatval);
 
+       if (info->otg_en)
+       {
+               ret = rt5025_set_bits(info->i2c, RT5025_REG_CHGCTL2, RT5025_CHGBUCKEN_MASK);
+               msleep(100);
+       }
+
        new_acval = (chgstatval&RT5025_CHG_ACONLINE)>>RT5025_CHG_ACSHIFT;
        if (old_acval != new_acval)
        {
                info->ac_online = new_acval;
                power_supply_changed(&info->ac);
        }
-       new_usbval = (chgstatval&RT5025_CHG_USBONLINE)>>RT5025_CHG_USBSHIFT;
+
+       new_usbval = (info->otg_en? \
+               0:(chgstatval&RT5025_CHG_USBONLINE)>>RT5025_CHG_USBSHIFT);
        if (old_usbval != new_usbval)
        {
                info->usb_online = new_usbval;
                power_supply_changed(&info->usb);
        }
 
-       if (old_acval != new_acval || old_usbval != new_usbval)
+       if (info->otg_en && new_acval == 0)
+       {
+               ret = rt5025_clr_bits(info->i2c, RT5025_REG_CHGCTL2, RT5025_CHGBUCKEN_MASK);
+               msleep(100);
+       }
+
+       //if (old_acval != new_acval || old_usbval != new_usbval)
+       if (new_acval || new_usbval)
+       {
+               info->usb_cnt = 0;
                schedule_delayed_work(&info->usb_detect_work, 0); //no delay
+       }
 
        new_chgval = (chgstatval&RT5025_CHGSTAT_MASK)>>RT5025_CHGSTAT_SHIFT;
        
@@ -308,7 +352,7 @@ static void usb_detect_work_func(struct work_struct *work)
        mutex_lock(&pi->var_lock);
        if (pi->ac_online)
        {
-               rt5025_set_charging_current(pi->i2c, 1000);
+               rt5025_set_charging_current(pi->i2c, 2000);
                rt5025_notify_charging_cable(pi->chip->jeita_info, JEITA_AC_ADAPTER);
                pi->usb_cnt = 0;
        }
@@ -318,13 +362,13 @@ static void usb_detect_work_func(struct work_struct *work)
                switch(dwc_vbus_status())
                {
                        case 2: // USB Wall charger
-                               rt5025_set_charging_current(pi->i2c, 1000);
+                               rt5025_set_charging_current(pi->i2c, 2000);
                                rt5025_notify_charging_cable(pi->chip->jeita_info, JEITA_USB_TA);
                                RTINFO("rt5025: detect usb wall charger\n");
                                break;
                        case 1: //normal USB
                        default:
-                               rt5025_set_charging_current(pi->i2c, 500);
+                               rt5025_set_charging_current(pi->i2c, 2000);
                                rt5025_notify_charging_cable(pi->chip->jeita_info, JEITA_NORMAL_USB);
                                RTINFO("rt5025: detect normal usb\n");
                                break;