| 1 | From 659b0bb01c8e567d4593ffbd7acd6b8ceab0edf3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Lars-Peter Clausen <lars@metafoo.de> |
| 3 | Date: Sun, 5 Sep 2010 20:36:59 +0200 |
| 4 | Subject: [PATCH 10/32] MFD: jz4740-adc: Add support for the touchscreen part of the adc unit |
| 5 | |
| 6 | --- |
| 7 | drivers/mfd/jz4740-adc.c | 27 ++++++++++++++++++++++++--- |
| 8 | include/linux/jz4740-adc.h | 2 +- |
| 9 | 2 files changed, 25 insertions(+), 4 deletions(-) |
| 10 | |
| 11 | diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c |
| 12 | index a0bd0cf..3be161e 100644 |
| 13 | --- a/drivers/mfd/jz4740-adc.c |
| 14 | +++ b/drivers/mfd/jz4740-adc.c |
| 15 | @@ -46,9 +46,9 @@ |
| 16 | enum { |
| 17 | JZ_ADC_IRQ_ADCIN = 0, |
| 18 | JZ_ADC_IRQ_BATTERY, |
| 19 | - JZ_ADC_IRQ_TOUCH, |
| 20 | - JZ_ADC_IRQ_PENUP, |
| 21 | - JZ_ADC_IRQ_PENDOWN, |
| 22 | + JZ_ADC_IRQ_TS_DATA_READY, |
| 23 | + JZ_ADC_IRQ_TS_PENUP, |
| 24 | + JZ_ADC_IRQ_TS_PENDOWN, |
| 25 | }; |
| 26 | |
| 27 | struct jz4740_adc { |
| 28 | @@ -226,6 +226,27 @@ static struct resource jz4740_battery_resources[] = { |
| 29 | }, |
| 30 | }; |
| 31 | |
| 32 | +static struct resource jz4740_ts_resources[] = { |
| 33 | + { |
| 34 | + .start = JZ_ADC_IRQ_TS_DATA_READY, |
| 35 | + .flags = IORESOURCE_IRQ, |
| 36 | + }, |
| 37 | + { |
| 38 | + .start = JZ_ADC_IRQ_TS_PENUP, |
| 39 | + .flags = IORESOURCE_IRQ, |
| 40 | + }, |
| 41 | + { |
| 42 | + .start = JZ_ADC_IRQ_TS_PENDOWN, |
| 43 | + .flags = IORESOURCE_IRQ, |
| 44 | + }, |
| 45 | + { |
| 46 | + .start = JZ_REG_ADC_TOUCHSCREEN_BASE, |
| 47 | + .end = JZ_REG_ADC_TOUCHSCREEN_BASE + 0xb, |
| 48 | + .flags = IORESOURCE_MEM, |
| 49 | + }, |
| 50 | +}; |
| 51 | + |
| 52 | + |
| 53 | const struct mfd_cell jz4740_adc_cells[] = { |
| 54 | { |
| 55 | .id = 0, |
| 56 | diff --git a/include/linux/jz4740-adc.h b/include/linux/jz4740-adc.h |
| 57 | index 9053f95..3f15f66 100644 |
| 58 | --- a/include/linux/jz4740-adc.h |
| 59 | +++ b/include/linux/jz4740-adc.h |
| 60 | @@ -25,7 +25,7 @@ int jz4740_adc_set_config(struct device *dev, uint32_t mask, uint32_t val); |
| 61 | #define JZ_ADC_CONFIG_BAT_MB BIT(4) |
| 62 | |
| 63 | #define JZ_ADC_CONFIG_DNUM(dnum) ((dnum) << 16) |
| 64 | -#define JZ_ADC_CONFIG_XYZ_OFFSET(dnum) ((xyz) << 13) |
| 65 | +#define JZ_ADC_CONFIG_XYZ_OFFSET(xyz) ((xyz) << 13) |
| 66 | #define JZ_ADC_CONFIG_SAMPLE_NUM(x) ((x) << 10) |
| 67 | #define JZ_ADC_CONFIG_CLKDIV(div) ((div) << 5) |
| 68 | |
| 69 | -- |
| 70 | 1.7.4.1 |
| 71 | |
| 72 | |
