63 files changed, 3110 insertions, 1167 deletions

diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index 94a20fe8fedf..f9a6e2c75f12 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -293,10 +293,23 @@ X!Idrivers/video/console/fonts.c
 
   <chapter id="input_subsystem">
      <title>Input Subsystem</title>
+     <sect1><title>Input core</title>
 !Iinclude/linux/input.h
 !Edrivers/input/input.c
 !Edrivers/input/ff-core.c
 !Edrivers/input/ff-memless.c
+     </sect1>
+     <sect1><title>Polled input devices</title>
+!Iinclude/linux/input-polldev.h
+!Edrivers/input/input-polldev.c
+     </sect1>
+     <sect1><title>Matrix keyboars/keypads</title>
+!Iinclude/linux/input/matrix_keypad.h
+     </sect1>
+     <sect1><title>Sparse keymap support</title>
+!Iinclude/linux/input/sparse-keymap.h
+!Edrivers/input/sparse-keymap.c
+     </sect1>
   </chapter>
 
   <chapter id="spi">
diff --git a/MAINTAINERS b/MAINTAINERS
index f7b0ced81116..107a5a5a0174 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -486,13 +486,6 @@ S:	Maintained
 F:      drivers/net/appletalk/
 F:      net/appletalk/
 
-APPLETOUCH TOUCHPAD DRIVER
-M:      Johannes Berg <johannes@sipsolutions.net>
-L:      linux-input@vger.kernel.org
-S:      Maintained
-F:      Documentation/input/appletouch.txt
-F:      drivers/input/mouse/appletouch.c
-
 ARC FRAMEBUFFER DRIVER
 M:      Jaya Kumar <jayalk@intworks.biz>
 S:      Maintained
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index a57af3e99c7c..809114d5a5a6 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -866,6 +866,57 @@ static void __init at91_add_device_rtc(void) {}
 
 
 /* --------------------------------------------------------------------
+ *  Touchscreen
+ * -------------------------------------------------------------------- */
+
+#if defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) || defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC_MODULE)
+static u64 tsadcc_dmamask = DMA_BIT_MASK(32);
+static struct at91_tsadcc_data tsadcc_data;
+
+static struct resource tsadcc_resources[] = {
+        [0] = {
+                .start  = AT91SAM9G45_BASE_TSC,
+                .end    = AT91SAM9G45_BASE_TSC + SZ_16K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91SAM9G45_ID_TSC,
+                .end    = AT91SAM9G45_ID_TSC,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static struct platform_device at91sam9g45_tsadcc_device = {
+        .name           = "atmel_tsadcc",
+        .id             = -1,
+        .dev            = {
+                                .dma_mask               = &tsadcc_dmamask,
+                                .coherent_dma_mask      = DMA_BIT_MASK(32),
+                                .platform_data          = &tsadcc_data,
+        },
+        .resource       = tsadcc_resources,
+        .num_resources  = ARRAY_SIZE(tsadcc_resources),
+};
+
+void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data)
+{
+        if (!data)
+                return;
+
+        at91_set_gpio_input(AT91_PIN_PD20, 0);  /* AD0_XR */
+        at91_set_gpio_input(AT91_PIN_PD21, 0);  /* AD1_XL */
+        at91_set_gpio_input(AT91_PIN_PD22, 0);  /* AD2_YT */
+        at91_set_gpio_input(AT91_PIN_PD23, 0);  /* AD3_TB */