diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-20 23:49:34 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-20 23:49:34 +0200 |
| commit | 45c9a60d02c004524fbea967cf79411232abb939 (patch) | |
| tree | db3d105895bde773f48abc5f146d10c2097412a2 | |
| parent | 5c40321e6e6a8ca8552c5c69d041d7f7f3205318 (diff) | |
| parent | 5909f8586cb94c2cbca9605282711f1eadbec5e1 (diff) | |
Merge branch 'gta02-machine-2.6.34' into om-gta02-2.6.34
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 15bede380cc..cb5a8e5790a 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -102,6 +102,7 @@ config MACH_NEO1973_GTA02 select S3C_DEV_USB_HOST select S3C_DEV_NAND select FIQ + select S3C24XX_GPIO_EXTRA64 help Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index e8ac76bd17e..ba4ee134f30 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/bq27000_battery.h> +#include <linux/bq27x00_battery.h> #include <linux/platform_battery.h> #include <linux/jbt6k74.h> @@ -891,14 +891,13 @@ 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 = { - .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 + .read = gta02_hdq_read, }; struct platform_device bq27000_battery_device = { |