Merge branch 'next' into for-linus (efe6f16c) · Commits · EulixOS / Software / Kernel

Documentation/devicetree/bindings/input/cap11xx.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ Required properties:
		"microchip,cap1106"
		"microchip,cap1126"
		"microchip,cap1188"
		"microchip,cap1206"

		reg: The I2C slave address of the device.

0 → 100644

+61 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/input/cypress-sf.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Cypress StreetFighter touchkey controller

		maintainers:
		- Yassine Oudjana <y.oudjana@protonmail.com>

		allOf:
		- $ref: input.yaml#

		properties:
		compatible:
		const: cypress,sf3155

		reg:
		maxItems: 1

		interrupts:
		maxItems: 1

		avdd-supply:
		description: Regulator for AVDD analog voltage

		vdd-supply:
		description: Regulator for VDD digital voltage

		linux,keycodes:
		minItems: 1
		maxItems: 8

		required:
		- compatible
		- reg
		- interrupts
		- avdd-supply
		- vdd-supply

		additionalProperties: false

		examples:
		- \|
		#include <dt-bindings/input/input.h>
		#include <dt-bindings/interrupt-controller/irq.h>
		i2c {
		#address-cells = <1>;
		#size-cells = <0>;

		touchkey@28 {
		compatible = "cypress,sf3155";
		reg = <0x28>;
		interrupt-parent = <&msmgpio>;
		interrupts = <77 IRQ_TYPE_EDGE_FALLING>;
		avdd-supply = <&vreg_l6a_1p8>;
		vdd-supply = <&vdd_3v2_tp>;
		linux,keycodes = <KEY_BACK KEY_MENU>;
		};
		};

+10 −2

Original line number	Diff line number	Diff line
		@@ -4301,7 +4301,7 @@ CHIPONE ICN8318 I2C TOUCHSCREEN DRIVER
		M: Hans de Goede <hdegoede@redhat.com>
		L: linux-input@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
		F: Documentation/devicetree/bindings/input/touchscreen/chipone,icn8318.yaml
		F: drivers/input/touchscreen/chipone_icn8318.c

		CHIPONE ICN8505 I2C TOUCHSCREEN DRIVER
		@@ -5006,6 +5006,13 @@ L: linux-input@vger.kernel.org
		S: Maintained
		F: drivers/input/touchscreen/cy8ctma140.c

		CYPRESS STREETFIGHTER TOUCHKEYS DRIVER
		M: Yassine Oudjana <y.oudjana@protonmail.com>
		L: linux-input@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/input/cypress-sf.yaml
		F: drivers/input/keyboard/cypress-sf.c

		CYTTSP TOUCHSCREEN DRIVER
		M: Linus Walleij <linus.walleij@linaro.org>
		L: linux-input@vger.kernel.org
		@@ -7709,9 +7716,10 @@ F: drivers/media/usb/go7007/

		GOODIX TOUCHSCREEN
		M: Bastien Nocera <hadess@hadess.net>
		M: Hans de Goede <hdegoede@redhat.com>
		L: linux-input@vger.kernel.org
		S: Maintained
		F: drivers/input/touchscreen/goodix.c
		F: drivers/input/touchscreen/goodix*

		GOOGLE ETHERNET DRIVERS
		M: Catherine Sullivan <csully@google.com>

+10 −8

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <linux/input.h>
		#include <linux/gameport.h>
		#include <linux/jiffies.h>
		#include <linux/seq_buf.h>
		#include <linux/timex.h>
		#include <linux/timekeeping.h>

		@@ -338,23 +339,24 @@ static void analog_calibrate_timer(struct analog_port *port)

		static void analog_name(struct analog *analog)
		{
		snprintf(analog->name, sizeof(analog->name), "Analog %d-axis %d-button",
		struct seq_buf s;

		seq_buf_init(&s, analog->name, sizeof(analog->name));
		seq_buf_printf(&s, "Analog %d-axis %d-button",
		hweight8(analog->mask & ANALOG_AXES_STD),
		hweight8(analog->mask & ANALOG_BTNS_STD) + !!(analog->mask & ANALOG_BTNS_CHF) * 2 +
		hweight16(analog->mask & ANALOG_BTNS_GAMEPAD) + !!(analog->mask & ANALOG_HBTN_CHF) * 4);

		if (analog->mask & ANALOG_HATS_ALL)
		snprintf(analog->name, sizeof(analog->name), "%s %d-hat",
		analog->name, hweight16(analog->mask & ANALOG_HATS_ALL));
		seq_buf_printf(&s, " %d-hat",
		hweight16(analog->mask & ANALOG_HATS_ALL));

		if (analog->mask & ANALOG_HAT_FCS)
		strlcat(analog->name, " FCS", sizeof(analog->name));
		seq_buf_printf(&s, " FCS");
		if (analog->mask & ANALOG_ANY_CHF)
		strlcat(analog->name, (analog->mask & ANALOG_SAITEK) ? " Saitek" : " CHF",
		sizeof(analog->name));
		seq_buf_printf(&s, (analog->mask & ANALOG_SAITEK) ? " Saitek" : " CHF");

		strlcat(analog->name, (analog->mask & ANALOG_GAMEPAD) ? " gamepad": " joystick",
		sizeof(analog->name));
		seq_buf_printf(&s, (analog->mask & ANALOG_GAMEPAD) ? " gamepad" : " joystick");
		}

		/*

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ static int iforce_usb_get_id(struct iforce *iforce, u8 id,
		id,
		USB_TYPE_VENDOR \| USB_DIR_IN \|
		USB_RECIP_INTERFACE,
		0, 0, buf, IFORCE_MAX_LENGTH, HZ);
		0, 0, buf, IFORCE_MAX_LENGTH, 1000);
		if (status < 0) {
		dev_err(&iforce_usb->intf->dev,
		"usb_submit_urb failed: %d\n", status);