From nobody Wed Oct 8 04:06:01 2025 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 7045A2459D1 for ; Wed, 2 Jul 2025 09:22:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448140; cv=none; b=Bnr4cLd3kcWclxK6tIvj1Gml0LHdhO8ktSs+WGbD+YguZ0pgZc8naqRuY/U7MnuKoRkIiA90mteOC1SH4kD2n0VLlvNxRUe3WEJkVyk+eQNcJeNRi3mafkLsafs/+Flb9wkXpjUvFG2hMd3e9yVjHyFKrCSyXyqnL4UkUFGASlQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448140; c=relaxed/simple; bh=y8+ZGCw9wnewLNofUvKWCpB47AebmN2nx7KegRySQ0M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ft0lxDCFlg2BJ1iuZVo1NjPVPElyTqGkQcwjdY4GrNEvSm0/4+aspFzYhwrrtIlTiBFDHxcuQSVi/Pdnd0pwcBbqfGNuWxG6g9rDFQ33WW9KY1tIMNMuwGpYVxdvlomnrz6vEeK4X4uMthdq2JzwWGeN0iO14F/nQecK+3Bqy0U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=HneRPIMv; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="HneRPIMv" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3a4fd1ba177so4282588f8f.0 for ; Wed, 02 Jul 2025 02:22:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1751448136; x=1752052936; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pQ4953DYX730X6Pl4pCdKBLcok8eGFLQghf6CkEicDE=; b=HneRPIMvBEKgCOJlSmfAw4EgjCkUiWqZEVWILflgY0/uUtYeVvRkQtrcHONADXCNoO tRXbYV0lWC5Qwgk9gGcd2bd0TAjZ3GMPNhOIPxjdckuZW7V/dl7FEr4NK5fqa8g50MPh GdHqgC1zAt5eJYWneb0iHqX3kLqpn/YQZ5P7ZPemDnq8JSCJ+uT1qDW1IhoBqU7GoF2j AhsrFvef6QZCmpPpenlgf10l4WvggcD2H5fKcr1yNqWk/6j3vXB4tuVCO7JBSrMSD3iz QunFjKRVtrMNTZWtMo0qWwxCQIy0SPHKETxvNO44NQmHTTGb4dRNanBFJJV/ow0nlX0M kL6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751448136; x=1752052936; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pQ4953DYX730X6Pl4pCdKBLcok8eGFLQghf6CkEicDE=; b=sbLMpRC6uKLh+NOxg5foh6n05MFoKknspOW+0DoRlM5CquOkgtOAWwtWdbRFiXc3xA BirxUEr/Ddn43ugRW/IGczivAAG9E6/WjJ8PJYeR8elnlG6PAbtiwmw/3xvV8N45NGPn mrUqeQosIrNLZosu0zDSmeYZ2vdAf7JQL4AgNcM1zCjmYGUGigneMr+XTeEilm7N+eLG X0dklrqOzUlYdUr+uF2Rxpp/2pwSIgBO9p7GAOMAT3AijHbDOrFUqhh4zYukl8gNRQLM rxqsNiEuYelIymewULfUnJtkOYaNxiE8eUN56UuTnF6xEDrF0+O4pFNbT/qJ1ItN2lzV dpcQ== X-Gm-Message-State: AOJu0YyqoAN+zT+gbArqoa9TdzLZL7Ti+Z/7wSo+HAhd46ENXHT5pEgO 0COxQPnTeOqB2qkpy+3em/KGAOHYJUNdigGEd9F4FURml2kY8KKZsULK8+ZNKzJuY4Y= X-Gm-Gg: ASbGncvqPqd0wCjDi9zdC7rAVy2n9FiGHsmI3CeVkqSV/QdWJqlF1r3cz2DIJrr+60r niY130etS4NeUyn6AHs7XJe6S8uQaktKAsKh5j3TF4GEpXBb5lYSmZyuyMY4Q+G32BXpSqJQ9Aa MoOR3ytVaz5sFp6QQWysXILuBBPKki7fudI1ars3piJiqJQ2judpkDBY3mA050YJ/bKAoYZoTcO 11iLfVi1WLEFYq+O1FH1lSuSKnMuSb5h54qltkTTnXfAOfTGTj8SUogLsgrI2ZjiDJWGkiGEoY2 5wU5+hpSAtLb2G78pI75SGs4gxCkRNsf9UE+V0SFUfIPrKcTgyJF+g== X-Google-Smtp-Source: AGHT+IFy+dbKnRMVyYVM9ja1MDJ2jsqlQp/nEGAueozbl8hzF+fw2nR7L/R/qjacSv5mPDCxKpcWjQ== X-Received: by 2002:a05:6000:248a:b0:3a4:f70d:aff0 with SMTP id ffacd0b85a97d-3b1f7ae6ee0mr1649457f8f.14.1751448135688; Wed, 02 Jul 2025 02:22:15 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:8827:d0e:25e:834a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a406489sm195844165e9.27.2025.07.02.02.22.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 02:22:15 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 02 Jul 2025 11:22:08 +0200 Subject: [PATCH v2 1/8] gpio: generic: add new generic GPIO chip API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-gpio-mmio-rework-v2-1-6b77aab684d8@linaro.org> References: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> In-Reply-To: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5967; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=pB2Xuhhwxk5LYCzli8T80nbGaaOUFOOv5AWJwibECv4=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoZPpEU/2fp9wrpMS14IJmNecxSGbWX4sGcofEa IgAdrNk+BiJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaGT6RAAKCRARpy6gFHHX cjPgEADBIdI3NwEpid9TDAiABxWhTsVPd5UOMc7dqo1CxnLpB1ra9kx2TuHCGnyaefSiKZAqbOx ZYT9begIVywJahkysJ+PDjKI6FLO/TNG1YfDJiQ2mHq6KVfeKAGMZaAQrQzq9ApQcKAO4nPkUht w2XSSsz84qOuBO2EGMt/U3z2YS3b7eJMPEK4zgdSFUO+OP+nEttwWrn/t4s7cO40TfhvjYCLLeu vfrcWLovH97g55wx7fyJtWTimMHX4WbLSc+xikqtN6JXMJY+4Kk1wfWYeKnpOl0HnekJfEnHUqi 0AUbPcd1V+hCc71mnIbX6erwQH/FcPKI+XPnU1fLhMoMaAs8wDKf7WT8DXyQrK4+Ov4JcjV6jh1 25YWIAT2JDTZFlZnUoKDX6mj086XBsUNxaZixzt0OBmBCSJ53+ORQKqDbYqwocOPEhQ0+T0Sert gbhX1YkvDimVnt7lOEWw+qjfTGS49ULiBjr/0sLlAWqSRKVDskKD2cqQMqDuQohmBk7v4Pd4mj+ p22ivAuf2iVnrLoyEr+QiBELgFhPlKRfeRVZ5wtZwompJ6OaMZgqRTUJlh1DWwNTe/oQH7haCPh BHYs0xbiubt880Od0nrMgvFPonaX+K+D3YV7g7jnlnjzZNX1o/MMirclzFYGXRCb42NIWd/KY7I 041ci388PceItXQ== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski As the first step in removing the fields specific to the gpio-mmio module from struct gpio_chip, we introduce a new set of generic GPIO chip interfaces that are meant to replace the existing bgpio_ ones. The new initialization function - gpio_generic_chip_init() - takes a configuration structure as argument instead of 9 separate parameters. This will allow easy extension if needed in the future. We hide the locking details behind a set of helpers in order to be able to move the raw spinlock out of struct gpio_chip without the users noticing. For now, the new APIs just wrap the existing ones. Once all users have been converted to the new interfaces, we'll pull them into gpio-mmio and implement them in a backward-compatible way while also moving all fields specific to the generic GPIO chip into struct gpio_generic_chip. Reviewed-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- include/linux/gpio/generic.h | 120 +++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 120 insertions(+) diff --git a/include/linux/gpio/generic.h b/include/linux/gpio/generic.h new file mode 100644 index 0000000000000000000000000000000000000000..b511acd58ab0099b727bf929b7a= 4e9f9836cd5bc --- /dev/null +++ b/include/linux/gpio/generic.h @@ -0,0 +1,120 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __LINUX_GPIO_GENERIC_H +#define __LINUX_GPIO_GENERIC_H + +#include +#include +#include + +struct device; + +/** + * struct gpio_generic_chip_config - Generic GPIO chip configuration data + * @dev: Parent device of the new GPIO chip (compulsory). + * @sz: Size (width) of the MMIO registers in bytes, typically 1, 2 or 4. + * @dat: MMIO address for the register to READ the value of the GPIO lines= , it + * is expected that a 1 in the corresponding bit in this register me= ans + * the line is asserted. + * @set: MMIO address for the register to SET the value of the GPIO lines,= it + * is expected that we write the line with 1 in this register to dri= ve + * the GPIO line high. + * @clr: MMIO address for the register to CLEAR the value of the GPIO line= s, + * it is expected that we write the line with 1 in this register to + * drive the GPIO line low. It is allowed to leave this address as N= ULL, + * in that case the SET register will be assumed to also clear the G= PIO + * lines, by actively writing the line with 0. + * @dirout: MMIO address for the register to set the line as OUTPUT. It is + * assumed that setting a line to 1 in this register will turn th= at + * line into an output line. Conversely, setting the line to 0 wi= ll + * turn that line into an input. + * @dirin: MMIO address for the register to set this line as INPUT. It is + * assumed that setting a line to 1 in this register will turn that + * line into an input line. Conversely, setting the line to 0 will + * turn that line into an output. + * @flags: Different flags that will affect the behaviour of the device, s= uch + * as endianness etc. + */ +struct gpio_generic_chip_config { + struct device *dev; + unsigned long sz; + void __iomem *dat; + void __iomem *set; + void __iomem *clr; + void __iomem *dirout; + void __iomem *dirin; + unsigned long flags; +}; + +/** + * struct gpio_generic_chip - Generic GPIO chip implementation. + * @gc: The underlying struct gpio_chip object, implementing low-level GPIO + * chip routines. + */ +struct gpio_generic_chip { + struct gpio_chip gc; +}; + +/** + * gpio_generic_chip_init() - Initialize a generic GPIO chip. + * @chip: Generic GPIO chip to set up. + * @cfg: Generic GPIO chip configuration. + * + * Returns 0 on success, negative error number on failure. + */ +static inline int +gpio_generic_chip_init(struct gpio_generic_chip *chip, + const struct gpio_generic_chip_config *cfg) +{ + return bgpio_init(&chip->gc, cfg->dev, cfg->sz, cfg->dat, cfg->set, + cfg->clr, cfg->dirout, cfg->dirin, cfg->flags); +} + +/** + * gpio_generic_chip_set() - Set the GPIO line value of the generic GPIO c= hip. + * @chip: Generic GPIO chip to use. + * @offset: Hardware offset of the line to set. + * @value: New GPIO line value. + * + * Some modules using the generic GPIO chip, need to set line values in th= eir + * direction setters but they don't have access to the gpio-mmio symbols so + * they use the function pointer in struct gpio_chip directly. This is not + * optimal and can lead to crashes at run-time in some instances. This wra= pper + * provides a safe interface for users. + * + * Returns: 0 on success, negative error number of failure. + */ +static inline int +gpio_generic_chip_set(struct gpio_generic_chip *chip, unsigned int offset, + int value) +{ + if (WARN_ON(!chip->gc.set_rv)) + return -EOPNOTSUPP; + + return chip->gc.set_rv(&chip->gc, offset, value); +} + +#define gpio_generic_chip_lock(gen_gc) \ + raw_spin_lock(&(gen_gc)->gc.bgpio_lock) + +#define gpio_generic_chip_unlock(gen_gc) \ + raw_spin_unlock(&(gen_gc)->gc.bgpio_lock) + +#define gpio_generic_chip_lock_irqsave(gen_gc, flags) \ + raw_spin_lock_irqsave(&(gen_gc)->gc.bgpio_lock, flags) + +#define gpio_generic_chip_unlock_irqrestore(gen_gc, flags) \ + raw_spin_unlock_irqrestore(&(gen_gc)->gc.bgpio_lock, flags) + +DEFINE_LOCK_GUARD_1(gpio_generic_lock, + struct gpio_generic_chip, + gpio_generic_chip_lock(_T->lock), + gpio_generic_chip_unlock(_T->lock)) + +DEFINE_LOCK_GUARD_1(gpio_generic_lock_irqsave, + struct gpio_generic_chip, + gpio_generic_chip_lock_irqsave(_T->lock, _T->flags), + gpio_generic_chip_unlock_irqrestore(_T->lock, _T->flags), + unsigned long flags) + +#endif /* __LINUX_GPIO_GENERIC_H */ --=20 2.48.1 From nobody Wed Oct 8 04:06:01 2025 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 76E912459D2 for ; Wed, 2 Jul 2025 09:22:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448140; cv=none; b=tCb8BvayGE50veko1aNBz3b/CTBOWBh3OHadvwTf3gGUe2FzWaYYq+SBerpTIoXLxhjUPfrRuk7FnGJ4Xile4v4WIPEjIXZrx+fY7zi88f8i74hajtXcdtI+zbgMmEj8xohVFKH1ejzJrZGmJ776fUagboCapQu0O++uePGpaGE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448140; c=relaxed/simple; bh=0wJ3VYCq+XU4SPkOteN5MXhoBb6WcYnpfBxrVLUCSwo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fHBIA3/bfsLlNulXjJc6rQ87zZOXYnM2s8OGr5jHel2qsxxqo5zE1SUn0bjGuhb8+JJI6A/ZLyBq+qZgNgu3aj3EhyyFZ/1rWuLfgw34pEfvmbS0BNPUbRz2B6Mj2U53vMURT/CFhc9FkouZWNYTvGXl0s0kZ5MNWVn/90ABX9g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=n5cddyhx; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="n5cddyhx" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-451d41e1ad1so43562825e9.1 for ; Wed, 02 Jul 2025 02:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1751448137; x=1752052937; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=k4u+FthQDNPLWdi1PhhMWVGkiqdk0HXsbN17pTQh9z8=; b=n5cddyhxXJg1pY4otvSoqJlP79MHBHUc+VJDcxfZty3Ugv9R1UAy6VfrISEU9rkBXO 5QgBpYnXFv+EhrZWnhGa/yXQXqktnBd+HqKVFLITQnsgKA3J+KLhlv7+jU6cJaJVICCx TZ02YFUXAGQB9h7nEhZJr0hJkxcUEO54zApLzxaQBKJYoEdU4wGn/Y7zAsE3s0VP1KDb n6bA41bil4XfwkfflHRojrbLq24svB/L/y6DppHtgLCZlQ9reX/60PvJhXaODdfxsiTq zY91QRtCJzFFnTAM1rl0T4y2OjDEqilQoiDfThRaSBVzdaQ4PCP0yRcB6p29EJlTIC5n bp0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751448137; x=1752052937; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k4u+FthQDNPLWdi1PhhMWVGkiqdk0HXsbN17pTQh9z8=; b=pJEMusIi6FXNtC8PXS0+9b7wbDiVYrzy+vSXCpoGN4hxcB99o/HBBKyNKtljMIgeWc OJUNm1Pa4dfZzr+fTFXHzk+h4Mphy+G0KqQcUxW/Dl2kzaCrJQtI+UCgUt/9kqJ1N77F WbzTYVBbZ2O6aobVCVeGtAX74IrqrgknEx3NvClY/96c4H1sumX7lWdS+5FqagRY/gwB kQfuWSVGcrCa9dgjTdWthuFDnh9bYDp8PgU3wGSPOi/DLnMeO5VRarcpx4r+6qfLTwuT ZETRztPHRVqlsxwtU4KGkD9NdzEZ/iCAMQSE1uMZhWIZi1HGJWe8A2Ii8macIaevUI8H h8vA== X-Gm-Message-State: AOJu0YxZhCEe6zU9CjMkcKf4OOnoNZoq2l6n5N52EJj7jCj9+1lkdXpN ALiopF/G6szKVtcQXkpAmMEZhBr+XmS3zxinT4oEfq9jbJhRGjJezOX4pzWae1EFXZc= X-Gm-Gg: ASbGncvFedmcSc/SJwAbFcV/SdsgUPwiCkRRNtuwzNOi0Yk41jsZ3QMDNL98oG4A49d IKmmMFX2upGF8NUC6WWXnxpJSNM0ABsDTmcT/0zosYYrTADMvUSlfiRhtL/+rKJ3cnXk+uaUAFk D6AGLq5Q6UKz9sDvIx6e9BAgMq21eapsG0w+C+AITy6O0wiM3xDIE895qSNN8YReDXiJ5v5eR49 9f3CREFoaOKWbZ+FT5tURNOmJzsuT34lbhx8iCPCtLZew6yV68RcNYqtryJ+19mk9v3QUOnsc5R Wf2tH4vILiRe0118lH/RGd+JD+vteEzVZ+pQybAHpuCQ4SfFEpZzMCmfW670Fip1 X-Google-Smtp-Source: AGHT+IHbZgnhQJE6hWX8QzU1x6mPMLzGFrm4P9DO+m2Xac8J6ESQfWF51nMTQk2usCHmJA4Ncp1IXw== X-Received: by 2002:a05:600c:a406:b0:453:7bd:2e30 with SMTP id 5b1f17b1804b1-454a3a71785mr17378425e9.29.1751448136731; Wed, 02 Jul 2025 02:22:16 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:8827:d0e:25e:834a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a406489sm195844165e9.27.2025.07.02.02.22.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 02:22:16 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 02 Jul 2025 11:22:09 +0200 Subject: [PATCH v2 2/8] gpio: mxc: use lock guards for the generic GPIO chip lock Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-gpio-mmio-rework-v2-2-6b77aab684d8@linaro.org> References: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> In-Reply-To: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3424; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=Nhj40fNUX1gi865SKkLYi1vu0OSypgr5Gc9r4LLn2tA=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoZPpEIGYyx51RBbJ7CzXYFDk/AnkSqzP89dgF6 L+qchczKKqJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaGT6RAAKCRARpy6gFHHX ctL5EADLxOrAEbJSR2Mh80T7Iol3UM1Tdb2AzV5BYhIuzDVEVU7rCgP67SqvrsxLrxDqmIuiL2X k22Frcv6RN+XT3rCdfvh8Hkx+TqVkbaAKstzQEkhjFfRe0Z9VJb+R+ql5yd3P3LMQ8hULvdLQHk GeQAmaVdeErjT6xzypPJCvsFUS45oUUDQAHlpb4f0EpdVZ6n5r0MtKOJimTPlLSht2YpsODgw4+ 2juaSesJUw5aQXC2Q4fDcjsJarDAZ94aV0QXwJ+x/YFFrQ5/l9ydKgIpBG5iOjFQwqJgqwfJfoG M9Pcem2Sz2oTsqCd2qw1eu1kwqZS7EMa+PI6/IHT8dCViyKfTeTU0CAogktbHEc7PK4CNvlJTEf IwoJfpM93dcMzElNW57kvB/gJ3NySccCpQEuCrLcrIlP9J1/9n26ugjx97o/Jkr0/iK2p0346Z0 vMOegy+lHXFjXBrWr9roJpgS6ZAdGmLIfW18LppeFkXAv/lFw1TolYE1FduuKS0YASPNUqn6xRX aV0SxpQotRROjkTa34UzpE+zisA06RWWD/Cpf20Sa5kzSUPv0fL3FEf5OOMYvUlPHPd/gKIMyZ7 7DhDoTCSUfmTf2NlEXl8z1fU4VzSMMAGjfGf6wAiPiwF4waMfPjdZ8E+DrIX7boD38Gwqyit8AL /h1jeFyl1o/LiyQ== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Simplify the code by using lock guards for the bgpio_lock. Reviewed-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-mxc.c | 50 ++++++++++++++++++++++-----------------------= ---- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 4af5a2972d12f68909dd87d9396921c80445f87c..1c37168c8d0a657d7f93067d9ac= 95cfbd821f757 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c @@ -7,6 +7,7 @@ // Authors: Daniel Mack, Juergen Beisert. // Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserv= ed. =20 +#include #include #include #include @@ -161,7 +162,6 @@ static int gpio_set_irq_type(struct irq_data *d, u32 ty= pe) { struct irq_chip_generic *gc =3D irq_data_get_irq_chip_data(d); struct mxc_gpio_port *port =3D gc->private; - unsigned long flags; u32 bit, val; u32 gpio_idx =3D d->hwirq; int edge; @@ -200,41 +200,38 @@ static int gpio_set_irq_type(struct irq_data *d, u32 = type) return -EINVAL; } =20 - raw_spin_lock_irqsave(&port->gc.bgpio_lock, flags); + scoped_guard(raw_spinlock_irqsave, &port->gc.bgpio_lock) { + if (GPIO_EDGE_SEL >=3D 0) { + val =3D readl(port->base + GPIO_EDGE_SEL); + if (edge =3D=3D GPIO_INT_BOTH_EDGES) + writel(val | (1 << gpio_idx), + port->base + GPIO_EDGE_SEL); + else + writel(val & ~(1 << gpio_idx), + port->base + GPIO_EDGE_SEL); + } =20 - if (GPIO_EDGE_SEL >=3D 0) { - val =3D readl(port->base + GPIO_EDGE_SEL); - if (edge =3D=3D GPIO_INT_BOTH_EDGES) - writel(val | (1 << gpio_idx), - port->base + GPIO_EDGE_SEL); - else - writel(val & ~(1 << gpio_idx), - port->base + GPIO_EDGE_SEL); + if (edge !=3D GPIO_INT_BOTH_EDGES) { + reg +=3D GPIO_ICR1 + ((gpio_idx & 0x10) >> 2); /* lower or upper regist= er */ + bit =3D gpio_idx & 0xf; + val =3D readl(reg) & ~(0x3 << (bit << 1)); + writel(val | (edge << (bit << 1)), reg); + } + + writel(1 << gpio_idx, port->base + GPIO_ISR); + port->pad_type[gpio_idx] =3D type; } =20 - if (edge !=3D GPIO_INT_BOTH_EDGES) { - reg +=3D GPIO_ICR1 + ((gpio_idx & 0x10) >> 2); /* lower or upper registe= r */ - bit =3D gpio_idx & 0xf; - val =3D readl(reg) & ~(0x3 << (bit << 1)); - writel(val | (edge << (bit << 1)), reg); - } - - writel(1 << gpio_idx, port->base + GPIO_ISR); - port->pad_type[gpio_idx] =3D type; - - raw_spin_unlock_irqrestore(&port->gc.bgpio_lock, flags); - return port->gc.direction_input(&port->gc, gpio_idx); } =20 static void mxc_flip_edge(struct mxc_gpio_port *port, u32 gpio) { void __iomem *reg =3D port->base; - unsigned long flags; u32 bit, val; int edge; =20 - raw_spin_lock_irqsave(&port->gc.bgpio_lock, flags); + guard(raw_spinlock_irqsave)(&port->gc.bgpio_lock); =20 reg +=3D GPIO_ICR1 + ((gpio & 0x10) >> 2); /* lower or upper register */ bit =3D gpio & 0xf; @@ -250,12 +247,9 @@ static void mxc_flip_edge(struct mxc_gpio_port *port, = u32 gpio) } else { pr_err("mxc: invalid configuration for GPIO %d: %x\n", gpio, edge); - goto unlock; + return; } writel(val | (edge << (bit << 1)), reg); - -unlock: - raw_spin_unlock_irqrestore(&port->gc.bgpio_lock, flags); } =20 /* handle 32 interrupts in one status register */ --=20 2.48.1 From nobody Wed Oct 8 04:06:01 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 7747E246779 for ; Wed, 2 Jul 2025 09:22:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448141; cv=none; b=ICimvwedFKsvsnrQPTzGAkmIHv1b+0qlJmnyMEyMj78VwxA2sbaEwJdwXb1V89747efnF3Mlbkzxa9KARMCc0/yubxNTuygsgaUdOOFbQhBgF2kVxkA1Pg/thTg8sif65iPihKGFsq34proEhAnUxlkQDygjYgqgVpAjJ+9Oj8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448141; c=relaxed/simple; bh=zGHKNbtNrBS41rLCNYxur+PCOJJmaiH5uINBZq1HxL4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qufGilq3WzyqpCqydDG+Ngvg9eIpJvWqx3LTEHVm4q67tmozMaUGHFYexj+9uZIr9fsg9hAKsUGd0hViRlBERAyZ841oe1UKj3BaCmaC+OczuZQ18kIo4QqKSJTIm51767hdGg+/3eYyAF4tmuaIOmB8uwCFYQkflMKN4GMrRjc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=FtP6HE4r; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="FtP6HE4r" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-453066fad06so44461915e9.2 for ; Wed, 02 Jul 2025 02:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1751448138; x=1752052938; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dp3qpaLxdoL/9VDJ6nL5BaV3W6j7nnnxGCE6fZ2JVIs=; b=FtP6HE4rnSaxLqzZzuYG1SVWNtNRpycyaF3AMaHCLdVHVDx9U5Z+aXh1fQ2kcvNL/8 fCKI5jn/T5HfhScJZPviLcg6M+nq/MeU1le+n/3VJC51WZ2+ikennv/u39ORdkl6yfLW SYifRGQRU4x4borSsaUWP1NeTNBcJ6+P/dFjk0mpYeA68QBZDdQY24s81E0CbxunDwnV /cmspDmDkUiIgo2xiqkss9icUuMoKbpTHRY2TUPcPa+YMFxKrCHQfZdiulM55mTKqfBz eO9vgLSuxfJjEfwQNnLAHPDNP6nQQpJi9GXcS8AKdzsOJQc1KXf8YPFZ3qDnLe+oad6F GgMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751448138; x=1752052938; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dp3qpaLxdoL/9VDJ6nL5BaV3W6j7nnnxGCE6fZ2JVIs=; b=au5+CJstm9z6dFGW2EmbX1NxojC40EK5mpOgsCIDnRg8cXLVBSvhbAkgN4RuxIqlXo jmE2xXX+gFWpY/o4RZOczdwF1zllhwdeGEdSsy0963Wqr/bnyKjwR59ZhHcL/YMx3gEw K2xYx8XzROrKIwZRviFNg2xlsH9QTxGpcxXCoVGxVGSpbTUj9ir/C2rrFzej64hp+bcI 4DMXELFgbzQwSChUzzXbtIWMjsNCGOK13EiNe/oOZiBZuce1Ba+gYfxodK2y1xvxR5Hk QGJrHkBiJzRTX4hD/wJ+Ja9/TkudLj4bv2sAfAcVzsohX0Hs6svR9O0E2QhwBYoenf3Z tWuQ== X-Gm-Message-State: AOJu0Yxl7QOTxinrIlDYQLDIKTWmbgzFt12WDR6BsBjYfqwZnkyfArd0 MOyzWrb/wDoo/ph9iTYnHc4F7Tdfl42kZCe6AJes0O5SbkxI17z/7jsrJdMhf66XCt0= X-Gm-Gg: ASbGncu3Q6ZPGaVbxCcAp4c3lhJqCKEpGOSPPZgs9Ubu3lW2ruNqpx0Tpu2daxVdb1S LS93oouyejz2TahbG6mMOL8FB64e+rGVfFTGvLjXtD3qijnMPJB+2BIkijp8hLEKJOjUJtQbnMd Zqllrs7MVw+wXFxPDDcpo6ZBcp7xwsrVN/+OL5qnrtALdyPHuDlkJbv9RWd1hPhMFlAkwcaozSg ZbWmkiaNeaeVPww7uCVSeyd+kf7eI97ftAm+anL001lNaVkLXTDoPL9MaYHHorD7bnyTy9Tqv3R cD8S4xIE95pjtrhgYjeGAMBIEQoFwtjOwoptQaUe5Vf3SiGxBN/SWA== X-Google-Smtp-Source: AGHT+IHjF9A77ATHBE3b9SvMdK9lJT3V87Bih4BU12gvPzJDNkmjN6VHlXOPrM1x33gj1i/Cj7OAEw== X-Received: by 2002:a05:600c:1d09:b0:453:1058:f8c1 with SMTP id 5b1f17b1804b1-454a36dc7bemr26756415e9.3.1751448137808; Wed, 02 Jul 2025 02:22:17 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:8827:d0e:25e:834a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a406489sm195844165e9.27.2025.07.02.02.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 02:22:17 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 02 Jul 2025 11:22:10 +0200 Subject: [PATCH v2 3/8] gpio: mxc: use new generic GPIO chip API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-gpio-mmio-rework-v2-3-6b77aab684d8@linaro.org> References: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> In-Reply-To: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4640; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=ArrJt1nq0/DyMnLRqYgOtwp6wmTkd8ckjtCqzdNL0po=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoZPpEb1a2Iujd3m6Dlq9qCVuQ1Gay7cvpxMQ4G 8uVzp1zKdCJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaGT6RAAKCRARpy6gFHHX coL3EADbnsSHboTOP67UtjJ1KfYAcu2cco3pEtdOD/wcQwvCs1oENdMmSFvj3/vvliHwnUDQoBB 8d9K803SD2wRFHp8mwhxSTaQs/5KronLBcc0YW0cuf8rLF6ZWJ2L/D4fHLgootUcHEGpFjWpDzM AT9HAEa8pch5jvkq1NYCYlwyASLUvtOK/FqXw0Pdq6kpKZJuVBfsbRZC7p1pBQs8h777sqvhTeG ZEp6owZnFUs6FMY4CNohTvkIpAtBgOk28droEpctwLgDLm1OEyCGT3KjKhhQSMC62jvonrHj8Hg OMSQvXrQ7xSFGaj/pBdarGbtItdoM72Ar8gOqyXiCclxhOlaTEQm1tpIB83LLrOf6u03qOk5R7s Biwzu8qoubwnR4G+s8ZQdtYMpWm5TukofpRkhFboE5NZ3ICZ0qqqivzmrl5GiGKFXhRgd2SRM+p LJjyeeTgX1fHyD6XwNP8v6x729useTcDxA0m/FAFAArw/9USWIddgzc3wPr7o+CoSXvqI/WL73M jVtlyEzryR/+thIAOcyHGvxqZdBA+jofsDudB/SwwJTHIN/OWM/tBhkFOj5PihEJUxIJ0bAlH9S uOcujET0gOwaiB4KPVDR4yVbnOFfJfyalXRJ2umXGRW61M4IUDFHA/3/GRlV2GMyKBsxm2CjL6a 8bhoo/c8RjwdhKQ== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Convert the driver to using the new generic GPIO chip interfaces from linux/gpio/generic.h. Reviewed-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-mxc.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 1c37168c8d0a657d7f93067d9ac95cfbd821f757..433cbadc3a4cc67ebc89a470228= 0975fa8d2c9bc 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include =20 @@ -65,7 +66,7 @@ struct mxc_gpio_port { int irq_high; void (*mx_irq_handler)(struct irq_desc *desc); struct irq_domain *domain; - struct gpio_chip gc; + struct gpio_generic_chip gen_gc; struct device *dev; u32 both_edges; struct mxc_gpio_reg_saved gpio_saved_reg; @@ -179,7 +180,7 @@ static int gpio_set_irq_type(struct irq_data *d, u32 ty= pe) if (GPIO_EDGE_SEL >=3D 0) { edge =3D GPIO_INT_BOTH_EDGES; } else { - val =3D port->gc.get(&port->gc, gpio_idx); + val =3D port->gen_gc.gc.get(&port->gen_gc.gc, gpio_idx); if (val) { edge =3D GPIO_INT_LOW_LEV; pr_debug("mxc: set GPIO %d to low trigger\n", gpio_idx); @@ -200,7 +201,7 @@ static int gpio_set_irq_type(struct irq_data *d, u32 ty= pe) return -EINVAL; } =20 - scoped_guard(raw_spinlock_irqsave, &port->gc.bgpio_lock) { + scoped_guard(gpio_generic_lock_irqsave, &port->gen_gc) { if (GPIO_EDGE_SEL >=3D 0) { val =3D readl(port->base + GPIO_EDGE_SEL); if (edge =3D=3D GPIO_INT_BOTH_EDGES) @@ -222,7 +223,7 @@ static int gpio_set_irq_type(struct irq_data *d, u32 ty= pe) port->pad_type[gpio_idx] =3D type; } =20 - return port->gc.direction_input(&port->gc, gpio_idx); + return port->gen_gc.gc.direction_input(&port->gen_gc.gc, gpio_idx); } =20 static void mxc_flip_edge(struct mxc_gpio_port *port, u32 gpio) @@ -231,7 +232,7 @@ static void mxc_flip_edge(struct mxc_gpio_port *port, u= 32 gpio) u32 bit, val; int edge; =20 - guard(raw_spinlock_irqsave)(&port->gc.bgpio_lock); + guard(gpio_generic_lock_irqsave)(&port->gen_gc); =20 reg +=3D GPIO_ICR1 + ((gpio & 0x10) >> 2); /* lower or upper register */ bit =3D gpio & 0xf; @@ -414,6 +415,7 @@ static void mxc_update_irq_chained_handler(struct mxc_g= pio_port *port, bool enab =20 static int mxc_gpio_probe(struct platform_device *pdev) { + struct gpio_generic_chip_config config =3D { }; struct device_node *np =3D pdev->dev.of_node; struct mxc_gpio_port *port; int irq_count; @@ -473,27 +475,31 @@ static int mxc_gpio_probe(struct platform_device *pde= v) port->mx_irq_handler =3D mx3_gpio_irq_handler; =20 mxc_update_irq_chained_handler(port, true); - err =3D bgpio_init(&port->gc, &pdev->dev, 4, - port->base + GPIO_PSR, - port->base + GPIO_DR, NULL, - port->base + GPIO_GDIR, NULL, - BGPIOF_READ_OUTPUT_REG_SET); + + config.dev =3D &pdev->dev; + config.sz =3D 4; + config.dat =3D port->base + GPIO_PSR; + config.set =3D port->base + GPIO_DR; + config.dirout =3D port->base + GPIO_GDIR; + config.flags =3D BGPIOF_READ_OUTPUT_REG_SET; + + err =3D gpio_generic_chip_init(&port->gen_gc, &config); if (err) goto out_bgio; =20 - port->gc.request =3D mxc_gpio_request; - port->gc.free =3D mxc_gpio_free; - port->gc.to_irq =3D mxc_gpio_to_irq; + port->gen_gc.gc.request =3D mxc_gpio_request; + port->gen_gc.gc.free =3D mxc_gpio_free; + port->gen_gc.gc.to_irq =3D mxc_gpio_to_irq; /* * Driver is DT-only, so a fixed base needs only be maintained for legacy * userspace with sysfs interface. */ if (IS_ENABLED(CONFIG_GPIO_SYSFS)) - port->gc.base =3D of_alias_get_id(np, "gpio") * 32; + port->gen_gc.gc.base =3D of_alias_get_id(np, "gpio") * 32; else /* silence boot time warning */ - port->gc.base =3D -1; + port->gen_gc.gc.base =3D -1; =20 - err =3D devm_gpiochip_add_data(&pdev->dev, &port->gc, port); + err =3D devm_gpiochip_add_data(&pdev->dev, &port->gen_gc.gc, port); if (err) goto out_bgio; =20 @@ -567,7 +573,8 @@ static bool mxc_gpio_generic_config(struct mxc_gpio_por= t *port, if (of_device_is_compatible(np, "fsl,imx8dxl-gpio") || of_device_is_compatible(np, "fsl,imx8qxp-gpio") || of_device_is_compatible(np, "fsl,imx8qm-gpio")) - return (gpiochip_generic_config(&port->gc, offset, conf) =3D=3D 0); + return (gpiochip_generic_config(&port->gen_gc.gc, + offset, conf) =3D=3D 0); =20 return false; } --=20 2.48.1 From nobody Wed Oct 8 04:06:01 2025 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 9FB7B246BB8 for ; Wed, 2 Jul 2025 09:22:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448142; cv=none; b=tkre3PB7yfYNRvjjOIg5cgfXvTfcdy29Hi0rh4kGVTzqq6jdUpMkjdcy1tw2FMDy/6A1L05tuuv0Kq4rKpOdPanHnHI150cyHeSeevpPzxQF4pw7xY7IBK2loVO1R4CpqgGKsrOH7Le3vII2rpvVvELJzUAS3BIvQe6s4P4FYOg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448142; c=relaxed/simple; bh=jOLiWRKl/BnasF3kEQJEV/oHXlo55WDgn/DTu4UWOcQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OITgJEm5K1XZcbw8rC4QuA4beIaPeujuV0i0mXondQ9wXoc3YmV8DXiw5Q8q/JiSmiZOKW+YptVa3gIPrGi6idzRdFttNDWGWJf77e5aTz3Yphd4rLWFG5ZNqQYnMWhwPEXMYWcMe3LB5BzKFBNoPyaHvgmBOUGmJX3Wxd/HMNM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=SEjCFeIJ; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="SEjCFeIJ" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4537edf2c3cso65094425e9.3 for ; Wed, 02 Jul 2025 02:22:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1751448139; x=1752052939; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=L4z7uLdvG+/iHUHRwUBjtv9RcP8yTkbhvtYl1/Q8RRI=; b=SEjCFeIJ0GAT99BidT+IaO7PM++MRETTXRjFm2xO8t2v44Bt61UziUO/y+Vca9kEts TYpbMmYrbgF9QM57MNmxXTMO3hlEpHsSBjL94k08nHC/kWeHN5zFh8e694vHn+/Z7gS5 ydzktdu4im4gTK+FTjeJVqtqcvsrSXJyqGvlK/OOpwzBsFMt8gsqiBSVaYblKj8F9BqV /g32/+jd4TwSQpccY4qMNIqEFOpT/mLN0K4S759y3wDeCeQ2sXi7UQ4CKXdraJ9XyZFb IDr6pdQ9QRQyjUoEiGeaert+Xe+qB3Iueunl+8yPrfc+7w5kMYNq/1LZHnrPkPUmoJm6 3qcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751448139; x=1752052939; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L4z7uLdvG+/iHUHRwUBjtv9RcP8yTkbhvtYl1/Q8RRI=; b=W35kLhx+6kYLG2Kp02NI8g+nb6Wo/hnwVEB4Slh8LxT8PNOTbqkwXzQfw3cSFqP/2M IBRfAjJ1EqgG+zetsWbUbvSFQYNo9oPA871rjVwECPTJ3I2egipsBEQfjCbtefdJidiQ QhoM4Hbt89OzdGS8Iaia9TpYfhZNPsTixWAPZo6nMRJb5sGCwELnbluhws2enq9WugPe PQ66acIam9oc6Rx+mJzry/ETfoI8PyL9PkoQkSCYw5cvUnW0Nr9RgW01Er7uoL0t4sui K9oRiezbt39wvOtbyKiL79wKNuhxT8IuEpue3yN8eLwg3DWm6lihLH3Wq5PWiyogetN6 93wQ== X-Gm-Message-State: AOJu0Yxj7tIWtMlKxYsfPuLOjxP7v1gyEDhJ2Dd0jLl0aygNqXS7GLu+ ahu6pVG+fW6GBYElSM/QeOzUOJcUH7FwDF4Pb8KiXacI2EqcT972QgjmqRO4y+VF2ag= X-Gm-Gg: ASbGncsiToB20vp3ulxMKrMYZbhNK3mJkhQiyf27y2XoGs1uPx+Eu8NJv+m7DnecnSe /ABh6SZbKyiTubRLqdonREYbtDk7JrjlZ3wBWB030JzaywIsP+0iPMNM1u2NFv5/Nj015Hl1xhp uqiJXyLCD8IRHKBbRYn28padw2Rr65qc1FTXdNjDdTltrBN0U2NSziWQTRqVld8OiqxbM1AU687 UbzzWfKbye1coiLIOshFL5P+9EjwzWsZz8GnKWDMjk6txAMXfzUVAZVWwiPUEtayofze42cpEvU TPglcpu80slagclA9pJA57jnBPfKmkPva/0/jn+w9aafLwYGUXB6Yw== X-Google-Smtp-Source: AGHT+IHBXvE7b446X64FYR5qJVVdlVXFYhv2VtwqkK3inSCOodlHyO04CC6RTEHbQPm8wwAvG7hKEg== X-Received: by 2002:a05:600c:b8d:b0:43d:4686:5cfb with SMTP id 5b1f17b1804b1-454a3726701mr19897745e9.27.1751448138880; Wed, 02 Jul 2025 02:22:18 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:8827:d0e:25e:834a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a406489sm195844165e9.27.2025.07.02.02.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 02:22:18 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 02 Jul 2025 11:22:11 +0200 Subject: [PATCH v2 4/8] gpio: clps711x: use new generic GPIO chip API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-gpio-mmio-rework-v2-4-6b77aab684d8@linaro.org> References: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> In-Reply-To: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2481; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=1VKAdAKKIoL9buozcarUr5qCb4Dsa0/LBFXC4LmZLHs=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoZPpE4+oOICtUp+FSaA4fJrpU6lwXsLCylgffQ z9f02V0pbGJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaGT6RAAKCRARpy6gFHHX coKlEACz8yJTnbagZm7wSx+ar/VBtkbPGeTQLH3onIRqkVA55DttopeidlxnERomP/YLLzMNape F923qXs8eDJBz/SC3gHrOKQptACBL9Oyg99fbXuIQrhVWtFdM7ZEq9mD1I9ChioOehf+2+C3FPI H1Gr4emOk3uUDreRP9GX5Q+HdPwJxBEqEow5SuDvkISSMC132pbZonfSOlu+ncFLK2oWQJaR7NF tY1q5cEvv7cyWqbqG9ZhI57J6SZlSPHrtfBdeUsj8H+SLgZZyK0gMkCde7anLZMs5Eigzj4mBcf jMZmlt4pReLvYejapfEQALgacsFQsZODdhaQsWYS3Jq0a0cQt1G32JXJHE7LCNVsXLdkaZ4cYYU zvE3UK80VfdFLGLirYISO8mSc/RF5P0foFaIV/kW1UP6WexYiSRpl55knz43Br5z+Dl06scoI7p 5gLyrPzx12ZUjMfb/Or2RLnk0SjX0mJQhP1pneZwGX0yiI/umEbd51GsCWu5DMdWCkhRVczrPlB pm1Po3R3M4Gf5Pk3tpSXZEN7Fd+JJRAoJhgjj6un9LZSbcJmvZHJoRcSI+QuTKGdSRW1YwGcCzp TMybDr69MmHi/UzRfNEAstUg/tExr6NtSqNcEe9GcRXwWBGWBgSjhpWRpRd5NH63REsSjlZtoOM wvG0YPPlgAlu8RA== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Convert the driver to using the new generic GPIO chip interfaces from linux/gpio/generic.h. Reviewed-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-clps711x.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/gpio/gpio-clps711x.c b/drivers/gpio/gpio-clps711x.c index c0c8d29d0dce7617c240daab6597692118b348cf..24ff2347d59974c5b1b43595a15= 7d190e7fb4864 100644 --- a/drivers/gpio/gpio-clps711x.c +++ b/drivers/gpio/gpio-clps711x.c @@ -8,13 +8,15 @@ #include #include #include +#include #include =20 static int clps711x_gpio_probe(struct platform_device *pdev) { + struct gpio_generic_chip_config config =3D { }; struct device_node *np =3D pdev->dev.of_node; + struct gpio_generic_chip *gen_gc; void __iomem *dat, *dir; - struct gpio_chip *gc; int err, id; =20 if (!np) @@ -24,8 +26,8 @@ static int clps711x_gpio_probe(struct platform_device *pd= ev) if ((id < 0) || (id > 4)) return -ENODEV; =20 - gc =3D devm_kzalloc(&pdev->dev, sizeof(*gc), GFP_KERNEL); - if (!gc) + gen_gc =3D devm_kzalloc(&pdev->dev, sizeof(*gen_gc), GFP_KERNEL); + if (!gen_gc) return -ENOMEM; =20 dat =3D devm_platform_ioremap_resource(pdev, 0); @@ -36,34 +38,37 @@ static int clps711x_gpio_probe(struct platform_device *= pdev) if (IS_ERR(dir)) return PTR_ERR(dir); =20 + config.dev =3D &pdev->dev; + config.sz =3D 1; + config.dat =3D dat; + switch (id) { case 3: /* PORTD is inverted logic for direction register */ - err =3D bgpio_init(gc, &pdev->dev, 1, dat, NULL, NULL, - NULL, dir, 0); + config.dirin =3D dir; break; default: - err =3D bgpio_init(gc, &pdev->dev, 1, dat, NULL, NULL, - dir, NULL, 0); + config.dirout =3D dir; break; } =20 + err =3D gpio_generic_chip_init(gen_gc, &config); if (err) return err; =20 switch (id) { case 4: /* PORTE is 3 lines only */ - gc->ngpio =3D 3; + gen_gc->gc.ngpio =3D 3; break; default: break; } =20 - gc->base =3D -1; - gc->owner =3D THIS_MODULE; + gen_gc->gc.base =3D -1; + gen_gc->gc.owner =3D THIS_MODULE; =20 - return devm_gpiochip_add_data(&pdev->dev, gc, NULL); + return devm_gpiochip_add_data(&pdev->dev, &gen_gc->gc, NULL); } =20 static const struct of_device_id clps711x_gpio_ids[] =3D { --=20 2.48.1 From nobody Wed Oct 8 04:06:01 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 B82632472B4 for ; Wed, 2 Jul 2025 09:22:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448143; cv=none; b=aR8hRe8bWA/b4sqzMOVqN3Oyn70vOtqjQCVQn/fsJcZ3yaq8wptyaPK2liYVKHzdLZcUTyPy/6PjrtfWAO4USsCGMFZCCV5e4JCtldWUCqJzf9+sIYFumZYkfM+xlvOu2uNcCEdmzIgjq2OZayKPZN1I+E1yqvmFfNWc983j4DQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448143; c=relaxed/simple; bh=tyJykNA9JXtsEmAKpbmxVrsK8pxuyPX22uRvQ3leZaE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ja6XU4S+X84Y84GM3Tuu2h6wBICJpISKdC+5teFos8i8hBlagJNFwIqUuCjnLf6jocPvu3ISlE4oxQkIP19kJbGZF+GBwiMX1ZE5s1/44C0nf103cnyTl1o+XZLv7Naju3+oscgefD9jTnKuo4BDaN4Q5OZrEYDeyph0I5NRFwI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=dAfVStGK; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="dAfVStGK" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-453398e90e9so34173925e9.1 for ; Wed, 02 Jul 2025 02:22:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1751448140; x=1752052940; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6eqgDwzB97RNtxOPadXoAPBhDLs6Dg7JTwhUz1GvgpY=; b=dAfVStGKM/F+wFUixwbSyGTJoQ2cgjWnGUGUKBIKyimawyUiZ06GBTy57vSXVz/wzl 0omEEOureH9KkXCSQ5bSP5KLkHC8ltmYRL7UK9048fSteYgOeCoOxxrlpLh1tu1Vcrlb 4LIcNtYdvq+YEwxx3zABaWC7Edn27IRGnZkh7AWxe37e5kb4ys1ZDwaQ+0qiboQf+TQy w/hRShIk1KcwmvlDfn+xp/3j6dYmdcweczYYpGkCR3p5BJG4VsFL3JlwnIARpPUml0QN GYf3OIYRr9eLrB7ZG9maxQwaDLH6DQDm7Tn2hnY76olJhFKnIIuKyV/Gu/xZQILS8r3/ QS+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751448140; x=1752052940; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6eqgDwzB97RNtxOPadXoAPBhDLs6Dg7JTwhUz1GvgpY=; b=a4Kqlu0GNNTPYc5kpYmVez9brzmSdln7gNvri5nyt6MVQHJAesSswFowikVHOSNNY+ 1n+BqjGkzzBgPPsNj4YdbZd13fxQALVGHjJTHuFiHCZ551gfFInP2rhL7E8TGSWHaFr3 VGO/0KfT+UNKN7sUc/AF7xfU/Y1hdytW19LhGtHdDLsoZMbzZByUnvE3GY3PV+hYgxke 4S/12gXaEw/ge8qvqvym7YVH1H+GWk+0in32SM1SHGWwSME6VMxkoh93G4xh02jEvtit Hq7guf1Z8p6S9GDjxILuxOeaNqSim3m4Kkt1NKTRy3xXTyLsdgIpR7Bm6FwGVxkICi+O cSzw== X-Gm-Message-State: AOJu0Yy/nUA6zNXWaIAG+V9RndO1SavaRPssF8cNQx+5G/nPErtxnpVB 9O4ho4mqDNXjdwSWIu5s05sE/HbnnpRH4tUqC6Hrq/+BxR6qt0koNPXGO7XY05Z11Dg= X-Gm-Gg: ASbGncuColP3/yPnY06TJSnkHc2RPeeZz2V0eM5OrNibgY8F/bC6fWXLFa9AcCjEguQ nnWT7ePJUYZFhsS2cev+ZPwS+4scoTeapMxko6khjA0ucJw8SEjftoLj9mnzTX/l7nDWCKvF3ps kYYQhTm8sxEYDdQ3mTonLCLmyBy+7wVrNyzqkM+wgXfqsf2DxTpQ8Uglt1tTuDtbyTta32uo44D qMst8QQ4G8WHDa6nwDjHWa9DL+Ha+cvrmyUT1c7Upr+xC4qFRZDd/3YEDi0P663jOAgRJjBcH/6 hL5naH96goibBwjfzB3DSfqVmn/z44tJlCPVUauKe1GU3nUbOGdFsQ== X-Google-Smtp-Source: AGHT+IFJrU/ikcBRx1Xx3y3CO3Xl5EZm1K/9rmg09Re30z7P2KS1UPvPZTAXYcN+r1p0EvB1jatrfQ== X-Received: by 2002:a05:600c:1d1a:b0:442:dc6f:2f11 with SMTP id 5b1f17b1804b1-454a372e257mr20008535e9.25.1751448140059; Wed, 02 Jul 2025 02:22:20 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:8827:d0e:25e:834a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a406489sm195844165e9.27.2025.07.02.02.22.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 02:22:19 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 02 Jul 2025 11:22:12 +0200 Subject: [PATCH v2 5/8] gpio: cadence: use lock guards Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-gpio-mmio-rework-v2-5-6b77aab684d8@linaro.org> References: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> In-Reply-To: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2982; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=bk+ifnf5IeXV0G/nLqnGxGzgGzg1ByJ+7XwxWcaWlmY=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoZPpEg9KNgCFhZ5UtYv9wjTJ3eMXjUODBpO+wb PCt7nnTMAeJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaGT6RAAKCRARpy6gFHHX csNAEACkpQv7m/AU3g7yjr1wp65de2B0s4Lm1cV5TrvXTlGYDwOuPfXVk5DxB/Em3KcTEwtlE/4 RWA9JpR93rPV1btwtVrx/82hueypt+EsY+xMyxJrCmuoxwa6syx8ULjU0GJ+iptb9w9RkweOQEh fDTaCS8WmmKhKNC1m65+eg3G0+c3jaRQ1FXE/C6wqeYILGRNS9SWb6ZGiadv3AFB4WaBdiTsjn9 JfTcVepzX9vT7aSsgY2Kz3ZRAnXZshGxm+tP0+rq025yE0SoxO9+yALIGcTY61qunZePr7fHjuR bzCoJjJ58D4g0DDy+KLy8nqkbogviMcEpQvfJHQm79Z3ApgVzOwk4A9Mh+4BvG+7ojJo5fvk3Dn KCbIH0AXYQhMnQ1rjNHJCPC3fLWE1E9BMT3xwfJWDSzqd3OGwPECW/+Nh+/ziLuY4ya6lN48/+/ Re7tql7R9ONudhsB1UuOri15XRayJJm+MynOps/0P9d5VyafpYN6hfOyHpbrAbfn1eys7aTuHLc yuHH4CLFwXbCmclamn2uCj0lASs9cN3LBr1yIzKCI5BEPfG8ghfAu7VnGD3NL9cBcT8TS6WZumA h1GKK9cFtnaVYyg5ZwvNGesJn4tci8QKpBqcg/6JfNq8c2x8P7krZL27a2E4GOvLJ86c7NI/bWy BzYw07XnOr3jksg== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Simplify the code by using lock guards for the bgpio_lock. While at it: move the gpio/driver.h include into its correct place alphabetically. Reviewed-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-cadence.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-cadence.c b/drivers/gpio/gpio-cadence.c index e9dd2564c54f879cf1d49442dfa3db0004473d35..e6ec341d55e9047b2fa8718799b= a72d54624388e 100644 --- a/drivers/gpio/gpio-cadence.c +++ b/drivers/gpio/gpio-cadence.c @@ -8,8 +8,9 @@ * Boris Brezillon */ =20 -#include +#include #include +#include #include #include #include @@ -38,29 +39,24 @@ struct cdns_gpio_chip { static int cdns_gpio_request(struct gpio_chip *chip, unsigned int offset) { struct cdns_gpio_chip *cgpio =3D gpiochip_get_data(chip); - unsigned long flags; =20 - raw_spin_lock_irqsave(&chip->bgpio_lock, flags); + guard(raw_spinlock)(&chip->bgpio_lock); =20 iowrite32(ioread32(cgpio->regs + CDNS_GPIO_BYPASS_MODE) & ~BIT(offset), cgpio->regs + CDNS_GPIO_BYPASS_MODE); =20 - raw_spin_unlock_irqrestore(&chip->bgpio_lock, flags); return 0; } =20 static void cdns_gpio_free(struct gpio_chip *chip, unsigned int offset) { struct cdns_gpio_chip *cgpio =3D gpiochip_get_data(chip); - unsigned long flags; =20 - raw_spin_lock_irqsave(&chip->bgpio_lock, flags); + guard(raw_spinlock)(&chip->bgpio_lock); =20 iowrite32(ioread32(cgpio->regs + CDNS_GPIO_BYPASS_MODE) | (BIT(offset) & cgpio->bypass_orig), cgpio->regs + CDNS_GPIO_BYPASS_MODE); - - raw_spin_unlock_irqrestore(&chip->bgpio_lock, flags); } =20 static void cdns_gpio_irq_mask(struct irq_data *d) @@ -85,13 +81,12 @@ static int cdns_gpio_irq_set_type(struct irq_data *d, u= nsigned int type) { struct gpio_chip *chip =3D irq_data_get_irq_chip_data(d); struct cdns_gpio_chip *cgpio =3D gpiochip_get_data(chip); - unsigned long flags; u32 int_value; u32 int_type; u32 mask =3D BIT(d->hwirq); int ret =3D 0; =20 - raw_spin_lock_irqsave(&chip->bgpio_lock, flags); + guard(raw_spinlock)(&chip->bgpio_lock); =20 int_value =3D ioread32(cgpio->regs + CDNS_GPIO_IRQ_VALUE) & ~mask; int_type =3D ioread32(cgpio->regs + CDNS_GPIO_IRQ_TYPE) & ~mask; @@ -108,15 +103,12 @@ static int cdns_gpio_irq_set_type(struct irq_data *d,= unsigned int type) } else if (type =3D=3D IRQ_TYPE_LEVEL_LOW) { int_type |=3D mask; } else { - ret =3D -EINVAL; - goto err_irq_type; + return -EINVAL; } =20 iowrite32(int_value, cgpio->regs + CDNS_GPIO_IRQ_VALUE); iowrite32(int_type, cgpio->regs + CDNS_GPIO_IRQ_TYPE); =20 -err_irq_type: - raw_spin_unlock_irqrestore(&chip->bgpio_lock, flags); return ret; } =20 --=20 2.48.1 From nobody Wed Oct 8 04:06:01 2025 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 DCFE8248F40 for ; Wed, 2 Jul 2025 09:22:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448144; cv=none; b=si+rg+MqcQphWt+e/G+FWPfFL3SSg7LjqlUMDqLDRStyfwyfzQeJBfo40hikPCsSMrA2uhILPjSUF9B79c3TBoWfEgEkilmLXIOAgCmU8+VUJzQUbKxiJNo5FXoXAVBKXxCKS4e7mc6vzhu69IsRQi7G+UTHz6EVDSFzPHPFkQM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448144; c=relaxed/simple; bh=tQfSDbXmBjAlEdiXvmeFkGQTsIEZw2jAQvUsCm1LWzo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VC27nDepqvbBP2MgIrdhaPjSHEsTgvj8If2Hwe8jBigdEyOoEaxPSz28EldSXmW/6Yz+1L6/5hSRK58ndZJnAfTAxJFqHsUYUukqn3r0zKC8k22CnoHubFpRuFemOwFeymhd58F5jQeMWc812RWXi4mr7N3lmaDpWKxJSCPfXqA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=NXewqVuF; arc=none smtp.client-ip=209.85.221.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="NXewqVuF" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3ab112dea41so2298017f8f.1 for ; Wed, 02 Jul 2025 02:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1751448141; x=1752052941; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=k0+AjDE5hY/TndXKkIwRA6Lb04rFiMbqRMpx6nKU2Y0=; b=NXewqVuFVAq5iDH1V4yFVYmOp0CLXIoLDbm97QBgq2ybhjpK5aZWLY37ANNHv5yHef 8pGp1/0Tq0ZYCUdG1F7LY3MgjBJs8yHw6RRPk89rv6tAaAFmiHzF5xx87kdjLr4fLecb u1uCj6eMgER22vtKID7ASSot4kneQPb5wPIgQaTsJ3DB3bbEbqSChdFM9UCVdaKuvD2u IDevbNruhS9R8+WiFk6f8Oh+JoWRXgBpYSKQDFOXnbtqsG0R6VX4gytIky3n4huflj+0 HxbzJEpJFgkrbuXIMANs2O3Yxv+KCCa5dc0OUY222MJo3cwSzecwf0dtjfWo6t+BTs++ 2BRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751448141; x=1752052941; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k0+AjDE5hY/TndXKkIwRA6Lb04rFiMbqRMpx6nKU2Y0=; b=gTcXgW0XnPlUqucbFN2Z7iDa65OXbtH5ODGlXs+XyzRIJ6fkvqSzAG7jLyQiFcI3p7 aydEtRe8iNS4TtyAjq+1PLUMSePfgS9CFjei3PJk4BQKKbi8/Sywe/zVzWUlMSE5L6Xu B1BQ8dmAFVQM63sd2a75+YaulsYjsWhlp9bCwK4OZSrUakdXU+dGKhjGRa0LtFCfpcOD F60D7HHx3SJT9XtK0dT+9FAhsaK2PT70rQktr344o+DwWdj7hQ+3McXr3A9z89A/VAVv Bjema2HojG5TLY7tL7i67SGf1WQR+QojnrpeJliZyyGXDHXwpus7it4Y4UMhNm+9CfQh 3/Og== X-Gm-Message-State: AOJu0Yw0dvB7NjMdnJeAdKmbwUbrZAhYvcQz1fTytJGwpohW5l1cxmWw NNcVU/uSLSrq8PsCsp/nayleKHFpCjTtG663vuOVj9Q3xUQ14JkjkDrUOHRdy3jBqtXIToBaTpE dBAUbnLQ= X-Gm-Gg: ASbGncvRsxuw39BxInIqS5Oiyjxu3IF7CTJ7qwfQjElOg7+9uEiZHsL5i1diJmDodNp dC9C8+hWd/NBNRcr1XR2AaBtSoFhx4GlRjYE0kDVSdM26fbeeZej4Cu7tCTQi8PmwPqw7b8y6Fm frdz/YWM4TmDNPEWFYFxzqOoFW0iVXijBrOz1wx0zyd1IDUUN8U4TVpUp9JIC4pVbfPMR6BFlpX rosWlrQrxT3i7BJU8wHazcO68n/MPlAIUx3iDeg5IlF9vOS+RAieeFrmS873JSPhuXju0MJgkuN yBD4N2G0NyyvZAeDi0EIgvx+fWZns9q8HsO60hJxlMfCxexxQJnRlA== X-Google-Smtp-Source: AGHT+IFUTkQvyXFzsGNlqDX20NiNYBIQiPL8o6v8ocmr9X2/T9KyVihtWxZOoEUNTrhfgHIx4L9CzA== X-Received: by 2002:a05:6000:1887:b0:3a5:2d42:aa25 with SMTP id ffacd0b85a97d-3b20110b277mr1315013f8f.50.1751448141188; Wed, 02 Jul 2025 02:22:21 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:8827:d0e:25e:834a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a406489sm195844165e9.27.2025.07.02.02.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 02:22:20 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 02 Jul 2025 11:22:13 +0200 Subject: [PATCH v2 6/8] gpio: cadence: use new generic GPIO chip API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-gpio-mmio-rework-v2-6-6b77aab684d8@linaro.org> References: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> In-Reply-To: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4923; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=PQq4ZbNjDNAuumzfNO2E7A4+3aqHViTTAOD8bRl9gxs=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoZPpFZzbllRL7mqefD91k5+IPwZVgoSI1gZreR yDHtIsKGsuJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaGT6RQAKCRARpy6gFHHX cnRGD/9SPqNvkxINyTLmM900McNidb/ByKS47CfPiEEe9qvoRuUwmKGGHy8wqUyBm9pbsLQW1Mh dSo5sSKujwTyeuodotZnpOLQKGqxy56FGQxzlSzBsMe19Bf1NaY1AYj13rQJ6PptHneoHlOg6Lc ENaGsxptlqHu5vTG1iDMbo4uw8uZOBzFdDQK5b31IAKZ0FbiLz2ZiWOGLPUNproZnLyV+o0xIJj V2pzIZtiQL8Y5iHjb5V3+2ghR29/+SJsGzf2zO89j41i1txJ37HT1J/w/RjAEnd+0tO4AWp6xMK bXBR7sf+/BwWUUg5Tx1AAIjcAamZQ5ZWi1C+3s8W/ClctXTqoU4rjXlHqiFHTQekHIpGcvF2mXC ty6yN9O99EZRo5dgX2pIVVn03Hw0VndG+UVqhK8M4gsWXQekXpkwYG/claiHpAZCUsTR0mSoHIZ Pyt/VMEI4qaP3WjADGMBn0hMGIXSGCr5tz2nfenKT9dlgahTVHDEI+osZ6xN+P7Q+CCrn/8VvF/ cw16GxtLqgWOhXm2mzx5+2FjSSsyUkqYjb20MITcghw38wapxlk2LtXCtwEicb5ziQkr/6Rid6n qcypD7qC1fourQbLm719N5Ke80ZmttMhQFWo6nkS75t7p3+XYwDAYR5cZgpMf4aXCoQAX2fTi3R /X1eXsdlptGq87A== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Convert the driver to using the new generic GPIO chip interfaces from linux/gpio/generic.h. Reviewed-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-cadence.c | 46 ++++++++++++++++++++++++-----------------= ---- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/drivers/gpio/gpio-cadence.c b/drivers/gpio/gpio-cadence.c index e6ec341d55e9047b2fa8718799ba72d54624388e..8243eddcd5bbe537bab1bedc72c= 80ee88839f5d3 100644 --- a/drivers/gpio/gpio-cadence.c +++ b/drivers/gpio/gpio-cadence.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include #include #include @@ -31,7 +33,7 @@ #define CDNS_GPIO_IRQ_ANY_EDGE 0x2c =20 struct cdns_gpio_chip { - struct gpio_chip gc; + struct gpio_generic_chip gen_gc; void __iomem *regs; u32 bypass_orig; }; @@ -40,7 +42,7 @@ static int cdns_gpio_request(struct gpio_chip *chip, unsi= gned int offset) { struct cdns_gpio_chip *cgpio =3D gpiochip_get_data(chip); =20 - guard(raw_spinlock)(&chip->bgpio_lock); + guard(gpio_generic_lock)(&cgpio->gen_gc); =20 iowrite32(ioread32(cgpio->regs + CDNS_GPIO_BYPASS_MODE) & ~BIT(offset), cgpio->regs + CDNS_GPIO_BYPASS_MODE); @@ -52,7 +54,7 @@ static void cdns_gpio_free(struct gpio_chip *chip, unsign= ed int offset) { struct cdns_gpio_chip *cgpio =3D gpiochip_get_data(chip); =20 - guard(raw_spinlock)(&chip->bgpio_lock); + guard(gpio_generic_lock)(&cgpio->gen_gc); =20 iowrite32(ioread32(cgpio->regs + CDNS_GPIO_BYPASS_MODE) | (BIT(offset) & cgpio->bypass_orig), @@ -86,7 +88,7 @@ static int cdns_gpio_irq_set_type(struct irq_data *d, uns= igned int type) u32 mask =3D BIT(d->hwirq); int ret =3D 0; =20 - guard(raw_spinlock)(&chip->bgpio_lock); + guard(gpio_generic_lock)(&cgpio->gen_gc); =20 int_value =3D ioread32(cgpio->regs + CDNS_GPIO_IRQ_VALUE) & ~mask; int_type =3D ioread32(cgpio->regs + CDNS_GPIO_IRQ_TYPE) & ~mask; @@ -142,6 +144,7 @@ static const struct irq_chip cdns_gpio_irqchip =3D { =20 static int cdns_gpio_probe(struct platform_device *pdev) { + struct gpio_generic_chip_config config =3D { }; struct cdns_gpio_chip *cgpio; int ret, irq; u32 dir_prev; @@ -168,32 +171,33 @@ static int cdns_gpio_probe(struct platform_device *pd= ev) * gpiochip_lock_as_irq: * tried to flag a GPIO set as output for IRQ * Generic GPIO driver stores the direction value internally, - * so it needs to be changed before bgpio_init() is called. + * so it needs to be changed before gpio_generic_chip_init() is called. */ dir_prev =3D ioread32(cgpio->regs + CDNS_GPIO_DIRECTION_MODE); iowrite32(GENMASK(num_gpios - 1, 0), cgpio->regs + CDNS_GPIO_DIRECTION_MODE); =20 - ret =3D bgpio_init(&cgpio->gc, &pdev->dev, 4, - cgpio->regs + CDNS_GPIO_INPUT_VALUE, - cgpio->regs + CDNS_GPIO_OUTPUT_VALUE, - NULL, - NULL, - cgpio->regs + CDNS_GPIO_DIRECTION_MODE, - BGPIOF_READ_OUTPUT_REG_SET); + config.dev =3D &pdev->dev; + config.sz =3D 4; + config.dat =3D cgpio->regs + CDNS_GPIO_INPUT_VALUE; + config.set =3D cgpio->regs + CDNS_GPIO_OUTPUT_VALUE; + config.dirin =3D cgpio->regs + CDNS_GPIO_DIRECTION_MODE; + config.flags =3D BGPIOF_READ_OUTPUT_REG_SET; + + ret =3D gpio_generic_chip_init(&cgpio->gen_gc, &config); if (ret) { dev_err(&pdev->dev, "Failed to register generic gpio, %d\n", ret); goto err_revert_dir; } =20 - cgpio->gc.label =3D dev_name(&pdev->dev); - cgpio->gc.ngpio =3D num_gpios; - cgpio->gc.parent =3D &pdev->dev; - cgpio->gc.base =3D -1; - cgpio->gc.owner =3D THIS_MODULE; - cgpio->gc.request =3D cdns_gpio_request; - cgpio->gc.free =3D cdns_gpio_free; + cgpio->gen_gc.gc.label =3D dev_name(&pdev->dev); + cgpio->gen_gc.gc.ngpio =3D num_gpios; + cgpio->gen_gc.gc.parent =3D &pdev->dev; + cgpio->gen_gc.gc.base =3D -1; + cgpio->gen_gc.gc.owner =3D THIS_MODULE; + cgpio->gen_gc.gc.request =3D cdns_gpio_request; + cgpio->gen_gc.gc.free =3D cdns_gpio_free; =20 clk =3D devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(clk)) { @@ -210,7 +214,7 @@ static int cdns_gpio_probe(struct platform_device *pdev) if (irq >=3D 0) { struct gpio_irq_chip *girq; =20 - girq =3D &cgpio->gc.irq; + girq =3D &cgpio->gen_gc.gc.irq; gpio_irq_chip_set_chip(girq, &cdns_gpio_irqchip); girq->parent_handler =3D cdns_gpio_irq_handler; girq->num_parents =3D 1; @@ -226,7 +230,7 @@ static int cdns_gpio_probe(struct platform_device *pdev) girq->handler =3D handle_level_irq; } =20 - ret =3D devm_gpiochip_add_data(&pdev->dev, &cgpio->gc, cgpio); + ret =3D devm_gpiochip_add_data(&pdev->dev, &cgpio->gen_gc.gc, cgpio); if (ret < 0) { dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); goto err_revert_dir; --=20 2.48.1 From nobody Wed Oct 8 04:06:01 2025 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 32B5C24BC0A for ; Wed, 2 Jul 2025 09:22:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448146; cv=none; b=mJLnPpoOeZK6t6DFO6IS2/svOaLqpNHDEauS992jDGGOttn06wC9xOthADUNklr6mIhceWzuSSRjqK3pzbLre8riRrnTLhMAODWfyW/BwcXXk2cr0Iu7P8egMKGG/cAdnPXIdjHU/T28sHsSjHhyjE8mdvT0Az3LLQ+wTcavPhw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448146; c=relaxed/simple; bh=4iVeUyERDDHkTH4ltFoPxFSF2/I8bwoJQ4/oXYA6VM8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UwZygaoR9qJm/DdgpF8xSmSIA8KCNidINH9tyP/RS7vHMTf6XhXNK2gyJ1bj+arPKqt2l2QedoHNM4tiVn58Mb6Rt9clSCWv1YRd3ItBOg81JWpX+ttStr5uTX/uHcKTa1JQ0QLtS4WCxF9gzprctLLXyvJuzE+U6PenxHcu4iU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=YLM0WY4a; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="YLM0WY4a" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4535fbe0299so24719015e9.3 for ; Wed, 02 Jul 2025 02:22:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1751448142; x=1752052942; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Ad7oUQvI6PDZjS2O6AwRif7/SXK6hLx/gAToo+NgacI=; b=YLM0WY4aHq9ElYF2/W3K9Vujn4Tq6goLKqW341+PNNpXvegHmTzt3wAew3YsuIzQcC YaS78p3H0u9jjiSveuQ+HCfSGeEA3hzONtkeZxhlDt/h3aWgx2iL9DPeIs+5+Ma3wx72 gOhrr4XSfWof9m0DmxCLPmJIEW/jGO18m4bHlitrjUjWrVUUP+dsOT58Qow2wKMXsxc0 UlWqcG4iYjiJ+dfX5NOEhLx7AVssnXuQU1OHKZCQrx+sbv0KnToRCtFo2YuIW/e41csf Tq6fVOUgCT9D0X6uo29f/Ow6zQNXo9u4wmVJ9TkZFIbRIHs71Ol3R7Ymmy7sbqaFZ5q2 xp4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751448142; x=1752052942; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ad7oUQvI6PDZjS2O6AwRif7/SXK6hLx/gAToo+NgacI=; b=tAbgtwfNcjhHrIlynF72mCXoF1McX2H2VmwRix/HERr388APYKnIFBHwpF0NfF+qI5 F0NjyGgI5TfZjVha/6O0w46MT96ms7VbUOyZlnqz5XNGxYGPFVZ7C2f04kt5VyTh2omY 8rTq9iiBsrfCVx+cwofUxLezdhJNHRlxfVaeNaZQwsItrCI89CdPpN28Gyb23lnSiMk4 cdvSRhJhLodOaU3u0z5i2jGk7f3OIPSgthAOjBS0QdQvbzgqegKhLxKoFhdSq5haD838 sAebdEu3Qm7o0ztMwl0ymGyEODCY1okuOaDT6QRXEHiH7HLUeMYbU4IWi3cXA41z7HjK AM4g== X-Gm-Message-State: AOJu0YyNBOufQASMuKXfbcLZCQaqGKKDtF94jCVAjJWVrlqTgee1CgDB jsJVevoYi9qgLzvUp1IUF59eRFIpxVCcxfrQgfcvSFHqnaYSYJGNV+SCG/LzPhpfoQE= X-Gm-Gg: ASbGncsnoWeYSYWIHKt64vik+SkbbryYuj5pXLeErZ7R4lTH9RqpMjNrmVq+uZhZBmk ze83Q0jMHn28TWh5aUpCFkBdV3q13VSDvOpBO/SJDxTCJbCBqiCEOoyut9mduUTAJlyH1ksR34N /qJCKeKwJdQZggPbbsQx31CgaqaNPe+FwKcx9AuWMe2hiiVch4fxAPevCojKSdxpmxQ/J3law/1 jsfC9D0HgO5BcGvVVFT/SieMRr/YvlAWVHisXBhO5Ry5e7LMeAzTQyqWJcp6xx7cSlU37tosGZv lgtx29KIgF4XmF65Jk6oAER97HPUk/J8lL9GfB1t9ZMkRWk5myj6ng== X-Google-Smtp-Source: AGHT+IHQETB8lTm9+hLI/dbMN3Wi3OJ6TYb3T/RQNRaI++EeI7AdPVaW+bjvnU39OB/wmNc6zsXphw== X-Received: by 2002:a05:600c:c110:b0:453:6f1:bdba with SMTP id 5b1f17b1804b1-454a37a0c5fmr13465465e9.20.1751448142277; Wed, 02 Jul 2025 02:22:22 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:8827:d0e:25e:834a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a406489sm195844165e9.27.2025.07.02.02.22.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 02:22:21 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 02 Jul 2025 11:22:14 +0200 Subject: [PATCH v2 7/8] gpio: 74xx-mmio: use new generic GPIO chip API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-gpio-mmio-rework-v2-7-6b77aab684d8@linaro.org> References: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> In-Reply-To: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2887; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=NelkNx3yrqHzmKm2P1uPmiOUgHjfGOUZnOiW3Ed2H8Y=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoZPpFMFRjgdJp4gN49lAUNyNScZLj8unAUrqxA TlGQdopYPWJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaGT6RQAKCRARpy6gFHHX chISD/0d2nxJ4jqvObUkaYOTAp6yEzU4nhTwpX7uYqr64Dq+PtpZ0mZAFVY/NilwEGkXXfz1CWi TUw2BGeG7k10VEtCpBotWOdH6w5cWVIPfvQjh+kQMWL96vEyrzUEcoN4+6iErIQM0Q1L3M4rzVi C+jlKTMK80v7u4BJKaP+kuKGsiBH8cvzsER0antU/WZ6WuUXL6keXDYvALIXKhxBqehKtfB0deA v0OexUV7IPxSBg98BRmwBjVEWlxD+HvgSEvy9ZBnu1X9u/WAA+aTSjaHLAsi+6k4YdYLjl2gKal 6612WKkBYi2/cJ22XtHAjknibKyq9wrS7xuQD8V56mLNA7w0iOHcnV93Vs3W9ZMiUL0AoNPKwE9 m/fR1k3A7kWphQ5Q3VMgqi+aV8zCUXZmMLwfKFv6f32koHxxWKX39CA5LpDyL5IvwOxzm195H+o RuW6C10tv+gz0f2TByzxFwk3nn6N45lFQZOhqfQAL8nKCQXLunrRx9Sh/0yWnqPfbIoyywtSZZv eI6/gvoqMjywrdrDAlp408zqK35N3ErsruQZXDtdqJzAi9H8Exi9S7kMZ+/g3e1eB24NE59zBfJ b7idsPFZpkR7NjLvnhJ1Bed3Gffj4o1ZpAlaOy9bpk1U1l28+laiFglLyJIi3rY1TjUpfHGPeB9 YGUMmuT8qWsmIOw== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Convert the driver to using the new generic GPIO chip interfaces from linux/gpio/generic.h. Reviewed-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-74xx-mmio.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/gpio/gpio-74xx-mmio.c b/drivers/gpio/gpio-74xx-mmio.c index 3ba21add3a1c669171578ceaf9cc1728c060d401..bd2cc5f4f851650a499382b050a= 556506f4c5031 100644 --- a/drivers/gpio/gpio-74xx-mmio.c +++ b/drivers/gpio/gpio-74xx-mmio.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -18,8 +19,8 @@ #define MMIO_74XX_BIT_CNT(x) ((x) & GENMASK(7, 0)) =20 struct mmio_74xx_gpio_priv { - struct gpio_chip gc; - unsigned flags; + struct gpio_generic_chip gen_gc; + unsigned int flags; }; =20 static const struct of_device_id mmio_74xx_gpio_ids[] =3D { @@ -99,16 +100,15 @@ static int mmio_74xx_dir_out(struct gpio_chip *gc, uns= igned int gpio, int val) { struct mmio_74xx_gpio_priv *priv =3D gpiochip_get_data(gc); =20 - if (priv->flags & MMIO_74XX_DIR_OUT) { - gc->set_rv(gc, gpio, val); - return 0; - } + if (priv->flags & MMIO_74XX_DIR_OUT) + return gpio_generic_chip_set(&priv->gen_gc, gpio, val); =20 return -ENOTSUPP; } =20 static int mmio_74xx_gpio_probe(struct platform_device *pdev) { + struct gpio_generic_chip_config config =3D { }; struct mmio_74xx_gpio_priv *priv; void __iomem *dat; int err; @@ -123,19 +123,21 @@ static int mmio_74xx_gpio_probe(struct platform_devic= e *pdev) if (IS_ERR(dat)) return PTR_ERR(dat); =20 - err =3D bgpio_init(&priv->gc, &pdev->dev, - DIV_ROUND_UP(MMIO_74XX_BIT_CNT(priv->flags), 8), - dat, NULL, NULL, NULL, NULL, 0); + config.dev =3D &pdev->dev; + config.sz =3D DIV_ROUND_UP(MMIO_74XX_BIT_CNT(priv->flags), 8); + config.dat =3D dat; + + err =3D gpio_generic_chip_init(&priv->gen_gc, &config); if (err) return err; =20 - priv->gc.direction_input =3D mmio_74xx_dir_in; - priv->gc.direction_output =3D mmio_74xx_dir_out; - priv->gc.get_direction =3D mmio_74xx_get_direction; - priv->gc.ngpio =3D MMIO_74XX_BIT_CNT(priv->flags); - priv->gc.owner =3D THIS_MODULE; + priv->gen_gc.gc.direction_input =3D mmio_74xx_dir_in; + priv->gen_gc.gc.direction_output =3D mmio_74xx_dir_out; + priv->gen_gc.gc.get_direction =3D mmio_74xx_get_direction; + priv->gen_gc.gc.ngpio =3D MMIO_74XX_BIT_CNT(priv->flags); + priv->gen_gc.gc.owner =3D THIS_MODULE; =20 - return devm_gpiochip_add_data(&pdev->dev, &priv->gc, priv); + return devm_gpiochip_add_data(&pdev->dev, &priv->gen_gc.gc, priv); } =20 static struct platform_driver mmio_74xx_gpio_driver =3D { --=20 2.48.1 From nobody Wed Oct 8 04:06:01 2025 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 1E0BC24DD00 for ; Wed, 2 Jul 2025 09:22:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448146; cv=none; b=SdZMKlYhynCi5u25Bt7lSZKfAd1Jh1rRk4N2Ba/2RNJt5zWEawGs9OYnjnqNcMgsc+ALpGB6mq42jvYHC3yHqir8Oka8Imu0lBCZxJ9YEC6cFyB6cYS6Q3Fbbf0HG18ONCsD03siQhMJoFeonB15R+T0OERCfrCZVWEXsFKODhQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751448146; c=relaxed/simple; bh=4hefMCOfh/HoGix1fXfXI70Km+nHiSCPUxJIkklgk/0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BxxX6UeRUmrgScpPiVUWwdvuLU8bX2EJSMQxH3VnUxqynPX7wmvpo4lGTXz77mbzGWURXpWoP4vFusv3Zu3qJODuyOjGYTICOF31FttsMasrJeUmNxqIPsBuZLPfnG8xbzhJRXT5zofV7BJsaq4RlYeg9bjce3jIOVwFa6BAHLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=Ktw6FF6C; arc=none smtp.client-ip=209.85.221.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="Ktw6FF6C" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3a50fc7ac4dso3053473f8f.0 for ; Wed, 02 Jul 2025 02:22:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1751448143; x=1752052943; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Z2i5IXHDrYsUc/Tn17nFSzjMPGS5SokuRGh4FjnxTpw=; b=Ktw6FF6CL5cwjXOcZMbg3kPKXusRx9QXUruYzh+AENztbJOLxgDgJ5E+lAx50rUHDy fm00MVymifJsRtDx3++GCdS/w/SJM8tPihEtqLpqVT3VJIeSB9QJC3QkxoW+GPBZ31wZ DjEspqqAgo0vmRZ3QO0EasSDxgIeG+YQRrwiISS/ztzSo2c0VYOCaowTzXTWR2nltZtv qkrEAXsyQMn4cXA6LTs+WDuHDpnD+gfFQCzu+NBsv14ArVaOQLBLxc/N1NbNFMs7WuvA TnVB5XbTXJCGflAt3wlnlQQlPeKlvETIqPpVNfibf6H0PgNhRBzve46uvzs4CsL02s2W IuBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751448143; x=1752052943; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z2i5IXHDrYsUc/Tn17nFSzjMPGS5SokuRGh4FjnxTpw=; b=puZ2JhQKiPSMbukiWLcv8P+5rh4nkr6e+NzvoiEAppXAlqqpQwFoTPpaNNa6plZj7q crFWOKrrFGgEpK5v4z9gxbf2/dMEo0BrcoPLLifu6sNjB3LutXoZrYlZlBZk69X+Z1Aq zZSHIPhWM/WOgvLiLMk/wujee0mgwExZ83BHhUvtZagPW9c9foVYOgjiu6m3qoxdSSS2 ELTz8orFzfOGCxlshHMKXg21bSXCDndkH937RWzlJz4K3BL4qZIxcIhRxyGRoRj3PXyo TfvN0WZc9xZ/GN7ybCiVe79W9eLRTiTfRfsGPZWm3dB8zpWg9PFQGZjAW9agTLBUIEXs 39jw== X-Gm-Message-State: AOJu0Yzn9X+9RcPfqI5IcHOet7xns11qr6YDexr5a0aGXIpIrQtQdXZp o3jfpuq+PeP9/XjpJsIjPu9mkW4JXScKdy6JZVep4ZQ4f0UB6ziEr5S9KAJgKBpoQ+E= X-Gm-Gg: ASbGnct6zN9OWqHOTatZse9uEKQ8QDxGyjLEzvKzw4KX3QDd8JrxmCOnVvG2I4fa2E9 NwqUjuGETygaQi3fF38tLAG8JrDdahonDlIH6OaGQvuLjitx4h2fznZXnDtu4Ofj8ux1kHPU5L+ FGkGNLTTy+zQWmhYmqGALAr1++u6WOPOi2I6FHeiuSroRzFccaBFtqktDZYx5epcyItX4KOGzHl M05pLWL6JaDEPZiTnkeJcIj0n0lIBrWKxC0MyI45Ey9eQ5RapSIX6F+CLQ3eoMOPPQeBC+9qO7K hLMEtfHIGvdWfyo0L8pwvOnp7M/5NCWjignVz3GVJLJp2EETEKJDxw== X-Google-Smtp-Source: AGHT+IHqzoytGZsKMlgoRsXyN3XDOj0IiS+FUXoOYFtH0PT8GVRyyMyck1Y8DKbhl5NYuCMHrTWO9g== X-Received: by 2002:a05:6000:2083:b0:3a4:f939:b53 with SMTP id ffacd0b85a97d-3b1ffcd6477mr1625551f8f.38.1751448143475; Wed, 02 Jul 2025 02:22:23 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:8827:d0e:25e:834a]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a406489sm195844165e9.27.2025.07.02.02.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 02:22:22 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 02 Jul 2025 11:22:15 +0200 Subject: [PATCH v2 8/8] gpio: en7523: use new generic GPIO chip API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-gpio-mmio-rework-v2-8-6b77aab684d8@linaro.org> References: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> In-Reply-To: <20250702-gpio-mmio-rework-v2-0-6b77aab684d8@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3831; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=bWHsnwR0yWBpKvxYpjrvU4Drn4TZUDb/OIAKGQMvuaU=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoZPpFdMyJ+UINCiz6R9O+qXkyUiIM7pZReygQU 4K7+xodRo6JAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaGT6RQAKCRARpy6gFHHX cj1mD/sEuWGffBMokzY6eLNDHWa9NDI66dIkEd4DeoGLZ+5mgYBSVOY4IX/2sfJRJPC7u/NWU3N iGtN99VVMrQkcE/jWg2pi4VztxciMgsAjolZkYTxw9f21U6Vm9/5u8eAGM10VZqydOcBovkEa3U rdKOvhJpPqGiKTnSCB7/owvSsaiOxis/N39s6uaULLYd3Q/VAnVaSigE/LN9yE38iKbHXAhhi23 byVyjQIoMa/fU+1VF6wSAZDTdnu7ewB3tItKln9yT9tntUIhCVDNTNcB6MPajPdSZVv/Wva+pKN QuWEiV58qhcdpV+gPxad/kI4WCIkuknzCt1Obfo9Jw+V38hnthNEOR30wfpFsEBVktQs/GE8glC lUilXpCPnJiD6rSUMLZJe08nNCuj3VroJT1RYCK6pjI3BGPIEQmb7yQv1TpuJ+0miVYOyXNzmsC P2PogiIZLhpylqVCFDR0ospXP9L/Lk9IgO4yNwEM2Z2jUi3b4NLUPFe9X8EQfrPlFxc+bvpVfXo m+dWjyS5i8/QDdFyTO7YzwMDxsT6Cne3LYLtL/GBLieHhx3GFNkmdm2pZkh7Y6BvkEa6d7iVJ03 n5IiEuf2HgB2gL6nbq2X+IU7YDkJGqQBiPJyDgs8fmFFDjWaf6+jJZG6ofJYi4MzDh0UG6bodh7 D40y/GY6tWaeFEA== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Convert the driver to using the new generic GPIO chip interfaces from linux/gpio/generic.h. Reviewed-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-en7523.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpio/gpio-en7523.c b/drivers/gpio/gpio-en7523.c index c08069d0d1045e9df4a76cad4600bf25d4e3a7c5..cf47afc578a9cea1fb1adb97f51= b143b13c66ab1 100644 --- a/drivers/gpio/gpio-en7523.c +++ b/drivers/gpio/gpio-en7523.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -13,28 +14,23 @@ =20 /** * struct airoha_gpio_ctrl - Airoha GPIO driver data - * @gc: Associated gpio_chip instance. + * @gen_gc: Associated gpio_generic_chip instance. * @data: The data register. * @dir: [0] The direction register for the lower 16 pins. * [1]: The direction register for the higher 16 pins. * @output: The output enable register. */ struct airoha_gpio_ctrl { - struct gpio_chip gc; + struct gpio_generic_chip gen_gc; void __iomem *data; void __iomem *dir[2]; void __iomem *output; }; =20 -static struct airoha_gpio_ctrl *gc_to_ctrl(struct gpio_chip *gc) -{ - return container_of(gc, struct airoha_gpio_ctrl, gc); -} - static int airoha_dir_set(struct gpio_chip *gc, unsigned int gpio, int val, int out) { - struct airoha_gpio_ctrl *ctrl =3D gc_to_ctrl(gc); + struct airoha_gpio_ctrl *ctrl =3D gpiochip_get_data(gc); u32 dir =3D ioread32(ctrl->dir[gpio / 16]); u32 output =3D ioread32(ctrl->output); u32 mask =3D BIT((gpio % 16) * 2); @@ -50,7 +46,7 @@ static int airoha_dir_set(struct gpio_chip *gc, unsigned = int gpio, iowrite32(dir, ctrl->dir[gpio / 16]); =20 if (out) - gc->set_rv(gc, gpio, val); + gpio_generic_chip_set(&ctrl->gen_gc, gpio, val); =20 iowrite32(output, ctrl->output); =20 @@ -70,7 +66,7 @@ static int airoha_dir_in(struct gpio_chip *gc, unsigned i= nt gpio) =20 static int airoha_get_dir(struct gpio_chip *gc, unsigned int gpio) { - struct airoha_gpio_ctrl *ctrl =3D gc_to_ctrl(gc); + struct airoha_gpio_ctrl *ctrl =3D gpiochip_get_data(gc); u32 dir =3D ioread32(ctrl->dir[gpio / 16]); u32 mask =3D BIT((gpio % 16) * 2); =20 @@ -79,6 +75,7 @@ static int airoha_get_dir(struct gpio_chip *gc, unsigned = int gpio) =20 static int airoha_gpio_probe(struct platform_device *pdev) { + struct gpio_generic_chip_config config =3D { }; struct device *dev =3D &pdev->dev; struct airoha_gpio_ctrl *ctrl; int err; @@ -103,18 +100,21 @@ static int airoha_gpio_probe(struct platform_device *= pdev) if (IS_ERR(ctrl->output)) return PTR_ERR(ctrl->output); =20 - err =3D bgpio_init(&ctrl->gc, dev, 4, ctrl->data, NULL, - NULL, NULL, NULL, 0); + config.dev =3D dev; + config.sz =3D 4; + config.dat =3D ctrl->data; + + err =3D gpio_generic_chip_init(&ctrl->gen_gc, &config); if (err) return dev_err_probe(dev, err, "unable to init generic GPIO"); =20 - ctrl->gc.ngpio =3D AIROHA_GPIO_MAX; - ctrl->gc.owner =3D THIS_MODULE; - ctrl->gc.direction_output =3D airoha_dir_out; - ctrl->gc.direction_input =3D airoha_dir_in; - ctrl->gc.get_direction =3D airoha_get_dir; + ctrl->gen_gc.gc.ngpio =3D AIROHA_GPIO_MAX; + ctrl->gen_gc.gc.owner =3D THIS_MODULE; + ctrl->gen_gc.gc.direction_output =3D airoha_dir_out; + ctrl->gen_gc.gc.direction_input =3D airoha_dir_in; + ctrl->gen_gc.gc.get_direction =3D airoha_get_dir; =20 - return devm_gpiochip_add_data(dev, &ctrl->gc, ctrl); + return devm_gpiochip_add_data(dev, &ctrl->gen_gc.gc, ctrl); } =20 static const struct of_device_id airoha_gpio_of_match[] =3D { --=20 2.48.1