Commit 12a0d410 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge commit '89c52146' into for-6.17/upstream-fixes 



This bringig in a KEY_PERFORMANCE definition, which a followup fix will depend
on.

Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parents cc54ed51 89c52146

Documentation/devicetree/bindings/input/syna,rmi4.yaml

+20 −0
Original line number Diff line number Diff line
@@ -89,6 +89,24 @@ properties: 
    required:

      - reg



  rmi4-f1a@1a:

    type: object

    additionalProperties: false

    $ref: input.yaml#

    description:

      RMI4 Function 1A is for capacitive keys.



    properties:

      reg:

        maxItems: 1



      linux,keycodes:

        minItems: 1

        maxItems: 4



    required:

      - reg



patternProperties:

  "^rmi4-f1[12]@1[12]$":

    type: object
@@ -201,6 +219,7 @@ allOf: 


examples:

  - |

    #include <dt-bindings/input/linux-event-codes.h>

    #include <dt-bindings/interrupt-controller/irq.h>



    i2c {
@@ -234,6 +253,7 @@ examples: 


            rmi4-f1a@1a {

                reg = <0x1a>;

                linux,keycodes = <KEY_BACK KEY_HOME KEY_MENU>;

            };

        };

    };

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ properties: 
      - focaltech,ft5452

      - focaltech,ft6236

      - focaltech,ft8201

      - focaltech,ft8716

      - focaltech,ft8719



  reg:

Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
* NXP LPC32xx SoC Touchscreen Controller (TSC)



Required properties:

- compatible: must be "nxp,lpc3220-tsc"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: The TSC/ADC interrupt



Example:



	tsc@40048000 {

		compatible = "nxp,lpc3220-tsc";

		reg = <0x40048000 0x1000>;

		interrupt-parent = <&mic>;

		interrupts = <39 0>;

	};

Documentation/devicetree/bindings/input/touchscreen/nxp,lpc3220-tsc.yaml

0 → 100644
+43 −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/touchscreen/nxp,lpc3220-tsc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: NXP LPC32xx SoC Touchscreen Controller (TSC)



maintainers:

  - Frank Li <Frank.Li@nxp.com>



properties:

  compatible:

    const: nxp,lpc3220-tsc



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - interrupts



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/lpc32xx-clock.h>



    touchscreen@40048000 {

        compatible = "nxp,lpc3220-tsc";

        reg = <0x40048000 0x1000>;

        interrupt-parent = <&mic>;

        interrupts = <39 0>;

        clocks = <&clk LPC32XX_CLK_ADC>;

    };

Documentation/devicetree/bindings/input/touchscreen/sitronix,st1232.yaml

+29 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ unevaluatedProperties: false 


examples:

  - |

    #include <dt-bindings/input/linux-event-codes.h>

    i2c {

            #address-cells = <1>;

            #size-cells = <0>;
@@ -46,5 +47,33 @@ examples: 
                    reg = <0x55>;

                    interrupts = <2 0>;

                    gpios = <&gpio1 166 0>;



                    touch-overlay {

                            segment-0 {

                                    label = "Touchscreen";

                                    x-origin = <0>;

                                    x-size = <240>;

                                    y-origin = <40>;

                                    y-size = <280>;

                            };



                            segment-1a {

                                    label = "Camera light";

                                    linux,code = <KEY_LIGHTS_TOGGLE>;

                                    x-origin = <40>;

                                    x-size = <40>;

                                    y-origin = <0>;

                                    y-size = <40>;

                            };



                            segment-2a {

                                    label = "Power";

                                    linux,code = <KEY_POWER>;

                                    x-origin = <160>;

                                    x-size = <40>;

                                    y-origin = <0>;

                                    y-size = <40>;

                            };

                    };

            };

    };