From: "Rajanikanth H.V" rajanikanth.hv@stericsson.com
dt property, 'battery-type' shall be one of supported technology type instead blank. refer:Documentation/devicetree/bindings/power_supply/ab8500/fg.txt for the list of supported types
thanks to Francesco Lavra for highlighting missing of_node_put(...)
for '3.7-rc5': of git://git.infradead.org/battery-2.6.git
Acked-by: Lee Jones lee.jones@linaro.org Signed-off-by: Rajanikanth H.V rajanikanth.hv@stericsson.com --- drivers/power/ab8500_bmdata.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/power/ab8500_bmdata.c b/drivers/power/ab8500_bmdata.c index 03cc528..2230b2c 100644 --- a/drivers/power/ab8500_bmdata.c +++ b/drivers/power/ab8500_bmdata.c @@ -461,7 +461,6 @@ bmdevs_of_probe(struct device *dev, struct device_node *np_bat_supply; struct abx500_bm_data *bat; const char *btech; - char bat_tech[8]; int i, thermistor;
*battery = &ab8500_bm_data; @@ -488,12 +487,10 @@ bmdevs_of_probe(struct device *dev, "stericsson,battery-type", NULL); if (!btech) { dev_warn(dev, "missing property battery-name/type\n"); - strcpy(bat_tech, "UNKNOWN"); - } else { - strcpy(bat_tech, btech); + of_node_put(np_bat_supply); + return -EINVAL; } - - if (strncmp(bat_tech, "LION", 4) == 0) { + if (strncmp(btech, "LION", 4) == 0) { bat->no_maintenance = true; bat->chg_unknown_bat = true; bat->bat_type[BATTERY_UNKNOWN].charge_full_design = 2600; @@ -508,7 +505,7 @@ bmdevs_of_probe(struct device *dev, if (thermistor == NTC_EXTERNAL) { btype->batres_tbl = temp_to_batres_tbl_ext_thermistor; - } else if (strncmp(bat_tech, "LION", 4) == 0) { + } else if (strncmp(btech, "LION", 4) == 0) { btype->batres_tbl = temp_to_batres_tbl_9100; } else {
From: "Rajanikanth H.V" rajanikanth.hv@stericsson.com
ab8500_fg driver prepares instance list of fuelgauge which is required by btemp driver for battery identification. So make sure that ab8500 fuelgauge list is ready before btemp driver starts.
for '3.7-rc5': of git://git.infradead.org/battery-2.6.git
Acked-by: Lee Jones lee.jones@linaro.org Signed-off-by: Rajanikanth H.V rajanikanth.hv@stericsson.com --- drivers/power/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 696e3a9..070c73d 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -38,7 +38,7 @@ obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o obj-$(CONFIG_BATTERY_RX51) += rx51_battery.o -obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o +obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o
On Mon, Dec 03, 2012 at 11:42:55PM +0530, Rajanikanth H.V wrote:
From: "Rajanikanth H.V" rajanikanth.hv@stericsson.com
ab8500_fg driver prepares instance list of fuelgauge which is required by btemp driver for battery identification. So make sure that ab8500 fuelgauge list is ready before btemp driver starts.
for '3.7-rc5': of git://git.infradead.org/battery-2.6.git
Acked-by: Lee Jones lee.jones@linaro.org Signed-off-by: Rajanikanth H.V rajanikanth.hv@stericsson.com
This one, and "1/2 v2" applied, thanks!
drivers/power/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index 696e3a9..070c73d 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -38,7 +38,7 @@ obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o obj-$(CONFIG_BATTERY_RX51) += rx51_battery.o -obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o +obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o -- 1.7.10.4
From: "Rajanikanth H.V" rajanikanth.hv@stericsson.com
dt property, 'battery-type' shall be one of supported technology type instead blank. refer:Documentation/devicetree/bindings/power_supply/ab8500/fg.txt for the list of supported types
thanks to Francesco Lavra for highlighting missing of_node_put(...)
for '3.7-rc5': of git://git.infradead.org/battery-2.6.git
Uppercase 'DT'. No need for the comma after 'property'. No real need to reference to the documentation. No need to add personal thanks to a commit message. No need to mention the patch's intended route in the commit message.
How about something more like:
Subject: ab8500: Remove initial "UNKNOWN" battery-type string assignment
DT property 'stericsson,battery-type' should always be present in the Device Tree when describing battery hardware. Thus, instead of pointlessly assigning "UNKNOWN" as a valid battery-type, we should actually fail initialisation entirely if the property is missing.
Acked-by: Lee Jones lee.jones@linaro.org Signed-off-by: Rajanikanth H.V rajanikanth.hv@stericsson.com
drivers/power/ab8500_bmdata.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/power/ab8500_bmdata.c b/drivers/power/ab8500_bmdata.c index 03cc528..2230b2c 100644 --- a/drivers/power/ab8500_bmdata.c +++ b/drivers/power/ab8500_bmdata.c @@ -461,7 +461,6 @@ bmdevs_of_probe(struct device *dev, struct device_node *np_bat_supply; struct abx500_bm_data *bat; const char *btech;
- char bat_tech[8]; int i, thermistor;
*battery = &ab8500_bm_data; @@ -488,12 +487,10 @@ bmdevs_of_probe(struct device *dev, "stericsson,battery-type", NULL); if (!btech) { dev_warn(dev, "missing property battery-name/type\n");
strcpy(bat_tech, "UNKNOWN");- } else {
strcpy(bat_tech, btech);
of_node_put(np_bat_supply);return -EINVAL;
- if (strncmp(bat_tech, "LION", 4) == 0) {
- if (strncmp(btech, "LION", 4) == 0) { bat->no_maintenance = true; bat->chg_unknown_bat = true; bat->bat_type[BATTERY_UNKNOWN].charge_full_design = 2600;
@@ -508,7 +505,7 @@ bmdevs_of_probe(struct device *dev, if (thermistor == NTC_EXTERNAL) { btype->batres_tbl = temp_to_batres_tbl_ext_thermistor;
} else if (strncmp(bat_tech, "LION", 4) == 0) {
} else if (strncmp(btech, "LION", 4) == 0) { btype->batres_tbl = temp_to_batres_tbl_9100;-- 1.7.10.4
-
Anton Vorontsov -
Lee Jones -
Rajanikanth H.V