diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-02 15:38:04 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-02 15:38:04 +0100 |
| commit | 124d03387d045494712e6037e49854fde217633f (patch) | |
| tree | 68c1378d31fee1ea5459cd938b657ce09ddc7314 | |
| parent | 6e340490a9cfe6b36b9e6173b8e7e86cf6c3d96b (diff) | |
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.
| -rw-r--r-- | drivers/input/touchscreen/wm97xx-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |