From d587be6106c24d8bbeb0f4a065f36939ffdfa4b8 Mon Sep 17 00:00:00 2001 From: Ramakrishna Pallala Date: Thu, 9 Dec 2010 03:32:42 +0530 Subject: [PATCH] Added Charger Type Support Change-Id: I9d8ebe4d60b27ff041c7e7d00ac7222cfc9c4d21 Signed-off-by: Ramakrishna Pallala --- drivers/power/intel_mdf_battery.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/power/intel_mdf_battery.c b/drivers/power/intel_mdf_battery.c index 9142cc6..a1e88f0 100644 --- a/drivers/power/intel_mdf_battery.c +++ b/drivers/power/intel_mdf_battery.c @@ -492,6 +492,7 @@ static DEVICE_ATTR(emrg_charge_enable, S_IWUGO | S_IRUGO, * msic usb properties */ static enum power_supply_property msic_usb_props[] = { + POWER_SUPPLY_PROP_TYPE, POWER_SUPPLY_PROP_CHARGE_TYPE, POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_HEALTH, @@ -1528,6 +1529,14 @@ static int msic_batt_do_charging(struct msic_power_module_info *mbi, mbi->usb_chrg_props.charger_type = POWER_SUPPLY_CHARGE_TYPE_FAST; + if (mbi->ch_params.chrg_type == CHRG_CDP) + mbi->usb.type = POWER_SUPPLY_TYPE_USB_CDP; + else if (mbi->ch_params.chrg_type == CHRG_DCP) + mbi->usb.type = POWER_SUPPLY_TYPE_USB_DCP; + else if (mbi->ch_params.chrg_type == CHRG_ACA) + mbi->usb.type = POWER_SUPPLY_TYPE_USB_ACA; + else + mbi->usb.type = POWER_SUPPLY_TYPE_USB; mutex_unlock(&mbi->usb_chrg_lock); return 0; } @@ -1572,6 +1581,7 @@ static void msic_update_disconn_status(struct msic_power_module_info *mbi) POWER_SUPPLY_CHARGE_TYPE_NONE; mbi->usb_chrg_props.charger_present = MSIC_USB_CHARGER_NOT_PRESENT; + mbi->usb.type = POWER_SUPPLY_TYPE_USB; } mutex_unlock(&mbi->usb_chrg_lock); -- 1.7.2.3