From patchwork Thu Jul 18 00:09:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1961819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=pd6eqp/T; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.199.223; helo=ny.mirrors.kernel.org; envelope-from=linux-gpio+bounces-8253-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [147.75.199.223]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WPY8W54kHz1yY1 for ; Thu, 18 Jul 2024 10:09:47 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 7F9591C2164A for ; Thu, 18 Jul 2024 00:09:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 96876800; Thu, 18 Jul 2024 00:09:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="pd6eqp/T" X-Original-To: linux-gpio@vger.kernel.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7257197 for ; Thu, 18 Jul 2024 00:09:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721261381; cv=none; b=EbpwNtn42bAV4E6QeR+8v4DIRZcpIct7/EmDvSDjrztsTclf1FICn/8YjwzV6q2HlbteAMhsXAWtz8KMdF3EXw+HX3SW+QiEv4eUtdp2nmCaeIreJM8vnJj2//gLu3vCbV9lCWTCWUExW2Bc46Aghl0k5QoU5ay/R2gXSO0Inqs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721261381; c=relaxed/simple; bh=4HNKatqWLU6KJV8ksJ86yC6IMX/1lH46LBS256lNGXo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cxu+0nITogZX0gDSyZ/sAiTmCZl25wd/C/i9E87vmrgTQUxZcWzFFdbDgCK5WOYRVmF58C7jeaQV3hvlC4Kog7pYOEP1RttBE6jx3L4zks11yaLnCoPgBbP6takA/0zX331342GUaTFrBMIZOUuO9fSiNvn4zwp9DT+j8aozc5c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=pd6eqp/T; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1fc49c0aaffso2378455ad.3 for ; Wed, 17 Jul 2024 17:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1721261378; x=1721866178; darn=vger.kernel.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=ygcvHwT21rnyyK9FqsryADEACNrTd1WTS27RQFo+Wzc=; b=pd6eqp/TejsfLCemVEb5MWZp7YHDzy0vbhqpfOAil50xzSf4Upzr/7J63crnbGf0N1 FPde5oXXpjo74Cd+v/NkDtT18xmBHAV8UMI1b/IaDDeMmxygB39G6VFWG5xG5jYkfY8P 40dn3NbeiTxZStVU8bpGjKpsaY1hnNakjnWKBZ/GM1USJNDKqoMsnX4y6YdlSYff/r3d lO0e7IHQkKMGvLYW0bNUH2aoK3nsuaJ1BeRSuLzbCqSrEbqCyGwGIC2C4O4OBZ3lx6BP aJCJmhD3CwXZZABlPZRzp0yyOH4rL264cnwZTXS/zkf7atd8Z6vyvxvwuOJPU7blEYp/ nYUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721261378; x=1721866178; 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=ygcvHwT21rnyyK9FqsryADEACNrTd1WTS27RQFo+Wzc=; b=hesJDI1FIjJeQRY2I9rBbYIbDIy0GBg/Dk6vvPTXk/t+IQsUmhuzDsS4FFrm5vi+F3 EnUGEqySYuZBWhyTS4bSaumnwvCbVpiFNir+O0leUzgtC6IuDKZoTOGfDZkBdNqtIEqi augNG4w+af2Y6haM/QMTVpv7r6mnWiVLhlbQGMTFBjWsZCGoGIShLOMtaldmpcnY6dQs Zr7qUMtn5u20ByX40vBZYwsRF5qy59Bm+y01xLwzAirTxDfBFgjC0uDot1+6sOliSDoN QJvPVMf7lPNp7HPLtI30ygoZL9Arml4RcDJCeZa51gsFVmYAZqT99Z11J003UYvJNE+a cbew== X-Gm-Message-State: AOJu0Yyv/eK8FlXqCaZhQudz+y3e1vH78Y6odVfJtNoPi7V3eyK1kd8x 6Eqkt/4ANk/qg4swHRKUpJQX7P1nn8l56MG69MBDPPPZQGfoDchMKpHw8ipu2fQ8FLe8ij+y8SH l X-Google-Smtp-Source: AGHT+IFPUjaMAlNGpqGgBXdgFvh0EM5pFUKWWpK5R28WcGhYVRlg8c4gIgPooiZk1CIzWmbzpNm2wQ== X-Received: by 2002:a17:903:40c3:b0:1f6:f298:e50 with SMTP id d9443c01a7336-1fc4e683945mr27662155ad.58.1721261377709; Wed, 17 Jul 2024 17:09:37 -0700 (PDT) Received: from localhost (75-172-111-187.tukw.qwest.net. [75.172.111.187]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fc0bc3a251sm80628035ad.198.2024.07.17.17.09.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 17:09:37 -0700 (PDT) From: Kevin Hilman To: linux-gpio@vger.kernel.org Cc: Keerthy , Linus Walleij , Bartosz Golaszewski , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] gpiolib: expose for_each_gpio_desc() to drivers Date: Wed, 17 Jul 2024 17:09:32 -0700 Message-ID: <20240718000935.2573288-2-khilman@baylibre.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240718000935.2573288-1-khilman@baylibre.com> References: <20240718000935.2573288-1-khilman@baylibre.com> Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The for_each_gpio_desc() iterator is a convenient helper and is also useful for GPIO controller drivers. Move this helper from the internal gpiolib.h to driver.h. Signed-off-by: Kevin Hilman Reviewed-by: Dhruva Gole --- drivers/gpio/gpiolib.h | 5 ----- include/linux/gpio/driver.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index 48e086c2f416..c68be135e137 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -115,11 +115,6 @@ struct gpio_array { unsigned long invert_mask[]; }; -#define for_each_gpio_desc(gc, desc) \ - for (unsigned int __i = 0; \ - __i < gc->ngpio && (desc = gpiochip_get_desc(gc, __i)); \ - __i++) \ - #define for_each_gpio_desc_with_flag(gc, desc, flag) \ for_each_gpio_desc(gc, desc) \ if (!test_bit(flag, &desc->flags)) {} else diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 0032bb6e7d8f..3e7e58be31b4 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -813,6 +813,11 @@ const char *gpio_device_get_label(struct gpio_device *gdev); struct gpio_device *gpio_device_find_by_label(const char *label); struct gpio_device *gpio_device_find_by_fwnode(const struct fwnode_handle *fwnode); +#define for_each_gpio_desc(gc, desc) \ + for (unsigned int __i = 0; \ + __i < gc->ngpio && (desc = gpiochip_get_desc(gc, __i)); \ + __i++) \ + #else /* CONFIG_GPIOLIB */ #include From patchwork Thu Jul 18 00:09:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1961820 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=r5Ks8ntI; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45d1:ec00::1; helo=ny.mirrors.kernel.org; envelope-from=linux-gpio+bounces-8254-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [IPv6:2604:1380:45d1:ec00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WPY8X3yB5z20FC for ; Thu, 18 Jul 2024 10:09:48 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A93391C21569 for ; Thu, 18 Jul 2024 00:09:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BE521365; Thu, 18 Jul 2024 00:09:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="r5Ks8ntI" X-Original-To: linux-gpio@vger.kernel.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7711620 for ; Thu, 18 Jul 2024 00:09:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721261382; cv=none; b=P0FCzGxBSkfVKAhzgmtpVnHSoAIPPskWK5a2hj2w7wdBWx6zdSjdlz+oEafO6Mj7MjP3QB5IPphl/oXbn7e7+YaSNe1tOexnf76/whHaOh2EQ2JPdh2a9cwiKWUINKiWvufgQpQ8mGCf4lzqPfxtM8+0KvI38eht3iV3fJrLkhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721261382; c=relaxed/simple; bh=wt/qzQuv1Oj3EPYIiGGE45EkZB5VMCHunctx/kbTHDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jmkCyb0/IlyOgjJ0RqTGb0NP+K9MT6XHmxvOancKoY4nlWwqP4+ER8W7wX4VUTSk1H8c3NovJMYrT6Z5n8yeCPhJgqJYrSqrzTWpPzzJM+iBkD1HcQkf8S5KCjPVrIFEApQjOFU9kyhIC2LeM7v5HhcvhLCnKSfduipuoURmOok= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=r5Ks8ntI; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-70b0e9ee7bcso150271b3a.1 for ; Wed, 17 Jul 2024 17:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1721261379; x=1721866179; darn=vger.kernel.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=8rJ5m7Fl3sMwVskBOOBufRviDL1o9bXQXCNdGsyOVPo=; b=r5Ks8ntIv/VsZHEkEN0l/9vtX0gCAjTa+VtRHWuFEvzkeFPb2HMyUAzcXe9z2D1bEy HMxMghkII2CUHvreh+BdYYv2SOg7Ig/Fx/2tD0D3WKpKwpSlcAyFq6sCnO+flrxen3cV CqSr48F2tkKPgvykR222j+UXOcXDLS2fBtZpA2MPf9kTZimlzYYL+fp8arvUlcN1Wr0m rnZjcGT/x8ZnenMgyXsJgA7LfEuQOOqFuH+Kc3190TiD+im+FkjvBtwRGBYYUOhvCogL figybXj/8qOORMQmBne8JsN9x0ZJWcmcn0P/TAfYxSUHMDULw3lcwxTA3QHmUNv3gkmG GKDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721261379; x=1721866179; 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=8rJ5m7Fl3sMwVskBOOBufRviDL1o9bXQXCNdGsyOVPo=; b=WDy8b3AggQHOt/BihVFJX7zDRVuHagmplGs06OVPr16i7EJZwfYX8Niz9gQMoXos3a D5sc6IKKYpZIKeZ+CVlsxs9OaaGvfTJ7jNu9F2vg6RW5Z7H8IPSLO2ql8rYJJ4IoXQAt djbiGK3gNgkAH5k/akQ0xlg3PmDjgeIk0X4/WtJqTXUpRhBGPD6/ihRePk3SBVbXtH0T 7v9ErtdsCYDqDM2l9qIOQPy/oRkSBdoqFSEDWkm5ocF+LqWvJvIksPmulNoIRcpUfePj bhdskLfAEcOzcP4jQA2UXx5nNhXz+Gngvb+8hJGg/1MJFqZ7wHuJPyhmeAlPoQk0XDO1 NnBg== X-Gm-Message-State: AOJu0Yxio4kQWWYrZuO5UkigoNYDrNXSFa3+mok/8c0wWi8rtjATNFoo KZ55hnwcV+ttWwbj5Gb1OxnPoJ+C5k6CUyrLCK6OZww0eOvLQC3Rmg1BMCRWYSirD01oJwKBPBu r X-Google-Smtp-Source: AGHT+IF04MR7Smx6T0rGv8pS1Tq8lRD17LTiRDEIUaK4JAMINqysx/UaUEPbq8Zrh0qjpFKGvNNFwQ== X-Received: by 2002:a05:6a20:4325:b0:1bd:2710:de5c with SMTP id adf61e73a8af0-1c3fdd00c67mr4884982637.22.1721261379404; Wed, 17 Jul 2024 17:09:39 -0700 (PDT) Received: from localhost (75-172-111-187.tukw.qwest.net. [75.172.111.187]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fc0bbc73a2sm80870995ad.109.2024.07.17.17.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 17:09:38 -0700 (PDT) From: Kevin Hilman To: linux-gpio@vger.kernel.org Cc: Keerthy , Linus Walleij , Bartosz Golaszewski , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] gpio: davinci: handle wakeup-source property, detect wake IRQs Date: Wed, 17 Jul 2024 17:09:33 -0700 Message-ID: <20240718000935.2573288-3-khilman@baylibre.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240718000935.2573288-1-khilman@baylibre.com> References: <20240718000935.2573288-1-khilman@baylibre.com> Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 If the wakeup-source property is used for the GPIO controller, then mark the controller as wakeup capable. Further, if there are any GPIO IRQs that are marked as wakeup-enabled, then mark the GPIO controller as wakeup enabled also. Since the GPIO IRQs that are wake-enabled are dynamic, this is (re)calculated during each suspend (and cleared on resume.) Signed-off-by: Kevin Hilman Reviewed-by: Dhruva Gole --- drivers/gpio/gpio-davinci.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 1d0175d6350b..031aa7c30855 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -195,6 +196,7 @@ static int davinci_gpio_probe(struct platform_device *pdev) struct davinci_gpio_controller *chips; struct davinci_gpio_platform_data *pdata; struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; pdata = davinci_gpio_get_pdata(pdev); if (!pdata) { @@ -274,6 +276,9 @@ static int davinci_gpio_probe(struct platform_device *pdev) if (ret) return ret; + if (of_property_read_bool(np, "wakeup-source")) + device_set_wakeup_capable(dev, true); + return 0; } @@ -677,7 +682,24 @@ static int davinci_gpio_suspend(struct device *dev) struct davinci_gpio_controller *chips = dev_get_drvdata(dev); struct davinci_gpio_platform_data *pdata = dev_get_platdata(dev); u32 nbank = DIV_ROUND_UP(pdata->ngpio, 32); + struct gpio_chip *chip = &chips->chip; + struct gpio_desc *desc; + bool wkup_set; + int irq; + /* + * Check if any GPIO IRQs are wakeup enabled. If so, + * set the GPIO controller as wakeup enabled also. + */ + for_each_gpio_desc(chip, desc) { + irq = gpiod_to_irq(desc); + wkup_set = irqd_is_wakeup_set(irq_get_irq_data(irq)); + if (wkup_set) { + dev_dbg(dev, "%s: IRQ %d wakeup enabled.", __func__, irq); + device_wakeup_enable(dev); + break; + } + } davinci_gpio_save_context(chips, nbank); return 0; @@ -691,6 +713,9 @@ static int davinci_gpio_resume(struct device *dev) davinci_gpio_restore_context(chips, nbank); + if (device_may_wakeup(dev)) + device_wakeup_disable(dev); + return 0; }