From patchwork Mon Sep 12 22:13:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raul Rangel X-Patchwork-Id: 12974150 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52767C6FA82 for ; Mon, 12 Sep 2022 22:14:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230258AbiILWOJ (ORCPT ); Mon, 12 Sep 2022 18:14:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230210AbiILWNx (ORCPT ); Mon, 12 Sep 2022 18:13:53 -0400 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56F564E60F for ; Mon, 12 Sep 2022 15:13:50 -0700 (PDT) Received: by mail-il1-x133.google.com with SMTP id m16so5301167ilg.3 for ; Mon, 12 Sep 2022 15:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=NUJ2mFRmNNirGf1kAydkfNUjnODGrxL6a/2ExPoV0ms=; b=LNBn05wWgYfFwxGwQwXNH8ynal6Isc9H+msuIscES50SvMjd2kAj5QAR/Atolntl35 edmZouMdhKrcTh+L74Pevwlc3TZvmi5zTnjiqSO2sD9RcO+9qX5JnMHErPFhOOtW1WM6 7Dc0r7lgKCA1w7WpNYvlxkzmN/xv6Y/laiHAs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=NUJ2mFRmNNirGf1kAydkfNUjnODGrxL6a/2ExPoV0ms=; b=YJWdYI9eyQqYZDMp8Rc6uRJ52mSbKHF/b1u97K8dMRAeU/l4j6NyU30vq+NdEH3sg0 IrBhCUNGIVGAFiSu0It1a55P1P5uQmSYZZNyDtQX9YxlHaPC2BS2lliZTwnGX4Mtts4U viIEyzIpfVbBnmbGoRnV7Xl3lEXVpzZXrSUqYb3/u4SIkQ1Ii+pELBVuXPWRLrbCkGSQ iWF4il+9syIOGoBqeFrBys8QSfHm6l5aR5OfM+MwTYMYDXit66AJSdQbs2daszOKLJa7 JF3QIy6J3+eWfp06pNNtbqO2zgKD1P3zIzf+9eqHQWWIdd0HpecVV6IoMzGPUX64S796 U2GQ== X-Gm-Message-State: ACgBeo0R9E+TjFFrNHoH34z4uY/00xnrART9lC17Kn4HXhBNAvrQDJXh nNKiX3T0mQKNFxO1Z0LBW/dahw== X-Google-Smtp-Source: AA6agR66XtwxoNStOvOaWE0VbjfN/JAn/jWgrTF7HYmUdQ1Y2IPqOQINV19sYqA0BnuiiexIx21G7Q== X-Received: by 2002:a05:6e02:1886:b0:2eb:438a:c64c with SMTP id o6-20020a056e02188600b002eb438ac64cmr11251879ilu.282.1663020829532; Mon, 12 Sep 2022 15:13:49 -0700 (PDT) Received: from rrangel920.bld.corp.google.com (h24-56-189-219.arvdco.broadband.dynamic.tds.net. [24.56.189.219]) by smtp.gmail.com with ESMTPSA id 18-20020a056e020cb200b002f16e7021f6sm4077334ilg.22.2022.09.12.15.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Sep 2022 15:13:48 -0700 (PDT) From: Raul E Rangel To: linux-acpi@vger.kernel.org, linux-input@vger.kernel.org Cc: andriy.shevchenko@linux.intel.com, jingle.wu@emc.com.tw, mario.limonciello@amd.com, timvp@google.com, linus.walleij@linaro.org, hdegoede@redhat.com, rafael@kernel.org, Raul E Rangel , Cai Huoqing , Dmitry Torokhov , Guenter Roeck , Johnny Chuang , linux-kernel@vger.kernel.org Subject: [PATCH v2 03/13] Input: elants_i2c - Use PM subsystem to manage wake irq Date: Mon, 12 Sep 2022 16:13:07 -0600 Message-Id: <20220912160931.v2.3.I5862429ee3e4de0f9ad5ba01ce07ad99eec10cf0@changeid> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog In-Reply-To: <20220912221317.2775651-1-rrangel@chromium.org> References: <20220912221317.2775651-1-rrangel@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The Elan I2C touchscreen driver is currently manually managing the wake IRQ. This change removes the explicit enable_irq_wake/disable_irq_wake and instead relies on the PM subsystem. This is done by calling dev_pm_set_wake_irq. i2c_device_probe already calls dev_pm_set_wake_irq when using device tree, and i2c_device_remove also already calls dev_pm_clear_wake_irq. There could be some device tree systems that have incorrectly declared `wake` capabilities, so this change will set the wake irq if one is missing. This matches the previous behavior. Signed-off-by: Raul E Rangel --- Changes in v2: - Added elants_i2c to series drivers/input/touchscreen/elants_i2c.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index a56f042adf9d82..80e16b533c452a 100644 --- a/drivers/input/touchscreen/elants_i2c.c +++ b/drivers/input/touchscreen/elants_i2c.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -180,7 +181,6 @@ struct elants_data { u8 cmd_resp[HEADER_SIZE]; struct completion cmd_done; - bool wake_irq_enabled; bool keep_power_in_suspend; /* Must be last to be used for DMA operations */ @@ -1582,6 +1582,15 @@ static int elants_i2c_probe(struct i2c_client *client) if (!client->dev.of_node) device_init_wakeup(&client->dev, true); + /* + * The wake IRQ should be declared via device tree instead of assuming + * the IRQ can wake the system. This is here for legacy reasons and + * will be removed once the i2c-core supports querying ACPI for wake + * capabilities. + */ + if (!client->dev.power.wakeirq) + dev_pm_set_wake_irq(&client->dev, client->irq); + error = devm_device_add_group(&client->dev, &elants_attribute_group); if (error) { dev_err(&client->dev, "failed to create sysfs attributes: %d\n", @@ -1626,7 +1635,7 @@ static int __maybe_unused elants_i2c_suspend(struct device *dev) * The device will automatically enter idle mode * that has reduced power consumption. */ - ts->wake_irq_enabled = (enable_irq_wake(client->irq) == 0); + return 0; } else if (ts->keep_power_in_suspend) { for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) { error = elants_i2c_send(client, set_sleep_cmd, @@ -1655,8 +1664,6 @@ static int __maybe_unused elants_i2c_resume(struct device *dev) int error; if (device_may_wakeup(dev)) { - if (ts->wake_irq_enabled) - disable_irq_wake(client->irq); elants_i2c_sw_reset(client); } else if (ts->keep_power_in_suspend) { for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) {