aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSven Rebhan <odinshorse@googlemail.com>2009-02-23 01:21:44 +0000
committerAndy Green <agreen@octopus.localdomain>2009-02-23 01:21:44 +0000
commit1f06c28eaa6e77384a366c3d2ab1ccdbb8a807e0 (patch)
tree5be339d8f4d5bfcf75ac7a7d4306abd9fb7d2330 /arch
parentfe11815966f50ece487d00ba135f901e401524a8 (diff)
The BQ27000 Battery requires HDQ
Move the battery section within the HDQ_GPIO_BITBANG ifdef because it uses functions only available if HDQ bitbanging is enabled. Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index ab731371b87..6f32ccfbf26 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -465,25 +465,6 @@ static void gta02_udc_vbus_draw(unsigned int ma)
#define gta02_udc_vbus_draw NULL
#endif
-/* BQ27000 Battery */
-
-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
-};
-
-struct platform_device bq27000_battery_device = {
- .name = "bq27000-battery",
- .dev = {
- .platform_data = &bq27000_pdata,
- },
-};
-
static struct platform_device gta01_pm_gps_dev = {
.name = "neo1973-pm-gps",
};
@@ -792,6 +773,25 @@ struct platform_device gta02_hdq_device = {
.platform_data = &gta02_hdq_platform_data,
},
};
+
+/* BQ27000 Battery */
+
+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
+};
+
+struct platform_device bq27000_battery_device = {
+ .name = "bq27000-battery",
+ .dev = {
+ .platform_data = &bq27000_pdata,
+ },
+};
#endif
/* vibrator (child of FIQ) */