Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

3 files changed, 1 insertions, 372 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 8e07fe8505fd..a23a94bb4bcb 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -555,18 +555,6 @@ config TOUCHSCREEN_TI_AM335X_TSC
           To compile this driver as a module, choose M here: the
           module will be called ti_am335x_tsc.
 
-config TOUCHSCREEN_ATMEL_TSADCC
-        tristate "Atmel Touchscreen Interface"
-        depends on ARCH_AT91
-        help
-          Say Y here if you have a 4-wire touchscreen connected to the
-          ADC Controller on your Atmel SoC.
-
-          If unsure, say N.
-
-          To compile this driver as a module, choose M here: the
-          module will be called atmel_tsadcc.
-
 config TOUCHSCREEN_UCB1400
         tristate "Philips UCB1400 touchscreen"
         depends on AC97_BUS
@@ -645,7 +633,7 @@ config TOUCHSCREEN_WM9713
 
 config TOUCHSCREEN_WM97XX_ATMEL
         tristate "WM97xx Atmel accelerated touch"
-        depends on TOUCHSCREEN_WM97XX && (AVR32 || ARCH_AT91)
+        depends on TOUCHSCREEN_WM97XX && AVR32
         help
           Say Y here for support for streaming mode with WM97xx touchscreens
           on Atmel AT91 or AVR32 systems with an AC97C module.
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 4d479fb0a768..126479d8c29a 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_TOUCHSCREEN_AD7879_I2C)	+= ad7879-i2c.o
 obj-$(CONFIG_TOUCHSCREEN_AD7879_SPI)    += ad7879-spi.o
 obj-$(CONFIG_TOUCHSCREEN_ADS7846)       += ads7846.o
 obj-$(CONFIG_TOUCHSCREEN_ATMEL_MXT)     += atmel_mxt_ts.o
-obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC)  += atmel_tsadcc.o
 obj-$(CONFIG_TOUCHSCREEN_AUO_PIXCIR)    += auo-pixcir-ts.o
 obj-$(CONFIG_TOUCHSCREEN_BU21013)       += bu21013_ts.o
 obj-$(CONFIG_TOUCHSCREEN_CY8CTMG110)    += cy8ctmg110_ts.o
diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c
deleted file mode 100644
index a7c9d6967d1e..000000000000
--- a/drivers/input/touchscreen/atmel_tsadcc.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- *  Atmel Touch Screen Driver
- *
- *  Copyright (c) 2008 ATMEL
- *  Copyright (c) 2008 Dan Liang
- *  Copyright (c) 2008 TimeSys Corporation
- *  Copyright (c) 2008 Justin Waters
- *
- *  Based on touchscreen code from Atmel Corporation.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- */
-#include <linux/err.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/input.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/clk.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/platform_data/atmel.h>
-#include <mach/cpu.h>
-
-/* Register definitions based on AT91SAM9RL64 preliminary draft datasheet */
-
-#define ATMEL_TSADCC_CR         0x00    /* Control register */
-#define   ATMEL_TSADCC_SWRST    (1 << 0)        /* Software Reset*/
-#define   ATMEL_TSADCC_START    (1 << 1)        /* Start conversion */
-
-#define ATMEL_TSADCC_MR         0x04    /* Mode register */
-#define   ATMEL_TSADCC_TSAMOD   (3    <<  0)    /* ADC mode */
-#define     ATMEL_TSADCC_TSAMOD_ADC_ONLY_MODE   (0x0)   /* ADC Mode */
-#define     ATMEL_TSADCC_TSAMOD_TS_ONLY_MODE    (0x1)   /* Touch Screen Only Mode */
-#define   ATMEL_TSADCC_LOWRES   (1    <<  4)    /* Resolution selection */
-#define   ATMEL_TSADCC_SLEEP    (1    <<  5)    /* Sleep mode */
-#define   ATMEL_TSADCC_PENDET   (1    <<  6)    /* Pen Detect selection */
-#define   ATMEL_TSADCC_PRES     (1    <<  7)    /* Pressure Measurement Selection */
-#define   ATMEL_TSADCC_PRESCAL  (0x3f <<  8)    /* Prescalar Rate Selection */
-#define   ATMEL_TSADCC_EPRESCAL (0xff <<  8)    /* Prescalar Rate Selection (Extended) */
-#define   ATMEL_TSADCC_STARTUP  (0x7f << 16)    /* Start Up time */
-#define   ATMEL_TSADCC_SHTIM    (0xf  << 24)    /* Sample & Hold time */
-#define   ATMEL_TSADCC_PENDBC   (0xf  << 28)    /* Pen Detect debouncing time */
-
-#define ATMEL_TSADCC_TRGR       0x08    /* Trigger register */
-#define   ATMEL_TSADCC_TRGMOD   (7      <<  0)  /* Trigger mode */
-#define     ATMEL_TSADCC_TRGMOD_NONE            (0 << 0)
-#define     ATMEL_TSADCC_TRGMOD_EXT_RISING      (1 << 0)
-#define     ATMEL_TSADCC_TRGMOD_EXT_FALLING     (2 << 0)
-#define     ATMEL_TSADCC_TRGMOD_EXT_ANY         (3 << 0)
-#define     ATMEL_TSADCC_TRGMOD_PENDET          (4 << 0)
-#define     ATMEL_TSADCC_TRGMOD_PERIOD          (5 << 0)
-#define     ATMEL_TSADCC_TRGMOD_CONTINUOUS      (6 << 0)
-#define   ATMEL_TSADCC_TRGPER   (0xffff << 16)  /* Trigger period */
-
-#define ATMEL_TSADCC_TSR        0x0C    /* Touch Screen register */
-#define   ATMEL_TSADCC_TSFREQ   (0xf <<  0)     /* TS Frequency in Interleaved mode */
-#define   ATMEL_TSADCC_TSSHTIM  (0xf << 24)     /* Sample & Hold time */
-
-#define ATMEL_TSADCC_CHER       0x10    /* Channel Enable register */
-#define ATMEL_TSADCC_CHDR       0x14    /* Channel Disable register */
-#define ATMEL_TSADCC_CHSR       0x18    /* Channel Status register */
-#define   ATMEL_TSADCC_CH(n)    (1 << (n))      /* Channel number */
-
-#define ATMEL_TSADCC_SR         0x1C    /* Status register */
-#define   ATMEL_TSADCC_EOC(n)   (1 << ((n)+0))  /* End of conversion for channel N */
-#define   ATMEL_TSADCC_OVRE(n)  (1 << ((n)+8))  /* Overrun error for channel N */
-#define   ATMEL_TSADCC_DRDY     (1 << 16)       /* Data Ready */
-#define   ATMEL_TSADCC_GOVRE    (1 << 17)       /* General Overrun Error */
-#define   ATMEL_TSADCC_ENDRX    (1 << 18)       /* End of RX Buffer */
-#define   ATMEL_TSADCC_RXBUFF   (1 << 19)       /* TX Buffer full */
-#define   ATMEL_TSADCC_PENCNT   (1 << 20)       /* Pen contact */
-#define   ATMEL_TSADCC_NOCNT    (1 << 21)       /* No contact */
-
-#define ATMEL_TSADCC_LCDR       0x20    /* Last Converted Data register */
-#define   ATMEL_TSADCC_DATA     (0x3ff << 0)    /* Channel data */
-
-#define ATMEL_TSADCC_IER        0x24    /* Interrupt Enable register */
-#define ATMEL_TSADCC_IDR        0x28    /* Interrupt Disable register */
-#define ATMEL_TSADCC_IMR        0x2C    /* Interrupt Mask register */
-#define ATMEL_TSADCC_CDR0       0x30    /* Channel Data 0 */
-#define ATMEL_TSADCC_CDR1       0x34    /* Channel Data 1 */
-#define ATMEL_TSADCC_CDR2       0x38    /* Channel Data 2 */
-#define ATMEL_TSADCC_CDR3       0x3C    /* Channel Data 3 */
-#define ATMEL_TSADCC_CDR4       0x40    /* Channel Data 4 */
-#define ATMEL_TSADCC_CDR5       0x44    /* Channel Data 5 */
-
-#define ATMEL_TSADCC_XPOS       0x50
-#define ATMEL_TSADCC_Z1DAT      0x54
-#define ATMEL_TSADCC_Z2DAT      0x58
-
-#define PRESCALER_VAL(x)        ((x) >> 8)
-
-#define ADC_DEFAULT_CLOCK       100000
-
-struct atmel_tsadcc {
-        struct input_dev        *input;
-        char                    phys[32];
-        struct clk              *clk;
-        int                     irq;
-        unsigned int            prev_absx;
-        unsigned int            prev_absy;
-        unsigned char           bufferedmeasure;
-};
-
-static void __iomem             *tsc_base;
-
-#define atmel_tsadcc_read(reg)          __raw_readl(tsc_base + (reg))
-#define atmel_tsadcc_write(reg, val)    __raw_writel((val), tsc_base + (reg))
-
-static irqreturn_t atmel_tsadcc_interrupt(int irq, void *dev)
-{
-        struct atmel_tsadcc     *ts_dev = (struct atmel_tsadcc *)dev;
-        struct input_dev        *input_dev = ts_dev->input;
-
-        unsigned int status;
-        unsigned int reg;
-
-        status = atmel_tsadcc_read(ATMEL_TSADCC_SR);
-        status &= atmel_tsadcc_read(ATMEL_TSADCC_IMR);
-
-        if (status & ATMEL_TSADCC_NOCNT) {
-                /* Contact lost */