From 659b0bb01c8e567d4593ffbd7acd6b8ceab0edf3 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sun, 5 Sep 2010 20:36:59 +0200
Subject: [PATCH 10/32] MFD: jz4740-adc: Add support for the touchscreen part of the adc unit

---
 drivers/mfd/jz4740-adc.c   |   27 ++++++++++++++++++++++++---
 include/linux/jz4740-adc.h |    2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index a0bd0cf..3be161e 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -46,9 +46,9 @@
 enum {
 	JZ_ADC_IRQ_ADCIN = 0,
 	JZ_ADC_IRQ_BATTERY,
-	JZ_ADC_IRQ_TOUCH,
-	JZ_ADC_IRQ_PENUP,
-	JZ_ADC_IRQ_PENDOWN,
+	JZ_ADC_IRQ_TS_DATA_READY,
+	JZ_ADC_IRQ_TS_PENUP,
+	JZ_ADC_IRQ_TS_PENDOWN,
 };
 
 struct jz4740_adc {
@@ -226,6 +226,27 @@ static struct resource jz4740_battery_resources[] = {
 	},
 };
 
+static struct resource jz4740_ts_resources[] = {
+	{
+		.start = JZ_ADC_IRQ_TS_DATA_READY,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = JZ_ADC_IRQ_TS_PENUP,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = JZ_ADC_IRQ_TS_PENDOWN,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start	= JZ_REG_ADC_TOUCHSCREEN_BASE,
+		.end	= JZ_REG_ADC_TOUCHSCREEN_BASE + 0xb,
+		.flags	= IORESOURCE_MEM,
+	},
+};
+
+
 const struct mfd_cell jz4740_adc_cells[] = {
 	{
 		.id = 0,
diff --git a/include/linux/jz4740-adc.h b/include/linux/jz4740-adc.h
index 9053f95..3f15f66 100644
--- a/include/linux/jz4740-adc.h
+++ b/include/linux/jz4740-adc.h
@@ -25,7 +25,7 @@ int jz4740_adc_set_config(struct device *dev, uint32_t mask, uint32_t val);
 #define JZ_ADC_CONFIG_BAT_MB		BIT(4)
 
 #define JZ_ADC_CONFIG_DNUM(dnum)	((dnum) << 16)
-#define JZ_ADC_CONFIG_XYZ_OFFSET(dnum)	((xyz) << 13)
+#define JZ_ADC_CONFIG_XYZ_OFFSET(xyz)	((xyz) << 13)
 #define JZ_ADC_CONFIG_SAMPLE_NUM(x)	((x) << 10)
 #define JZ_ADC_CONFIG_CLKDIV(div)	((div) << 5)
 
-- 
1.7.4.1