forked from Xilinx/linux-xlnx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 ...
- Loading branch information
Showing
31 changed files
with
472 additions
and
799 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 0 additions & 55 deletions
55
Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt
This file was deleted.
Oops, something went wrong.
51 changes: 51 additions & 0 deletions
51
Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
# 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 <[email protected]> | ||
- Vinod Koul <[email protected]> | ||
|
||
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 | ||
... |
21 changes: 0 additions & 21 deletions
21
Documentation/devicetree/bindings/input/regulator-haptic.txt
This file was deleted.
Oops, something went wrong.
43 changes: 43 additions & 0 deletions
43
Documentation/devicetree/bindings/input/regulator-haptic.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# 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 <[email protected]> | ||
|
||
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>; | ||
}; |
62 changes: 62 additions & 0 deletions
62
Documentation/devicetree/bindings/input/touchscreen/chipone,icn8318.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
# SPDX-License-Identifier: GPL-2.0 | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/input/touchscreen/chipone,icn8318.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: ChipOne ICN8318 Touchscreen Controller Device Tree Bindings | ||
|
||
maintainers: | ||
- Dmitry Torokhov <[email protected]> | ||
|
||
allOf: | ||
- $ref: touchscreen.yaml# | ||
|
||
properties: | ||
compatible: | ||
const: chipone,icn8318 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
wake-gpios: | ||
maxItems: 1 | ||
|
||
unevaluatedProperties: false | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- wake-gpios | ||
- touchscreen-size-x | ||
- touchscreen-size-y | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/gpio/gpio.h> | ||
#include <dt-bindings/interrupt-controller/arm-gic.h> | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
touchscreen@40 { | ||
compatible = "chipone,icn8318"; | ||
reg = <0x40>; | ||
interrupt-parent = <&pio>; | ||
interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* EINT9 (PG9) */ | ||
pinctrl-names = "default"; | ||
pinctrl-0 = <&ts_wake_pin_p66>; | ||
wake-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */ | ||
touchscreen-size-x = <800>; | ||
touchscreen-size-y = <480>; | ||
touchscreen-inverted-x; | ||
touchscreen-swapped-x-y; | ||
}; | ||
}; | ||
... |
44 changes: 0 additions & 44 deletions
44
Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
This file was deleted.
Oops, something went wrong.
68 changes: 68 additions & 0 deletions
68
Documentation/devicetree/bindings/input/touchscreen/pixcir,pixcir_ts.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
# SPDX-License-Identifier: GPL-2.0 | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/input/touchscreen/pixcir,pixcir_ts.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Pixcir Touchscreen Controller Device Tree Bindings | ||
|
||
maintainers: | ||
- Dmitry Torokhov <[email protected]> | ||
|
||
allOf: | ||
- $ref: touchscreen.yaml# | ||
|
||
properties: | ||
compatible: | ||
enum: | ||
- pixcir,pixcir_ts | ||
- pixcir,pixcir_tangoc | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
interrupts: | ||
maxItems: 1 | ||
|
||
attb-gpio: | ||
maxItems: 1 | ||
|
||
reset-gpios: | ||
maxItems: 1 | ||
|
||
enable-gpios: | ||
maxItems: 1 | ||
|
||
wake-gpios: | ||
maxItems: 1 | ||
|
||
unevaluatedProperties: false | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- attb-gpio | ||
- touchscreen-size-x | ||
- touchscreen-size-y | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/gpio/gpio.h> | ||
#include <dt-bindings/interrupt-controller/arm-gic.h> | ||
i2c { | ||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
touchscreen@5c { | ||
compatible = "pixcir,pixcir_ts"; | ||
reg = <0x5c>; | ||
interrupts = <2 0>; | ||
attb-gpio = <&gpf 2 0 2>; | ||
touchscreen-size-x = <800>; | ||
touchscreen-size-y = <600>; | ||
}; | ||
}; | ||
... |
31 changes: 0 additions & 31 deletions
31
Documentation/devicetree/bindings/input/touchscreen/pixcir_i2c_ts.txt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.