Merge branch 'next' into for-linus (1e90e262) · Commits · jan.koester / Linux

Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml

+22 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,10 +18,20 @@ properties:
	- items:		- items:
	- const: allwinner,sun50i-a64-lradc		- const: allwinner,sun50i-a64-lradc
	- const: allwinner,sun8i-a83t-r-lradc		- const: allwinner,sun8i-a83t-r-lradc
			- const: allwinner,sun50i-r329-lradc
			- items:
			- const: allwinner,sun20i-d1-lradc
			- const: allwinner,sun50i-r329-lradc

	reg:		reg:
	maxItems: 1		maxItems: 1

			clocks:
			maxItems: 1

			resets:
			maxItems: 1

	interrupts:		interrupts:
	maxItems: 1		maxItems: 1

	@@ -68,6 +78,18 @@ required:
	- interrupts		- interrupts
	- vref-supply		- vref-supply

			if:
			properties:
			compatible:
			contains:
			enum:
			- allwinner,sun50i-r329-lradc

			then:
			required:
			- clocks
			- resets

	additionalProperties: false		additionalProperties: false

	examples:		examples:

Documentation/devicetree/bindings/input/azoteq,iqs7222.yaml

0 → 100644

+960 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml

+30 −6

Original line number	Original line	Diff line number	Diff line
	@@ -15,13 +15,15 @@ description: \|
	Google's ChromeOS EC Keyboard is a simple matrix keyboard		Google's ChromeOS EC Keyboard is a simple matrix keyboard
	implemented on a separate EC (Embedded Controller) device. It provides		implemented on a separate EC (Embedded Controller) device. It provides
	a message for reading key scans from the EC. These are then converted		a message for reading key scans from the EC. These are then converted
	into keycodes for processing by the kernel.		into keycodes for processing by the kernel. This device also supports
			switches/buttons like power and volume buttons.
	allOf:
	- $ref: "/schemas/input/matrix-keymap.yaml#"

	properties:		properties:
	compatible:		compatible:
			oneOf:
			- description: ChromeOS EC with only buttons/switches
			const: google,cros-ec-keyb-switches
			- description: ChromeOS EC with keyboard and possibly buttons/switches
	const: google,cros-ec-keyb		const: google,cros-ec-keyb

	google,needs-ghost-filter:		google,needs-ghost-filter:
	@@ -41,15 +43,31 @@ properties:
	where the lower 16 bits are reserved. This property is specified only		where the lower 16 bits are reserved. This property is specified only
	when the keyboard has a custom design for the top row keys.		when the keyboard has a custom design for the top row keys.

			dependencies:
			function-row-phsymap: [ 'linux,keymap' ]
			google,needs-ghost-filter: [ 'linux,keymap' ]

	required:		required:
	- compatible		- compatible

			if:
			properties:
			compatible:
			contains:
			const: google,cros-ec-keyb
			then:
			$ref: "/schemas/input/matrix-keymap.yaml#"
			required:
			- keypad,num-rows
			- keypad,num-columns
			- linux,keymap

	unevaluatedProperties: false		unevaluatedProperties: false

	examples:		examples:
	- \|		- \|
	#include <dt-bindings/input/input.h>		#include <dt-bindings/input/input.h>
	cros-ec-keyb {		keyboard-controller {
	compatible = "google,cros-ec-keyb";		compatible = "google,cros-ec-keyb";
	keypad,num-rows = <8>;		keypad,num-rows = <8>;
	keypad,num-columns = <13>;		keypad,num-columns = <13>;
	@@ -113,3 +131,9 @@ examples:
	/* UP LEFT */		/* UP LEFT */
	0x070b0067 0x070c0069>;		0x070b0067 0x070c0069>;
	};		};
			- \|
			/* No matrix keyboard, just buttons/switches */
			keyboard-controller {
			compatible = "google,cros-ec-keyb-switches";
			};
			...

MAINTAINERS

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13382,6 +13382,7 @@ F: net/core/drop_monitor.c
	NETWORKING DRIVERS		NETWORKING DRIVERS
	M: "David S. Miller" <davem@davemloft.net>		M: "David S. Miller" <davem@davemloft.net>
	M: Jakub Kicinski <kuba@kernel.org>		M: Jakub Kicinski <kuba@kernel.org>
			M: Paolo Abeni <pabeni@redhat.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Maintained		S: Maintained
	Q: https://patchwork.kernel.org/project/netdevbpf/list/		Q: https://patchwork.kernel.org/project/netdevbpf/list/
	@@ -13428,6 +13429,7 @@ F: tools/testing/selftests/drivers/net/dsa/
	NETWORKING [GENERAL]		NETWORKING [GENERAL]
	M: "David S. Miller" <davem@davemloft.net>		M: "David S. Miller" <davem@davemloft.net>
	M: Jakub Kicinski <kuba@kernel.org>		M: Jakub Kicinski <kuba@kernel.org>
			M: Paolo Abeni <pabeni@redhat.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Maintained		S: Maintained
	Q: https://patchwork.kernel.org/project/netdevbpf/list/		Q: https://patchwork.kernel.org/project/netdevbpf/list/

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	VERSION = 5		VERSION = 5
	PATCHLEVEL = 17		PATCHLEVEL = 17
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc8		EXTRAVERSION =
	NAME = Superb Owl		NAME = Superb Owl

	# DOCUMENTATION		# DOCUMENTATION