diff options
| author | Robin Gong <b38343@freescale.com> | 2013-08-30 15:29:10 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 16:29:42 +0800 |
| commit | 7ecd0e7d156d2b8119f0ced133beeb00b1e0ccd2 (patch) | |
| tree | e080f4f0873b1d483f74d60734969686f213bd86 /drivers/power | |
| parent | d7d4cae373d0d2b362cdf6db3550d3f33840521b (diff) | |
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 <b38343@freescale.com>
(cherry picked from commit 7683c62cf2290629f09983744d5a3987a4d64669)
(cherry picked from commit 5f29715585ae82a435aa5ba0fe6393a53c10f87d)
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
(cherry picked from commit c00d547719c695c7ff02180edaf58b90344d419c)
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/sabresd_battery.c | 25 |
1 files 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; } |