Merge remote-tracking branch 'staging/staging-next'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/input/touchscreen/ti_am335x_tsc.c
Simple merge

diff --cc drivers/staging/et131x/et131x.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7753.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7754.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7759.c
Simple merge

diff --cc drivers/staging/imx-drm/imx-drm-core.c
Simple merge

diff --cc drivers/staging/imx-drm/ipuv3-crtc.c
Simple merge

diff --cc include/linux/mfd/ti_am335x_tscadc.h
index 7b68a061cd60f8df9bf64441576f304870bf660f,08cce7f96ab9365359c30a4726d910022f571be5..d498d98f0c2cbfd3c9076aa439433a23caa80899
--- 1/include/linux/mfd/ti_am335x_tscadc.h
--- 2/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@@ -123,20 -131,16 +131,21 @@@
  #define ADC_CLK                       3000000
  #define TOTAL_STEPS           16
  #define TOTAL_CHANNELS                8
+ #define FIFO1_THRESHOLD               19
  
  /*
 -* ADC runs at 3MHz, and it takes
 -* 15 cycles to latch one data output.
 -* Hence the idle time for ADC to
 -* process one sample data would be
 -* around 5 micro seconds.
 -*/
 -#define IDLE_TIMEOUT 5 /* microsec */
 + * time in us for processing a single channel, calculated as follows:
 + *
 + * num cycles = open delay + (sample delay + conv time) * averaging
 + *
 + * num cycles: 152 + (1 + 13) * 16 = 376
 + *
 + * clock frequency: 26MHz / 8 = 3.25MHz
 + * clock period: 1 / 3.25MHz = 308ns
 + *
 + * processing time: 376 * 308ns = 116us
 + */
 +#define IDLE_TIMEOUT 116 /* microsec */
  
  #define TSCADC_CELLS          2