Commit 08b5fa81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull input updates from Dmitry Torokhov:

 - a new driver for Rohm BU21029 touch controller

 - new bitmap APIs: bitmap_alloc, bitmap_zalloc and bitmap_free

 - updates to Atmel, eeti. pxrc and iforce drivers

 - assorted driver cleanups and fixes.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  MAINTAINERS: Add PhoenixRC Flight Controller Adapter
  Input: do not use WARN() in input_alloc_absinfo()
  Input: mark expected switch fall-throughs
  Input: raydium_i2c_ts - use true and false for boolean values
  Input: evdev - switch to bitmap API
  Input: gpio-keys - switch to bitmap_zalloc()
  Input: elan_i2c_smbus - cast sizeof to int for comparison
  bitmap: Add bitmap_alloc(), bitmap_zalloc() and bitmap_free()
  md: Avoid namespace collision with bitmap API
  dm: Avoid namespace collision with bitmap API
  Input: pm8941-pwrkey - add resin entry
  Input: pm8941-pwrkey - abstract register offsets and event code
  Input: iforce - reorganize joystick configuration lists
  Input: atmel_mxt_ts - move completion to after config crc is updated
  Input: atmel_mxt_ts - don't report zero pressure from T9
  Input: atmel_mxt_ts - zero terminate config firmware file
  Input: atmel_mxt_ts - refactor config update code to add context struct
  Input: atmel_mxt_ts - config CRC may start at T71
  Input: atmel_mxt_ts - remove unnecessary debug on ENOMEM
  Input: atmel_mxt_ts - remove duplicate setup of ABS_MT_PRESSURE
  ...
parents 7f02e1ce 13fe7056

Documentation/devicetree/bindings/input/keys.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
General Keys Properties:



Optional properties for Keys:

- power-off-time-sec: Duration in seconds which the key should be kept

	pressed for device to power off automatically. Device with key pressed

	shutdown feature can specify this property.

- linux,keycodes: Specifies the numeric keycode values to be used for

	reporting key presses.

Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt

+10 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ PROPERTIES 
	Value type: <string>

	Definition: must be one of:

		    "qcom,pm8941-pwrkey"

		    "qcom,pm8941-resin"



- reg:

	Usage: required
@@ -32,6 +33,14 @@ PROPERTIES 
	Definition: presence of this property indicates that the KPDPWR_N pin

		    should be configured for pull up.



- linux,code:

	Usage: optional

	Value type: <u32>

	Definition: The input key-code associated with the power key.

		    Use the linux event codes defined in

		    include/dt-bindings/input/linux-event-codes.h

		    When property is omitted KEY_POWER is assumed.



EXAMPLE



	pwrkey@800 {
@@ -40,4 +49,5 @@ EXAMPLE 
		interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;

		debounce = <15625>;

		bias-pull-up;

		linux,code = <KEY_POWER>;

	};

Documentation/devicetree/bindings/input/touchscreen/bu21029.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
* Rohm BU21029 Touch Screen Controller



Required properties:

 - compatible              : must be "rohm,bu21029"

 - reg                     : i2c device address of the chip (0x40 or 0x41)

 - interrupt-parent        : the phandle for the gpio controller

 - interrupts              : (gpio) interrupt to which the chip is connected

 - rohm,x-plate-ohms       : x-plate resistance in Ohm



Optional properties:

 - reset-gpios             : gpio pin to reset the chip (active low)

 - touchscreen-size-x      : horizontal resolution of touchscreen (in pixels)

 - touchscreen-size-y      : vertical resolution of touchscreen (in pixels)

 - touchscreen-max-pressure: maximum pressure value

 - vdd-supply              : power supply for the controller



Example:



	&i2c1 {

		/* ... */



		bu21029: bu21029@40 {

			compatible = "rohm,bu21029";

			reg = <0x40>;

			interrupt-parent = <&gpio1>;

			interrupts = <4 IRQ_TYPE_EDGE_FALLING>;

			reset-gpios = <&gpio6 16 GPIO_ACTIVE_LOW>;

			rohm,x-plate-ohms = <600>;

			touchscreen-size-x = <800>;

			touchscreen-size-y = <480>;

			touchscreen-max-pressure = <4095>;

		};



		/* ... */

	};

Documentation/devicetree/bindings/input/touchscreen/eeti.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
Bindings for EETI touchscreen controller



Required properties:

- compatible:	should be "eeti,exc3000-i2c"

- reg:		I2C address of the chip. Should be set to <0xa>

- interrupts:	interrupt to which the chip is connected



Optional properties:

- attn-gpios:	A handle to a GPIO to check whether interrupt is still

		latched. This is necessary for platforms that lack

		support for level-triggered IRQs.



The following optional properties described in touchscreen.txt are

also supported:



- touchscreen-inverted-x

- touchscreen-inverted-y

- touchscreen-swapped-x-y



Example:



i2c-master {

	touchscreen@a {

		compatible = "eeti,exc3000-i2c";

		reg = <0xa>;

		interrupt-parent = <&gpio>;

		interrupts = <123 IRQ_TYPE_EDGE_RISING>;

		attn-gpios = <&gpio 123 GPIO_ACTIVE_HIGH>;

	};

};

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -11340,6 +11340,13 @@ S: Maintained 
F:	include/linux/personality.h

F:	include/uapi/linux/personality.h



PHOENIX RC FLIGHT CONTROLLER ADAPTER

M:	Marcus Folkesson <marcus.folkesson@gmail.com>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	Documentation/input/devices/pxrc.rst

F:	drivers/input/joystick/pxrc.c



PHONET PROTOCOL

M:	Remi Denis-Courmont <courmisch@gmail.com>

S:	Supported

CRA Git | Maintained and supported by SUSTech CRA and CCSE