Commit ed3f4e23 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:
 "Just random driver fixups, nothing exiting"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics - avoid using uninitialized variable when probing
  Input: xen-kbdfront - mark expected switch fall-through
  Input: atmel_mxt_ts - mark expected switch fall-through
  Input: cyapa - mark expected switch fall-throughs
  Input: wm97xx-ts - fix exit path
  Input: of_touchscreen - add support for touchscreen-min-x|y
  Input: Fix DIR-685 touchkeys MAINTAINERS entry
  Input: elants_i2c - use DMA safe i2c when possible
  Input: silead - try firmware reload after unsuccessful resume
  Input: st1232 - set INPUT_PROP_DIRECT property
  Input: xilinx_ps2 - convert to using %pOFn instead of device_node.name
  Input: atmel_mxt_ts - fix multiple <linux/property.h> includes
  Input: sun4i-lradc - convert to using %pOFn instead of device_node.name
  Input: pwm-vibrator - correct pwms in DT binding example
parents c7b7eefa cacd9759

Documentation/devicetree/bindings/input/pwm-vibrator.txt

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ Example from Motorola Droid 4: 


	vibrator {

		compatible = "pwm-vibrator";

		pwms = <&pwm8 0 1000000000 0>,

		       <&pwm9 0 1000000000 0>;

		pwms = <&pwm9 0 1000000000 0>,

                       <&pwm8 0 1000000000 0>;

		pwm-names = "enable", "direction";

		direction-duty-cycle-ns = <1000000000>;

	};

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

+4 −2
Original line number Diff line number Diff line 
General Touchscreen Properties:



Optional properties for Touchscreens:

 - touchscreen-min-x		: minimum x coordinate reported (0 if not set)

 - touchscreen-min-y		: minimum y coordinate reported (0 if not set)

 - touchscreen-size-x		: horizontal resolution of touchscreen

				  (in pixels)

				  (maximum x coordinate reported + 1)

 - touchscreen-size-y		: vertical resolution of touchscreen

				  (in pixels)

				  (maximum y coordinate reported + 1)

 - touchscreen-max-pressure	: maximum reported pressure (arbitrary range

				  dependent on the controller)

 - touchscreen-min-pressure	: minimum pressure on the touchscreen to be

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4099,7 +4099,7 @@ D-LINK DIR-685 TOUCHKEYS DRIVER 
M:	Linus Walleij <linus.walleij@linaro.org>

L:	linux-input@vger.kernel.org

S:	Supported

F:	drivers/input/dlink-dir685-touchkeys.c

F:	drivers/input/keyboard/dlink-dir685-touchkeys.c



DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK

M:	Joshua Kinard <kumba@gentoo.org>

drivers/input/keyboard/sun4i-lradc-keys.c

+3 −3
Original line number Diff line number Diff line
@@ -185,19 +185,19 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev, 


		error = of_property_read_u32(pp, "channel", &channel);

		if (error || channel != 0) {

			dev_err(dev, "%s: Inval channel prop\n", pp->name);

			dev_err(dev, "%pOFn: Inval channel prop\n", pp);

			return -EINVAL;

		}



		error = of_property_read_u32(pp, "voltage", &map->voltage);

		if (error) {

			dev_err(dev, "%s: Inval voltage prop\n", pp->name);

			dev_err(dev, "%pOFn: Inval voltage prop\n", pp);

			return -EINVAL;

		}



		error = of_property_read_u32(pp, "linux,code", &map->keycode);

		if (error) {

			dev_err(dev, "%s: Inval linux,code prop\n", pp->name);

			dev_err(dev, "%pOFn: Inval linux,code prop\n", pp);

			return -EINVAL;

		}

drivers/input/misc/xen-kbdfront.c

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ static void xenkbd_backend_changed(struct xenbus_device *dev, 
	case XenbusStateClosed:

		if (dev->state == XenbusStateClosed)

			break;

		/* Missed the backend's CLOSING state -- fallthrough */

		/* fall through - Missed the backend's CLOSING state */

	case XenbusStateClosing:

		xenbus_frontend_closed(dev);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE