Commit 038c4bf8 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'ib/5.17-cros-ec-keyb' into next 

Merge changes to ChromeOS EC Keyboard driver.
parents c8532465 d95bca4f

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*

arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -253,18 +253,18 @@ 
				interrupt-controller;

				reg = <0x14 4>;

				interrupt-map =

					<0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

					<1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

					<2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,

					<3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,

					<4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,

					<5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,

					<6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

					<7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

					<8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,

					<9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

					<10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,

					<11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

					<0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

					<1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

					<2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,

					<3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,

					<4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,

					<5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,

					<6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

					<7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

					<8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,

					<9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

					<10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,

					<11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map-mask = <0xffffffff 0x0>;

			};

		};

arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -293,18 +293,18 @@ 
				interrupt-controller;

				reg = <0x14 4>;

				interrupt-map =

					<0 0 &gic 0 0 GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

					<1 0 &gic 0 0 GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

					<2 0 &gic 0 0 GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,

					<3 0 &gic 0 0 GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,

					<4 0 &gic 0 0 GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,

					<5 0 &gic 0 0 GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,

					<6 0 &gic 0 0 GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

					<7 0 &gic 0 0 GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

					<8 0 &gic 0 0 GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,

					<9 0 &gic 0 0 GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

					<10 0 &gic 0 0 GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,

					<11 0 &gic 0 0 GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

					<0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

					<1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

					<2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,

					<3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,

					<4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,

					<5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,

					<6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

					<7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,

					<8 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,

					<9 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

					<10 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,

					<11 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-map-mask = <0xffffffff 0x0>;

			};

		};