aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-06-21 19:25:20 +0200
committerLars-Peter Clausen <lars@metafoo.de>2010-06-21 19:25:20 +0200
commit1d00244ab2b1aca9822d613d5b9f8968b4fa43ce (patch)
tree1b970eb23a925289e30911e67c183ba1fb610439
parent5909f8586cb94c2cbca9605282711f1eadbec5e1 (diff)
Revert "Use bq27x00 battery driver instead of bq27000."
This reverts commit a6f1e10d879adca8f3f0ec3d8a2c3eaf0882e03f.
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index ba4ee134f30..e8ac76bd17e 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -104,7 +104,7 @@
#include <mach/gta02-fiq.h>
#include <linux/hdq.h>
-#include <linux/bq27x00_battery.h>
+#include <linux/bq27000_battery.h>
#include <linux/platform_battery.h>
#include <linux/jbt6k74.h>
@@ -891,13 +891,14 @@ static struct platform_device gta02_pwm_leds_device = {
/* BQ27000 Battery */
-static int gta02_hdq_read(struct device *dev, unsigned int reg)
-{
- return hdq_read(reg);
-}
-
struct bq27000_platform_data bq27000_pdata = {
- .read = gta02_hdq_read,
+ .name = "battery",
+ .rsense_mohms = 20,
+ .hdq_read = hdq_read,
+ .hdq_write = hdq_write,
+ .hdq_initialized = hdq_initialized,
+ .get_charger_online_status = gta02_get_charger_online_status,
+ .get_charger_active_status = gta02_get_charger_active_status
};
struct platform_device bq27000_battery_device = {