From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Nov 2013 00:43:53 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v3.13-rc1~65
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=4937e2a6f939a41bf811378e80d71f68aa0950c6

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:
 "Updates for the input subsystem.  You will get an new drivers for
  Hyper-V synthetic keyboard and for Neonode zForce touchscreens, plus a
  bunch of driver fixes and cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (49 commits)
  Revert "Input: ALPS - add support for model found on Dell XT2"
  arm: dts: am335x sk: add touchscreen support
  Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding
  Input: cyttsp4 - replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
  Input: mma8450 - add missing i2c_set_clientdata() in mma8450_probe()
  Input: mpu3050 - add missing i2c_set_clientdata() in mpu3050_probe()
  Input: tnetv107x-keypad - make irqs signed for error handling
  Input: add driver for Neonode zForce based touchscreens
  Input: sh_keysc - enable the driver on all ARM platforms
  Input: remove a redundant max() call
  Input: mousedev - allow disabling even without CONFIG_EXPERT
  Input: allow deselecting serio drivers even without CONFIG_EXPERT
  Input: i8042 - add PNP modaliases
  Input: evdev - fall back to vmalloc for client event buffer
  Input: cypress_ps2 - do not consider data bad if palm is detected
  Input: cypress_ps2 - remove useless cast
  Input: fix PWM-related undefined reference errors
  Input: ALPS - change secondary device's name
  Input: wacom - not all multi-interface devices support touch
  Input: nspire-keypad - add missing clk_disable_unprepare() on error path
  ...
---

4937e2a6f939a41bf811378e80d71f68aa0950c6
diff --cc arch/arm/boot/dts/am335x-evmsk.dts
index 03febf85fd2f,d7c2c0c58437..4718ec4a4dbf
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@@ -452,36 -420,12 +452,46 @@@
  	phy-mode = "rgmii-txid";
  };
  
 +&mmc1 {
 +	status = "okay";
 +	vmmc-supply = <&vmmc_reg>;
 +	bus-width = <4>;
 +};
 +
 +&sham {
 +	status = "okay";
 +};
 +
 +&aes {
 +	status = "okay";
 +};
 +
 +&gpio0 {
 +	ti,no-reset-on-init;
 +};
 +
 +&mcasp1 {
 +		pinctrl-names = "default";
 +		pinctrl-0 = <&mcasp1_pins>;
 +
 +		status = "okay";
 +
 +		op-mode = <0>;          /* MCASP_IIS_MODE */
 +		tdm-slots = <2>;
 +		/* 4 serializers */
 +		serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
 +			0 0 1 2
 +		>;
 +		tx-num-evt = <1>;
 +		rx-num-evt = <1>;
 +};
++
+ &tscadc {
+ 	status = "okay";
+ 	tsc {
+ 		ti,wires = <4>;
+ 		ti,x-plate-resistance = <200>;
+ 		ti,coordinate-readouts = <5>;
+ 		ti,wire-config = <0x00 0x11 0x22 0x33>;
+ 	};
+ };
diff --cc drivers/input/serio/Kconfig
index 1de1e5f8f795,5a96acb667ea..8541f949778d
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@@ -19,9 -19,9 +19,9 @@@ config SERI
  if SERIO
  
  config SERIO_I8042
- 	tristate "i8042 PC Keyboard controller" if EXPERT || !X86
+ 	tristate "i8042 PC Keyboard controller"
  	default y
 -	depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
 +	depends on !PARISC && (!ARM || FOOTBRIDGE_HOST) && \
  		   (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \
  		   !ARC
  	help