From: Robin Gong <b38343@freescale.com>
Date: Fri, 30 Aug 2013 07:29:10 +0000 (+0800)
Subject: MLK-11703-3: power: sabresd_battery: remove check charger offset on mx6slevk
X-Git-Tag: C0P2-H0.0--20200415~4167
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=8997c2e0f38deede54bee3ce76b24efe903815b4;p=linux.git

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)
---

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;
 }