]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00277663-3 power: sabresd_battery: remove check charger offset on mx6slevk
authorRobin Gong <b38343@freescale.com>
Fri, 30 Aug 2013 07:29:10 +0000 (15:29 +0800)
committerNitin Garg <nitin.garg@freescale.com>
Fri, 16 Jan 2015 03:17:11 +0000 (21:17 -0600)
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)

drivers/power/sabresd_battery.c

index 7949890c7c1f578a1e3249776709aee124c9bf04..0acd16c6b5539136ed72fd33dfd85e22567655ae 100644 (file)
@@ -623,18 +623,20 @@ static struct max8903_pdata *max8903_of_populate_pdata(
                dev_err(dev, "pin pdata->flt: invalid gpio %d\n", pdata->flt);
                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;
 }