From patchwork Sun Mar 15 10:04:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 11438819 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4BB6B921 for ; Sun, 15 Mar 2020 10:04:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29E58206EB for ; Sun, 15 Mar 2020 10:04:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.b="ysAKBEQw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728207AbgCOKEY (ORCPT ); Sun, 15 Mar 2020 06:04:24 -0400 Received: from outils.crapouillou.net ([89.234.176.41]:50276 "EHLO crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728197AbgCOKEY (ORCPT ); Sun, 15 Mar 2020 06:04:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1584266661; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=OPgCFclnK+dYLWIKySdQ0LeSCQYlJQFqnweXUYr2lRo=; b=ysAKBEQwfZwp6cOlmO4u+3BgcS/CCdEDygsjhdOMkCSKoxy6/WEn1P5MGahPXsWKU3c7W8 Rd/6leiWLqbLWtQdq/U3ztJJX7cEoDhYyqRou0GzIyYMSQmrGUwYYTR1yWU/HRiUQIQ/tC /POQvZVhIAQWEplzYVD3EJg05swJNRs= From: Paul Cercueil To: Nick Dyer , Dmitry Torokhov , Rob Herring , Mark Rutland Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 1/2] dt-bindings: input: Update atmel,maxtouch.txt to YAML Date: Sun, 15 Mar 2020 11:04:15 +0100 Message-Id: <20200315100416.14151-1-paul@crapouillou.net> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Update atmel,maxtouch.txt to YAML. The new 'vdd-supply' property was added in the process. Signed-off-by: Paul Cercueil --- .../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 diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt deleted file mode 100644 index c88919480d37..000000000000 --- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt +++ /dev/null @@ -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 - . - - 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 = ; - }; diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.yaml b/Documentation/devicetree/bindings/input/atmel,maxtouch.yaml new file mode 100644 index 000000000000..1b138a9836bf --- /dev/null +++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.yaml @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%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 + +properties: + compatible: + enum: + - atmel,maxtouch + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + vdd-supply: + description: Phandle to regulator providing power to the touchscreen + + linux,gpio-keymap: + minItems: 1 + maxItems: 8 + 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, + starting at the LSB. Linux keycodes are defined in + . + + 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) + +required: + - compatible + - reg + - interrupts + +additionalProperties: false + +examples: + - | + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + mxt224-touchscreen@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + + interrupt-parent = <&gpx0>; + interrupts = <4 IRQ_TYPE_EDGE_FALLING>; + + vdd-supply = <&tsp_reg>; + }; + }; From patchwork Sun Mar 15 10:04:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 11438821 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D257E921 for ; Sun, 15 Mar 2020 10:04:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1C4220575 for ; Sun, 15 Mar 2020 10:04:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.b="XXxWrlPv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728220AbgCOKEc (ORCPT ); Sun, 15 Mar 2020 06:04:32 -0400 Received: from outils.crapouillou.net ([89.234.176.41]:50322 "EHLO crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728197AbgCOKEb (ORCPT ); Sun, 15 Mar 2020 06:04:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1584266662; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8K4at98VmVZ/sFGzndyiaIeGeVtmYp4j33U5NwycmlE=; b=XXxWrlPvXOPw8dW7Zjt0Mj2VJjdLgy7L/rL79sPujQA4p3Kw5LOsk6GmefWjmi6Y/W7EaQ AS4rdhpXZo6VXsaaiDQKlpFNrWS44lsEacQ6DjKK1nY6W73CA4tzAKm7iu1ckJl2MU6vNF 5KrkOENWf1EGUI4ieLRvp5VxTfQtlvU= From: Paul Cercueil To: Nick Dyer , Dmitry Torokhov , Rob Herring , Mark Rutland Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 2/2] input: atmel_mxt_ts: Add support for optional regulator Date: Sun, 15 Mar 2020 11:04:16 +0100 Message-Id: <20200315100416.14151-2-paul@crapouillou.net> In-Reply-To: <20200315100416.14151-1-paul@crapouillou.net> References: <20200315100416.14151-1-paul@crapouillou.net> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Add support for an optional "vdd" regulator, as some platforms require a regulator to be enabled for the touchscreen to be enabled. Signed-off-by: Paul Cercueil --- drivers/input/touchscreen/atmel_mxt_ts.c | 25 +++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index ae60442efda0..b3511dad475a 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -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; }