dt-bindings: input: Update atmel,maxtouch.txt to YAML
Subsystems (5)
PATCH 1/2 dt-bindings: input: Update atmel,maxtouch.txt to YAML
Update atmel,maxtouch.txt to YAML. The new 'vdd-supply' property was added in the process.
--- .../bindings/input/atmel,maxtouch.txt | 41 ----------- .../bindings/input/atmel,maxtouch.yaml | 68 +++++++++++++++++++ 2 files changed, 68 insertions(+), 41 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/atmel,maxtouch.txt create mode 100644 Documentation/devicetree/bindings/input/atmel,maxtouch.yaml
Documentation/devicetree/bindings/input/atmel,maxtouch.txt deleted +0 -41
@@ -1,41 +0,0 @@ -Atmel maXTouch touchscreen/touchpad - -Required properties: -- compatible: - atmel,maxtouch - - The following compatibles have been used in various products but are - deprecated: - atmel,qt602240_ts - atmel,atmel_mxt_ts - atmel,atmel_mxt_tp - atmel,mXT224 - -- reg: The I2C address of the device - -- interrupts: The sink for the touchpad's IRQ output - See ../interrupt-controller/interrupts.txt - -Optional properties for main touchpad device: - -- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages - on GPIO bit changes. An array of up to 8 entries can be provided - indicating the Linux keycode mapped to each bit of the status byte, - starting at the LSB. Linux keycodes are defined in - <dt-bindings/input/input.h>. - - Note: the numbering of the GPIOs and the bit they start at varies between - maXTouch devices. You must either refer to the documentation, or - experiment to determine which bit corresponds to which input. Use - KEY_RESERVED for unused padding values. - -- reset-gpios: GPIO specifier for the touchscreen's reset pin (active low) - -Example: - - touch@4b { - compatible = "atmel,maxtouch"; - reg = <0x4b>; - interrupt-parent = <&gpio>; - interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_LEVEL_LOW>; - };
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 2/2 input: atmel_mxt_ts: Add support for optional regulator
Add support for an optional "vdd" regulator, as some platforms require a regulator to be enabled for the touchscreen to be enabled.
--- drivers/input/touchscreen/atmel_mxt_ts.c | 25 +++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
drivers/input/touchscreen/atmel_mxt_ts.c +24 -1
@@ -22,6 +22,7 @@#include <linux/interrupt.h> #include <linux/of.h> #include <linux/property.h> +#include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/gpio/consumer.h> #include <asm/unaligned.h>
@@ -308,6 +309,7 @@ struct mxt_data {struct t7_config t7_cfg;struct mxt_dbg dbg;struct gpio_desc *reset_gpio; +struct regulator *vdd;/* Cached parameters from object table */ u16 T5_address;
@@ -3103,6 +3105,22 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)disable_irq (client->irq); + data->vdd =devm_regulator_get_optional (&client->dev,"vdd" ); +if (IS_ERR (data->vdd)) { + error =PTR_ERR (data->vdd); +dev_err (&client->dev,"Failed to get regulator: %d\n" , error); +return error; + } + +if (data->vdd) { + error =regulator_enable (data->vdd); +if (error) { +dev_err (&client->dev, +"Failed to enable regulator: %d\n" , error); +return error; + } + } +if (data->reset_gpio) {msleep (MXT_RESET_GPIO_TIME );gpiod_set_value (data->reset_gpio,1 );
@@ -3111,7 +3129,7 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) error =mxt_initialize (data);if (error) -return error; + goto err_disable_regulator; error =sysfs_create_group (&client->dev.kobj, &mxt_attr_group);if (error) {
@@ -3125,6 +3143,9 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) err_free_object:mxt_free_input_device (data);mxt_free_object_table (data); +err_disable_regulator: +if (data->vdd) +regulator_disable (data->vdd);return error; }
@@ -3136,6 +3157,8 @@ static int mxt_remove(struct i2c_client *client)sysfs_remove_group (&client->dev.kobj, &mxt_attr_group);mxt_free_input_device (data);mxt_free_object_table (data); +if (data->vdd) +regulator_disable (data->vdd);return 0 ; }
Signature · 1 line
2.25.1
Rob Herring
maintainerQuoted 64 lines · Paul Cercueil
Update atmel,maxtouch.txt to YAML. The new 'vdd-supply' property was added in the process.
Signed-off-by Paul Cercueil <[email protected]>--- .../bindings/input/atmel,maxtouch.txt | 41 ----------- .../bindings/input/atmel,maxtouch.yaml | 68 +++++++++++++++++++ 2 files changed, 68 insertions(+), 41 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/atmel,maxtouch.txt create mode 100644 Documentation/devicetree/bindings/input/atmel,maxtouch.yamlDocumentation/devicetree/bindings/input/atmel,maxtouch.txt deleted +0
-41@@ -1,41 +0,0 @@ -Atmel maXTouch touchscreen/touchpad - -Required properties: -- compatible: - atmel,maxtouch - - The following compatibles have been used in various products but are - deprecated: - atmel,qt602240_ts - atmel,atmel_mxt_ts - atmel,atmel_mxt_tp - atmel,mXT224 - -- reg: The I2C address of the device - -- interrupts: The sink for the touchpad's IRQ output - See ../interrupt-controller/interrupts.txt - -Optional properties for main touchpad device: - -- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages - on GPIO bit changes. An array of up to 8 entries can be provided - indicating the Linux keycode mapped to each bit of the status byte, - starting at the LSB. Linux keycodes are defined in - <dt-bindings/input/input.h>. - - Note: the numbering of the GPIOs and the bit they start at varies between - maXTouch devices. You must either refer to the documentation, or - experiment to determine which bit corresponds to which input. Use - KEY_RESERVED for unused padding values. - -- reset-gpios: GPIO specifier for the touchscreen's reset pin (active low) - -Example: - - touch@4b { - compatible = "atmel,maxtouch"; - reg = <0x4b>; - interrupt-parent = <&gpio>; - interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_LEVEL_LOW>; - };Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +0
-0
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml line 1
Quoted 1 line
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +1
-0@@ -0,0 +1,68 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
Do you have rights to relicense?
Quoted 17 lines
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +17
-0+%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/atmel,maxtouch.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Atmel maXTouch touchscreen/touchpad DT bindings + +maintainers: + - Paul Cercueil <[email protected]> + +properties: + compatible: + enum: + - atmel,maxtouch + + reg: + maxItems: 1
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml line 28
Quoted 10 lines
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +10
-0+ + interrupts: + maxItems: 1 + + vdd-supply: + description: Phandle to regulator providing power to the touchscreen + + linux,gpio-keymap: + minItems: 1 + maxItems: 8
Needs a type reference (uint32-array).
Quoted 4 lines
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +4
-0+ description: > + When enabled, the SPT_GPIOPWN_T19 object sends messages + on GPIO bit changes. An array of up to 8 entries can be provided + indicating the Linux keycode mapped to each bit of the status byte,
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml line 42
Quoted 10 lines
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +10
-0+ starting at the LSB. Linux keycodes are defined in + <dt-bindings/input/input.h>. + + Note: the numbering of the GPIOs and the bit they start at varies between + maXTouch devices. You must either refer to the documentation, or + experiment to determine which bit corresponds to which input. Use + KEY_RESERVED for unused padding values. + + reset-gpios: + description: GPIO specifier for the touchscreen's reset pin (active low)
maxItems: 1
Quoted 7 lines
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +7
-0+ +required: + - compatible + - reg + - interrupts + +additionalProperties: false
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml line 59
Quoted 10 lines
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +10
-0+ +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + mxt224-touchscreen@4a {
touchscreen@4a
Quoted 12 lines
Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file +9
-0+ compatible = "atmel,maxtouch"; + reg = <0x4a>; + + interrupt-parent = <&gpx0>; + interrupts = <4 IRQ_TYPE_EDGE_FALLING>; + + vdd-supply = <&tsp_reg>; + }; + };Signature · 1 line
2.25.1