From 8997c2e0f38deede54bee3ce76b24efe903815b4 Mon Sep 17 00:00:00 2001 From: Robin Gong Date: Fri, 30 Aug 2013 15:29:10 +0800 Subject: [PATCH] MLK-11703-3: power: sabresd_battery: remove check charger offset on mx6slevk cherry-pick below patch: ENGR00277663-3 power: sabresd_battery: remove check charger offset on mx6slevk No need check the charger offset on mx6slevk, since there is no adc converter Signed-off-by: Robin Gong (cherry picked from commit 7683c62cf2290629f09983744d5a3987a4d64669) (cherry picked from commit 5f29715585ae82a435aa5ba0fe6393a53c10f87d) --- drivers/power/supply/sabresd_battery.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/power/supply/sabresd_battery.c b/drivers/power/supply/sabresd_battery.c index c8c07b3be558..2181a6f57de4 100644 --- a/drivers/power/supply/sabresd_battery.c +++ b/drivers/power/supply/sabresd_battery.c @@ -622,17 +622,20 @@ static struct max8903_pdata *max8903_of_populate_pdata( return NULL; } - if (of_property_read_u32(of_node, "offset-charger", - &offset_charger)) - dev_err(dev, "Not setting offset-charger in dts!\n"); - - if (of_property_read_u32(of_node, "offset-discharger", - &offset_discharger)) - dev_err(dev, "Not setting offset-discharger in dts!\n"); - - if (of_property_read_u32(of_node, "offset-usb-charger", - &offset_usb_charger)) - dev_err(dev, "Not setting offset-usb-charger in dts!\n"); + /* no need check offset without adc converter */ + if (!pdata->feature_flag) { + if (of_property_read_u32(of_node, "offset-charger", + &offset_charger)) + dev_err(dev, "Not setting offset-charger in dts!\n"); + + if (of_property_read_u32(of_node, "offset-discharger", + &offset_discharger)) + dev_err(dev, "Not setting offset-discharger in dts!\n"); + + if (of_property_read_u32(of_node, "offset-usb-charger", + &offset_usb_charger)) + dev_err(dev, "Not setting offset-usb-charger in dts!\n"); + } return pdata; } -- 2.17.1