Commit 1e90e262 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare input updates for 5.19 merge window.
parents b26ff913 5f76955a

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

+22 −0
Original line number Diff line number Diff line
@@ -18,10 +18,20 @@ properties: 
      - items:

          - const: allwinner,sun50i-a64-lradc

          - const: allwinner,sun8i-a83t-r-lradc

      - const: allwinner,sun50i-r329-lradc

      - items:

          - const: allwinner,sun20i-d1-lradc

          - const: allwinner,sun50i-r329-lradc



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  resets:

    maxItems: 1



  interrupts:

    maxItems: 1
@@ -68,6 +78,18 @@ required: 
  - interrupts

  - vref-supply



if:

  properties:

    compatible:

      contains:

        enum:

          - allwinner,sun50i-r329-lradc



then:

  required:

    - clocks

    - resets



additionalProperties: false



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 Diff line number Diff line
@@ -15,13 +15,15 @@ description: | 
  Google's ChromeOS EC Keyboard is a simple matrix keyboard

  implemented on a separate EC (Embedded Controller) device. It provides

  a message for reading key scans from the EC. These are then converted

  into keycodes for processing by the kernel.



allOf:

  - $ref: "/schemas/input/matrix-keymap.yaml#"

  into keycodes for processing by the kernel. This device also supports

  switches/buttons like power and volume buttons.



properties:

  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



  google,needs-ghost-filter:
@@ -41,15 +43,31 @@ properties: 
      where the lower 16 bits are reserved. This property is specified only

      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:

  - 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



examples:

  - |

    #include <dt-bindings/input/input.h>

    cros-ec-keyb {

    keyboard-controller {

        compatible = "google,cros-ec-keyb";

        keypad,num-rows = <8>;

        keypad,num-columns = <13>;
@@ -113,3 +131,9 @@ examples: 
            /* UP      LEFT    */

            0x070b0067 0x070c0069>;

    };

  - |

    /* No matrix keyboard, just buttons/switches */

    keyboard-controller {

        compatible = "google,cros-ec-keyb-switches";

    };

...

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -13382,6 +13382,7 @@ F: net/core/drop_monitor.c 
NETWORKING DRIVERS

M:	"David S. Miller" <davem@davemloft.net>

M:	Jakub Kicinski <kuba@kernel.org>

M:	Paolo Abeni <pabeni@redhat.com>

L:	netdev@vger.kernel.org

S:	Maintained

Q:	https://patchwork.kernel.org/project/netdevbpf/list/
@@ -13428,6 +13429,7 @@ F: tools/testing/selftests/drivers/net/dsa/ 
NETWORKING [GENERAL]

M:	"David S. Miller" <davem@davemloft.net>

M:	Jakub Kicinski <kuba@kernel.org>

M:	Paolo Abeni <pabeni@redhat.com>

L:	netdev@vger.kernel.org

S:	Maintained

Q:	https://patchwork.kernel.org/project/netdevbpf/list/

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 5

PATCHLEVEL = 17

SUBLEVEL = 0

EXTRAVERSION = -rc8

EXTRAVERSION =

NAME = Superb Owl



# *DOCUMENTATION*