Commit 765092e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input updates from Dmitry Torokhov:

 - several device tree bindings for input devices have been converted to
   yaml

 - dropped no longer used ixp4xx-beeper and CSR Prima2 PWRC drivers

 - analog joystick has been converted to use ktime API and no longer
   warn about low resolution timers

 - a few driver fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (24 commits)
  Input: analog - always use ktime functions
  Input: mms114 - support MMS134S
  Input: elan_i2c - reduce the resume time for controller in Whitebox
  Input: edt-ft5x06 - added case for EDT EP0110M09
  Input: adc-keys - drop bogus __refdata annotation
  Input: Fix spelling mistake in Kconfig "useable" -> "usable"
  Input: Fix spelling mistake in Kconfig "Modul" -> "Module"
  Input: remove dead CSR Prima2 PWRC driver
  Input: adp5589-keys - use the right header
  Input: adp5588-keys - use the right header
  dt-bindings: input: tsc2005: Convert to YAML schema
  Input: ep93xx_keypad - prepare clock before using it
  dt-bindings: input: sun4i-lradc: Add wakeup-source
  dt-bindings: input: Convert Regulator Haptic binding to a schema
  dt-bindings: input: Convert Pixcir Touchscreen binding to a schema
  dt-bindings: input: Convert ChipOne ICN8318 binding to a schema
  Input: pm8941-pwrkey - fix comma vs semicolon issue
  dt-bindings: power: reset: qcom-pon: Convert qcom PON binding to yaml
  dt-bindings: input: pm8941-pwrkey: Convert pm8941 power key binding to yaml
  dt-bindings: power: reset: Change 'additionalProperties' to true
  ...
parents 926de8c4 0c5483a5

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

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ properties: 
    description:

      Regulator for the LRADC reference voltage



  wakeup-source: true



patternProperties:

  "^button-[0-9]+$":

    type: object

Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
Qualcomm PM8941 PMIC Power Key



PROPERTIES



- compatible:

	Usage: required

	Value type: <string>

	Definition: must be one of:

		    "qcom,pm8941-pwrkey"

		    "qcom,pm8941-resin"

		    "qcom,pmk8350-pwrkey"

		    "qcom,pmk8350-resin"



- reg:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: base address of registers for block



- interrupts:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: key change interrupt; The format of the specifier is

		    defined by the binding document describing the node's

		    interrupt parent.



- debounce:

	Usage: optional

	Value type: <u32>

	Definition: time in microseconds that key must be pressed or released

		    for state change interrupt to trigger.



- bias-pull-up:

	Usage: optional

	Value type: <empty>

	Definition: presence of this property indicates that the KPDPWR_N pin

		    should be configured for pull up.



- linux,code:

	Usage: optional

	Value type: <u32>

	Definition: The input key-code associated with the power key.

		    Use the linux event codes defined in

		    include/dt-bindings/input/linux-event-codes.h

		    When property is omitted KEY_POWER is assumed.



EXAMPLE



	pwrkey@800 {

		compatible = "qcom,pm8941-pwrkey";

		reg = <0x800>;

		interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;

		debounce = <15625>;

		bias-pull-up;

		linux,code = <KEY_POWER>;

	};

Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.yaml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/input/qcom,pm8941-pwrkey.yaml#

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



title: Qualcomm PM8941 PMIC Power Key



maintainers:

  - Courtney Cavin <courtney.cavin@sonymobile.com>

  - Vinod Koul <vkoul@kernel.org>



allOf:

  - $ref: input.yaml#



properties:

  compatible:

    enum:

      - qcom,pm8941-pwrkey

      - qcom,pm8941-resin

      - qcom,pmk8350-pwrkey

      - qcom,pmk8350-resin



  interrupts:

    maxItems: 1



  debounce:

    description: |

          Time in microseconds that key must be pressed or

          released for state change interrupt to trigger.

    $ref: /schemas/types.yaml#/definitions/uint32



  bias-pull-up:

    description: |

           Presence of this property indicates that the KPDPWR_N

           pin should be configured for pull up.

    $ref: /schemas/types.yaml#/definitions/flag



  linux,code:

    description: |

           The input key-code associated with the power key.

           Use the linux event codes defined in

           include/dt-bindings/input/linux-event-codes.h

           When property is omitted KEY_POWER is assumed.



required:

  - compatible

  - interrupts



unevaluatedProperties: false

...

Documentation/devicetree/bindings/input/regulator-haptic.txt

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
* Regulator Haptic Device Tree Bindings



Required Properties:

 - compatible : Should be "regulator-haptic"

 - haptic-supply : Power supply to the haptic motor.

	[*] refer Documentation/devicetree/bindings/regulator/regulator.txt



 - max-microvolt : The maximum voltage value supplied to the haptic motor.

		[The unit of the voltage is a micro]



 - min-microvolt : The minimum voltage value supplied to the haptic motor.

		[The unit of the voltage is a micro]



Example:



	haptics {

		compatible = "regulator-haptic";

		haptic-supply = <&motor_regulator>;

		max-microvolt = <2700000>;

		min-microvolt = <1100000>;

	};

Documentation/devicetree/bindings/input/regulator-haptic.yaml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: "http://devicetree.org/schemas/input/regulator-haptic.yaml#"

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



title: Regulator Haptic Device Tree Bindings



maintainers:

  - Jaewon Kim <jaewon02.kim@samsung.com>



properties:

  compatible:

    const: regulator-haptic



  haptic-supply:

    description: >

      Power supply to the haptic motor



  max-microvolt:

    description: >

      The maximum voltage value supplied to the haptic motor



  min-microvolt:

    description: >

      The minimum voltage value supplied to the haptic motor



required:

  - compatible

  - haptic-supply

  - max-microvolt

  - min-microvolt



additionalProperties: false



examples:

  - |

    haptics {

        compatible = "regulator-haptic";

        haptic-supply = <&motor_regulator>;

        max-microvolt = <2700000>;

        min-microvolt = <1100000>;

    };