diff options
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap-2.6.29/ads7846-detection.patch')
-rw-r--r-- | meta/recipes-kernel/linux/linux-omap-2.6.29/ads7846-detection.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap-2.6.29/ads7846-detection.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/ads7846-detection.patch new file mode 100644 index 0000000000..25a1cb052c --- /dev/null +++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/ads7846-detection.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c | ||
2 | index 2ae5ab8..a68b0a6 100644 | ||
3 | --- a/drivers/input/touchscreen/ads7846.c | ||
4 | +++ b/drivers/input/touchscreen/ads7846.c | ||
5 | @@ -1154,9 +1154,16 @@ static int __devinit ads7846_probe(struct spi_device *spi) | ||
6 | /* take a first sample, leaving nPENIRQ active and vREF off; avoid | ||
7 | * the touchscreen, in case it's not connected. | ||
8 | */ | ||
9 | - (void) ads7846_read12_ser(&spi->dev, | ||
10 | + err = ads7846_read12_ser(&spi->dev, | ||
11 | READ_12BIT_SER(vaux) | ADS_PD10_ALL_ON); | ||
12 | |||
13 | + /* if sample is all 0's or all 1's then there is no device on spi */ | ||
14 | + if ( (err == 0x000) || (err == 0xfff)) { | ||
15 | + dev_info(&spi->dev, "no device detected, test read result was 0x%08X\n", err); | ||
16 | + err = -ENODEV; | ||
17 | + goto err_free_irq; | ||
18 | + } | ||
19 | + | ||
20 | err = sysfs_create_group(&spi->dev.kobj, &ads784x_attr_group); | ||
21 | if (err) | ||
22 | goto err_remove_hwmon; | ||
23 | @@ -1174,7 +1181,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) | ||
24 | err_free_irq: | ||
25 | free_irq(spi->irq, ts); | ||
26 | err_free_gpio: | ||
27 | - if (ts->gpio_pendown != -1) | ||
28 | + if (!ts->get_pendown_state && ts->gpio_pendown != -1) | ||
29 | gpio_free(ts->gpio_pendown); | ||
30 | err_cleanup_filter: | ||
31 | if (ts->filter_cleanup) | ||
32 | @@ -1201,7 +1208,7 @@ static int __devexit ads7846_remove(struct spi_device *spi) | ||
33 | /* suspend left the IRQ disabled */ | ||
34 | enable_irq(ts->spi->irq); | ||
35 | |||
36 | - if (ts->gpio_pendown != -1) | ||
37 | + if (!ts->get_pendown_state && ts->gpio_pendown != -1) | ||
38 | gpio_free(ts->gpio_pendown); | ||
39 | |||
40 | if (ts->filter_cleanup) | ||
41 | |||