From 124d03387d045494712e6037e49854fde217633f Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 2 Nov 2012 15:38:04 +0100 Subject: colibri_t20: wm97xx-battery: android: analog input ugly hack Android immediately shuts down due to too low voltage reading from wm97xx-battery driver on our analog input pins if nothing is connected. Making our hack not Android dependant means driver still fails loading on Android therefore resolving above issue for now. --- drivers/input/touchscreen/wm97xx-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/input') diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c index 37b8d17a8334..2cca5b5e0b1a 100644 --- a/drivers/input/touchscreen/wm97xx-core.c +++ b/drivers/input/touchscreen/wm97xx-core.c @@ -676,7 +676,7 @@ static int wm97xx_probe(struct device *dev) platform_set_drvdata(wm->battery_dev, wm); wm->battery_dev->dev.parent = dev; -#ifdef CONFIG_MACH_COLIBRI_T20 +#if defined(CONFIG_MACH_COLIBRI_T20) && !defined(CONFIG_ANDROID) wm->battery_dev->dev.platform_data = get_colibri_t20_audio_platform_data(); #else wm->battery_dev->dev.platform_data = pdata; -- cgit v1.2.3