From patchwork Tue Jul 31 15:18:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pawe=C5=82_Chmiel?= X-Patchwork-Id: 10550909 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E55B11708 for ; Tue, 31 Jul 2018 15:18:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4A902B062 for ; Tue, 31 Jul 2018 15:18:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C84DF2B0E2; Tue, 31 Jul 2018 15:18:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 369712B062 for ; Tue, 31 Jul 2018 15:18:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=P2wjT10rTwGY7Tpsgc+qkz8DuO2opqV0q5lddYtTuUY=; b=soFfeb4X4N+qRs M1qdYfbprmxNoEAdGPUQm22UuZFbiuRf1vDtDs4z/keUhr9RPaJ42ZfjMMkyox4+Wg3cX+0NeCuMg s/fIwd6prjml0EY9XbcdlLTvTpVIZVEyGA2BM33mZPWgHz6apCy6adZlaaDQkP7/E/xt/UD+cLYnk 1V3D7Q5dBEy+9GEBcpLENAoFD5mZEjzRFgxQviI6z/bvFU++gC2TzIjaHWL/xhS8i++j3p9urx13b d4nQNuAoaI742PG4iCxBCtmulufcugFOlB9EDIcouToA6ou1tLM/QehVy6zixpzGVMPXtU3tU1YlQ jlZNeltUzZIHh1dwve6w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkWQ8-0008Uy-9G; Tue, 31 Jul 2018 15:18:44 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkWPx-0008Fe-7G for linux-arm-kernel@lists.infradead.org; Tue, 31 Jul 2018 15:18:34 +0000 Received: by mail-lj1-x243.google.com with SMTP id s12-v6so14072292ljj.0 for ; Tue, 31 Jul 2018 08:18:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OZ94a8W+BvjEbwmHniIBt9d9Nc6fsheuNctdvesDdc8=; b=eXqw1/1CKd3PdVIAa30McnUNJJ4ysC0/HgBx2i00jwKFRhCFW1Xyczpj8H812WrYbA ybPIGIgkpBJmYxWtcyXV5UOz1VrCFT/c8qDzaEuCinzHL5DQdtMJ4JFv4EcwRHvTm97y PyiUDUA1lS4IrM6d2v4Zb04q34TXjTwFxwJhjhZES8eUwTGq504Y+GlWmZxHxdYirFXe HAcdb0tQJw39pIuGGPaJDNs5Oaq5zBp/H27oJiyp1b8/yhZ855iRFca2PsnSEYQIJjKk dsaJo22KMgGGctfHXg3t+xUsebVH1BKUVqBnA8TsPWTIZlmHIn9mXr6Fuhsu6I6StmRu ueGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OZ94a8W+BvjEbwmHniIBt9d9Nc6fsheuNctdvesDdc8=; b=T6b2y80ff5eGQDHO/PraYxmDEnLZ80f2c14gGHAIiFiOWdVB2WHJCIAvBhHoNtsbX9 0lbqK28ffrmKWx3K9e57/dkQoghwP/8BdKgw0WHZlhSTpPjgDU4zw5ckP8dI6MadkeJk H0yH3EhERhlipfXlw1GkBqQPYfA27BjqYY+PdaDg8PCfGEHk1qetO0DSdVG/vV/cwIf8 H3djDgPqc4HenXC6dxIWu/VK0LNjL+VLLm1eiMYLVmwhh1jfWumM4QGWh649T9mlEKPm sBl0v0OyscXEM/E9ggCjLEgQuDO86uDHXXVJClb9zoQcWfOzgzeKqH8T7aF5lmA5V9ur Qw2Q== X-Gm-Message-State: AOUpUlE/jbK/ho/vuJ0oSYD1eeWr9nsLxFgxPb4ArnjcLLvUA3s7NY0R Ao+bwRDqqQ3M4j7kw6IQ7Rg= X-Google-Smtp-Source: AAOMgpdptiUabp5AVa30SIhYXopXkcC0/vAlc9HrefE3Hvtoh/8KgU60xuI/O+ao5PCb9Wr4d5P49Q== X-Received: by 2002:a2e:4d9d:: with SMTP id c29-v6mr15693014ljd.132.1533050301996; Tue, 31 Jul 2018 08:18:21 -0700 (PDT) Received: from localhost.localdomain (user-94-254-173-71.play-internet.pl. [94.254.173.71]) by smtp.googlemail.com with ESMTPSA id p88-v6sm2606209ljp.90.2018.07.31.08.18.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Jul 2018 08:18:21 -0700 (PDT) From: =?utf-8?q?Pawe=C5=82_Chmiel?= To: nick@shmanahar.org Subject: [PATCH v3 1/3] Input: atmel_mxt_ts: Add support for optional regulators. Date: Tue, 31 Jul 2018 17:18:09 +0200 Message-Id: <1533050291-11502-2-git-send-email-pawel.mikolaj.chmiel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533050291-11502-1-git-send-email-pawel.mikolaj.chmiel@gmail.com> References: <1533050291-11502-1-git-send-email-pawel.mikolaj.chmiel@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180731_081833_300165_B8E9B4D7 X-CRM114-Status: GOOD ( 20.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, alexandre.belloni@bootlin.com, dmitry.torokhov@gmail.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, linux-input@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Pawe=C5=82_Chmiel?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds optional regulators, which can be used to power up touchscreen. After enabling regulators, we need to wait 150msec. This value is taken from official driver. It was tested on Samsung Galaxy i9000 (based on Samsung S5PV210 SOC). Signed-off-by: Paweł Chmiel --- Changes from v2: - Move code enabling regulators into separate method, to make code more readable. Changes from v1: - Enable regulators only if reset_gpio is present. - Switch from devm_regulator_get_optional to devm_regulator_get --- drivers/input/touchscreen/atmel_mxt_ts.c | 65 +++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 54fe190fd4bc..2cd7f6db6ba9 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -194,10 +195,10 @@ enum t100_type { /* Delay times */ #define MXT_BACKUP_TIME 50 /* msec */ -#define MXT_RESET_GPIO_TIME 20 /* msec */ #define MXT_RESET_INVALID_CHG 100 /* msec */ #define MXT_RESET_TIME 200 /* msec */ #define MXT_RESET_TIMEOUT 3000 /* msec */ +#define MXT_REGULATOR_DELAY 150 /* msec */ #define MXT_CRC_TIMEOUT 1000 /* msec */ #define MXT_FW_RESET_TIME 3000 /* msec */ #define MXT_FW_CHG_TIMEOUT 300 /* msec */ @@ -310,6 +311,8 @@ struct mxt_data { struct t7_config t7_cfg; struct mxt_dbg dbg; struct gpio_desc *reset_gpio; + struct regulator *vdd_reg; + struct regulator *avdd_reg; /* Cached parameters from object table */ u16 T5_address; @@ -3016,6 +3019,38 @@ static const struct dmi_system_id chromebook_T9_suspend_dmi[] = { { } }; +static int mxt_regulator_enable(struct mxt_data *data) +{ + int error; + + if (data->reset_gpio) { + error = regulator_enable(data->vdd_reg); + if (error) { + dev_err(&data->client->dev, "Failed to enable vdd regulator: %d\n", + error); + return error; + } + + error = regulator_enable(data->avdd_reg); + if (error) { + dev_err(&data->client->dev, "Failed to enable avdd regulator: %d\n", + error); + return error; + } + + /* + * According to maXTouch power sequencing specification, RESET line + * must be kept low until some time after regulators come up to + * voltage + */ + msleep(MXT_REGULATOR_DELAY); + gpiod_set_value(data->reset_gpio, 1); + msleep(MXT_RESET_INVALID_CHG); + } + + return 0; +} + static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct mxt_data *data; @@ -3076,6 +3111,22 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) return error; } + data->vdd_reg = devm_regulator_get(&client->dev, "vdd"); + if (IS_ERR(data->vdd_reg)) { + error = PTR_ERR(data->vdd_reg); + dev_err(&client->dev, "Failed to get vdd regulator: %d\n", + error); + return error; + } + + data->avdd_reg = devm_regulator_get(&client->dev, "avdd"); + if (IS_ERR(data->avdd_reg)) { + error = PTR_ERR(data->avdd_reg); + dev_err(&client->dev, "Failed to get avdd regulator: %d\n", + error); + return error; + } + error = devm_request_threaded_irq(&client->dev, client->irq, NULL, mxt_interrupt, IRQF_ONESHOT, client->name, data); @@ -3086,11 +3137,9 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) disable_irq(client->irq); - if (data->reset_gpio) { - msleep(MXT_RESET_GPIO_TIME); - gpiod_set_value(data->reset_gpio, 1); - msleep(MXT_RESET_INVALID_CHG); - } + error = mxt_regulator_enable(data); + if (error) + return error; error = mxt_initialize(data); if (error) @@ -3116,6 +3165,10 @@ static int mxt_remove(struct i2c_client *client) struct mxt_data *data = i2c_get_clientdata(client); disable_irq(data->irq); + if (data->reset_gpio) { + regulator_disable(data->avdd_reg); + regulator_disable(data->vdd_reg); + } sysfs_remove_group(&client->dev.kobj, &mxt_attr_group); mxt_free_input_device(data); mxt_free_object_table(data);