From patchwork Mon Jul 15 15:31:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Eichenberger X-Patchwork-Id: 13733612 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C87A0C3DA4A for ; Mon, 15 Jul 2024 15:34:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XrCU6G9DnnMkxpZ0nGUhFrVcFHRKc9c76P/tMQAhH00=; b=PMeXhUQENnJUL8ZAvWGT6hi+ET E6artOBJADPHruW8Qb1nswTj/QXA7EscIKGjCezmvNsYRTfP/5uCrQQRryvKH6PnXVXXM9mifut0W NQ7bvsOg6HmcfTsKuMa3G7i4rkAdHxIMEILfdYlL8AZB8xQESgGyz/L3fqrEQjlRohrnqabh6vZcZ RQ1kQ2NoApfRsr1qfkrwZUBy++Jb/6ZRGo1QmJu1ZOJ+HPpyGXKZLHLKSOIuUU8sIlldGKIRbKHJm C9jguNccJrE+X5iusGcm5eJqZxPcFmM97aTDtiOBqYGZL6Ba4OtSAFQDGFYcFT923Sedr/5325h63 V09TjJKw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTNiN-00000007aSY-3c39; Mon, 15 Jul 2024 15:34:11 +0000 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTNhr-00000007aFG-3YnP for linux-arm-kernel@lists.infradead.org; Mon, 15 Jul 2024 15:33:41 +0000 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-367975543a8so2738955f8f.3 for ; Mon, 15 Jul 2024 08:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057618; x=1721662418; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XrCU6G9DnnMkxpZ0nGUhFrVcFHRKc9c76P/tMQAhH00=; b=UYqQH5HOE+yqg/nApK3QyitP2QdEh2jxE87PYSJd5qvqa5j1DC1QpfuRqXCJuzwUiD JoqIgJGdw1FJb12k7enc1/5h6cq7j8hNhrATK5WKF8hVW+7ff0AfMRkszKFZrZAdQKnF 8zc47N808GnDYfz/4J/F4XXwxYSbwVEiaWJ5xJvfLqOEc+C8T3FBYDV6VMhpVujjAlL2 QiNhDuaQRtNeO8ayUr+E7CJO1f6C90ghcF6NMPRbBjBRGSCUPoDvY08ZRMDNmi29ka+G pNvpuvVus9MMNFmG0TfH/TJnpzja1tPjGh/LIomYiHIJawNhtXCNsFjRmWOtMqm+TuWG HFZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057618; x=1721662418; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XrCU6G9DnnMkxpZ0nGUhFrVcFHRKc9c76P/tMQAhH00=; b=I8PBj3oUUGu/pTHezMMzz9jjtp+NYl2e5qKAzks/N//l2QeMR8XHazfvdg9saLtWBa omjwN3LM2zBWGdvbebmbtSe/7zqgtcyjcSqXeM1/3f9j/FsmgOmUaKLU6hQqDL9V/6Xj RiTS+ZcBmAKDabz79MzzABnVrHE+hHWxQ+XjDuSnvhf48wLBJ8Zwly8uEfQhjfHm6mxk EgW+OpYQYEb+p5GuU+WsA5v2hv2m9AYPwz7cBsg0SE/Q0mTpwMIm3rNQ1YbeqGXjEbCf o4n9Jt2BpmSk+fXqdecxPAtEAVHK6FeBA+SHD/U3yvSYiSBNO1+65II/MLGUkKIfqXxg Dk+Q== X-Forwarded-Encrypted: i=1; AJvYcCXKLL0y5+xoKJw1yFIv6NbEXAO6osluligvAE4NF7QdfYz+VHL9vsGl9cufNvZX4h+pqP6uHiXRyR2uw5w+r1r7BR0a6iGb2lJEGhB9PtR3VwKDS2c= X-Gm-Message-State: AOJu0Yz3H0yax0jK3r6aeHa2+A41JYl841Tapfai7mCss2VfHuQSAuwQ ewA8ZT00CrjhMMBkrqz2XMm5eO7LmmRa0e9jWNkzifU/7Tw4IfWW X-Google-Smtp-Source: AGHT+IHFu8Io6ztt+geSSFK6mvGbGpy+kC8jppmdsA/0W5RtN9ndSF6+krNBDMfvyv6CFAl9AoiYbg== X-Received: by 2002:a5d:6089:0:b0:367:96c5:ae70 with SMTP id ffacd0b85a97d-368240936c8mr67604f8f.31.1721057618058; Mon, 15 Jul 2024 08:33:38 -0700 (PDT) Received: from eichest-laptop.lan ([2a02:168:af72:0:564b:c18:f4fc:19ad]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680dafbf4bsm6720866f8f.73.2024.07.15.08.33.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:33:37 -0700 (PDT) From: Stefan Eichenberger To: nick@shmanahar.org, dmitry.torokhov@gmail.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com, claudiu.beznea@tuxon.dev, linus.walleij@linaro.org, francesco.dolcini@toradex.com, joao.goncalves@toradex.com Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Eichenberger Subject: [PATCH v6 1/3] Input: atmel_mxt_ts - add power off and power on functions Date: Mon, 15 Jul 2024 17:31:21 +0200 Message-ID: <20240715153330.91979-2-eichest@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240715153330.91979-1-eichest@gmail.com> References: <20240715153330.91979-1-eichest@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240715_083339_916842_82622E34 X-CRM114-Status: GOOD ( 17.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Stefan Eichenberger Add a separate function for power off and power on instead of calling regulator_bulk_enable and regulator_bulk_disable directly. Signed-off-by: Stefan Eichenberger Reviewed-by: Joao Paulo Goncalves --- drivers/input/touchscreen/atmel_mxt_ts.c | 56 ++++++++++++++---------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 8a606bd441ae6..9416de53bf9af 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -1307,6 +1307,35 @@ static int mxt_soft_reset(struct mxt_data *data) return 0; } +static int mxt_power_on(struct mxt_data *data) +{ + int error; + + error = regulator_bulk_enable(ARRAY_SIZE(data->regulators), + data->regulators); + if (error) { + dev_err(&data->client->dev, "failed to enable regulators: %d\n", + error); + return error; + } + + msleep(MXT_BACKUP_TIME); + + if (data->reset_gpio) { + /* Wait a while and then de-assert the RESET GPIO line */ + msleep(MXT_RESET_GPIO_TIME); + gpiod_set_value(data->reset_gpio, 0); + msleep(MXT_RESET_INVALID_CHG); + } + + return 0; +} + +static void mxt_power_off(struct mxt_data *data) +{ + regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators); +} + static void mxt_update_crc(struct mxt_data *data, u8 cmd, u8 value) { /* @@ -3305,25 +3334,9 @@ static int mxt_probe(struct i2c_client *client) return error; } - error = regulator_bulk_enable(ARRAY_SIZE(data->regulators), - data->regulators); - if (error) { - dev_err(&client->dev, "failed to enable regulators: %d\n", - error); + error = mxt_power_on(data); + if (error) return error; - } - /* - * The device takes 40ms to come up after power-on according - * to the mXT224 datasheet, page 13. - */ - msleep(MXT_BACKUP_TIME); - - if (data->reset_gpio) { - /* Wait a while and then de-assert the RESET GPIO line */ - msleep(MXT_RESET_GPIO_TIME); - gpiod_set_value(data->reset_gpio, 0); - msleep(MXT_RESET_INVALID_CHG); - } /* * Controllers like mXT1386 have a dedicated WAKE line that could be @@ -3361,8 +3374,8 @@ static int mxt_probe(struct i2c_client *client) mxt_free_input_device(data); mxt_free_object_table(data); err_disable_regulators: - regulator_bulk_disable(ARRAY_SIZE(data->regulators), - data->regulators); + mxt_power_off(data); + return error; } @@ -3374,8 +3387,7 @@ static void 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); - regulator_bulk_disable(ARRAY_SIZE(data->regulators), - data->regulators); + mxt_power_off(data); } static int mxt_suspend(struct device *dev)