3 files changed, 48 insertions, 3 deletions
diff --git a/include/linux/input/fusion_F0710A.h b/include/linux/input/fusion_F0710A.h
new file mode 100644
index 000000000000..7d152cbdd06e
--- /dev/null
+++ b/include/linux/input/fusion_F0710A.h
@@ -0,0 +1,20 @@
+/* linux/input/fusion_F0710A.h
+ *
+ * Platform data for Fusion F0710A driver
+ *
+ * Copyright (c) 2013 Toradex AG (stefan.agner@toradex.ch)
+ *
+ *  For licencing details see kernel-base/COPYING
+ */
+
+#ifndef __LINUX_I2C_FUSION_F0710A_H
+#define __LINUX_I2C_FUSION_F0710A_H
+
+/* Board specific touch screen initial values */
+struct fusion_f0710a_init_data {
+	int	(*pinmux_fusion_pins)(void);
+	int	gpio_int;
+	int	gpio_reset;
+};
+
+#endif /*  __LINUX_I2C_FUSION_F0710A_H */
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 1cd6d901dcd4..c24d913a1209 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -563,6 +563,7 @@ struct nand_chip {
 #define NAND_MFR_AMD		0x01
 #define NAND_MFR_SANDISK	0x45
 #define NAND_MFR_INTEL		0x89
+#define NAND_MFR_EON		0x92
 
 /**
  * struct nand_flash_dev - NAND Flash Device ID Structure
diff --git a/include/linux/mvf_adc.h b/include/linux/mvf_adc.h
index 26562531afe0..93f464ff9343 100644
--- a/include/linux/mvf_adc.h
+++ b/include/linux/mvf_adc.h
@@ -24,8 +24,8 @@
 /* Conversion RES Mode Selection  3-2 */
 #define CLEAR_MODE_BIT		0xC
 #define BIT8			0x00
-#define BIT10			0x01
-#define BIT12			0x10
+#define BIT10			0x04
+#define BIT12			0x08
 /* Low-Power Configuration 7 */
 #define CLEAR_ADLPC_BIT		0x80
 #define ADLPC_EN		0x80
@@ -83,7 +83,7 @@
 #define ADC_HC1		0x04/* Control register for hardware triggers 1 */
 
 #define IRQ_EN		0x80
-#define ADCHC0(x)	((x)&0xF)
+#define ADCHC0(x)	((x)&0x1F)
 #define AIEN1		0x00000080
 #define COCOA		0x00000000
 
@@ -177,6 +177,22 @@ enum adc_channel {
 	ADC13,
 	ADC14,
 	ADC15,
+	ADC16,
+	ADC17,
+	ADC18,
+	ADC19,
+	ADC20,
+	ADC21,
+	ADC22,
+	ADC23,
+	ADC24,
+	ADC25,
+	ADC26,
+	ADC27,
+	ADC28,
+	ADC29,
+	ADC30,
+	ADC31,
 };
 
 struct adc_feature {
@@ -201,4 +217,12 @@ struct adc_feature {
 	unsigned int result0, result1;
 };
 
+#ifdef __KERNEL__
+extern int mvf_adc_initiate(unsigned int adc);
+
+extern int mvf_adc_set(unsigned int adc, struct adc_feature *adc_fea);
+
+extern int mvf_adc_register_and_convert(unsigned int adc, unsigned char channel);
+#endif
+
 #endif