From nobody Thu Oct 2 23:48:28 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 7F6F5308F3E for ; Wed, 10 Sep 2025 07:12:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757488378; cv=none; b=Wxp7ImaBOwMkwXjutEXYBPbBouLNi/ia1gJWWE4pEso/IEO1/kW38cVMv7hHnJwBre/zAfNOvjyJVUrvPWnqvYBVm3qFHYAYu4KF+XHB1vGnFwxrkHkRbhpZAjfw0awxDdEI3kQO5NKkHbUVQoYLNjueGpncsSU1xjBkdSgipLY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757488378; c=relaxed/simple; bh=6BcJ2wNnn7+9344lve621zPsJLd6dZP2xvZ20NQBs/Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dlmCfEIB8Bp5GElBamp365PmV9JMmwJY3D/Lz6fFpgVAsKzvcb69LI4tdlBrh0WDLDNxfbJfSPTwV/kl0sUfzz8sWG4+gez/9eJInS0cUSWv2NMoSA5WHtgE25pw4/a4xlNfQhx8r2pH1VDikfOt0SpYBUHg7Ha4lzQp9z4sm3Y= 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=D1JAYGsq; arc=none smtp.client-ip=209.85.221.47 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="D1JAYGsq" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3e5190bca95so2499483f8f.0 for ; Wed, 10 Sep 2025 00:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1757488375; x=1758093175; 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=UoHSBIFEeLBOZNCXJbj9bZOS3XuoUnKsV8A51pLJiDI=; b=D1JAYGsq0qDXfwik0w9hfI6cV+cjuIdl3Jg7ScIS/6VKf/EZyEOl7/3KERBC/iXFGj Jq9h3+dLD/LqKrRs0/pS8DKD96beFqRbE/pTsthn2Aw58hGFD1JNCxytvyJ9N3DuWGaV tq42UrH5pQkg3nv+Xl0MBEjF2W1bB8l3DNmHf9Exv8kALw7KxMCU66YdhgkhFwGLIjEC yTFvSw80cI6DC5AzVacaEowfcfVIG416aRtD3qEfSLbRopw1ix5Pw82jX0LMpfvqgKtv 8pZTeZjaGWor7wNu/sVjKGuJnDc5JGMBTPjVk17JR7NczRqz3Six+LrEydULkkNhc0/p sxnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757488375; x=1758093175; 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=UoHSBIFEeLBOZNCXJbj9bZOS3XuoUnKsV8A51pLJiDI=; b=uYPqqsdO9vg+/mjC4/oSNlZV3ARtQZsT2XsMujevEYzGEaamwtciCt4xI5vxWdemNY fT6syIccTRTQLwd9jHhxwq0oL8Qf1OxmOrZNU3f69vlbcgbBax4bsQqXbH1L+ICqJaa7 ssTRO2mNlaIyFlPmuetwCihJIEwz0uXS0Ivm/8vil+BdU+6NgiE2gxIvrV4Xb6D0SJpB ZZxyD+fthhzEcuwxz/SVu7PcBor3wyOIseC6CuKgMjEkv5C9+fJxEa88/rl5G7ycOjOT JeVC3bWpKgBtXDboBeAFO0Tgwdla3ehYcrvnHwnsbecqixrY5C/sbjAABhtrjk6Hx1Xi WTUA== X-Forwarded-Encrypted: i=1; AJvYcCX21Ghdq9DaWZ9INorMkw2iprLUNYvVLrbHsxKCjadtTbWRZXF4d+02BMbDaGSAhfMA+/1hul0MFWX2IrA=@vger.kernel.org X-Gm-Message-State: AOJu0YxvDSVT4flRODjJDYBimBHM7mMtUytr5vhZnJyrkucmmhBoyUhQ fBqvxJzcf3XfbSS2j5/NEQqZbjWLT7a0J454s74QWdKiDxZ3Wo0ULbptCykosebxyD4= X-Gm-Gg: ASbGncs2ZgydKkkpV0OZ4EZ+f3mkSQOuwsEwlJrdmRe9CHBe8S8xN7QfgdwgD9DEygm 4mFfC428uSHpKaiSZgCqnnawjPDVuBPCI9PzB5QvWVP2JbT/JW29B+2QE2WvFtlqLLupkGpwVFt kVvBB+peA64daMjGU36u9TZsONBcTic7pSu8Mgy6Gzs2uuYt2Y/d3X4x1BMFKoFoseQlTCvKkiL oK8ntOLnNez58U7LMlNrPgPr08Bp/33IdlJiATR5Jse2lWbBZVVsVizysHLwcE7lmsoo1FMTTO8 m1jNfKKwgFAcTP4Qq51H7m4wD6KDolG2WxWnyCs8z/NlQkyDWydlrunwst6QU1bqamCU1ghgEBC MyomKtD+7R7R3hTfF X-Google-Smtp-Source: AGHT+IEUFZYCFWa4Vg9IIf0WX1fkQ0VP1XWAqmtS6KCEEWx+d3fiNITjlopSKB9UCn7bqfo0bZ5sfQ== X-Received: by 2002:a5d:5f92:0:b0:3d7:2284:b20 with SMTP id ffacd0b85a97d-3e641e3cd77mr9427106f8f.3.1757488374606; Wed, 10 Sep 2025 00:12:54 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:3936:709a:82c4:3e38]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45df81d20d2sm16357035e9.8.2025.09.10.00.12.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 00:12:52 -0700 (PDT) From: Bartosz Golaszewski Date: Wed, 10 Sep 2025 09:12:38 +0200 Subject: [PATCH v2 02/15] gpio: loongson1: 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: <20250910-gpio-mmio-gpio-conv-part4-v2-2-f3d1a4c57124@linaro.org> References: <20250910-gpio-mmio-gpio-conv-part4-v2-0-f3d1a4c57124@linaro.org> In-Reply-To: <20250910-gpio-mmio-gpio-conv-part4-v2-0-f3d1a4c57124@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Keguang Zhang , Alban Bedel , Doug Berger , Florian Fainelli , Broadcom internal kernel review list , Matthias Brugger , AngeloGioacchino Del Regno , Paul Walmsley , Samuel Holland , Yixun Lan , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-riscv@lists.infradead.org, spacemit@lists.linux.dev, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3648; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=mXA8fucd16pS17njrhUGHkfPQnMcfvAh6XNsIVsSGc8=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBowSTsJEThgpWEjpX0O+Hvu/Jn+X8WfnAtkM8ym hBLXZzzm0yJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaMEk7AAKCRARpy6gFHHX corBEACss3BKerKFj+T8CMoaXJs6TyHDVfUdhVGM+YwgfV7kTPxeV8QeAOT7ix92YcO0oM/4F0O yxukhzUS6glD/mXz3WflqteyWAMmQvZjdBmTh8v5vL8q3T3kuk14kpVt1HVJXeFPvyI0CRqR8pB JW1sCfn55p37EH2RUCQWCvSJif1bSLcj37Aj5OzlVGxguVdwUeoJACj9akJQZeBSZChVbOJkcT2 OWoZAaSpMPk2RWDn562byHhJyjkBMAvNOwVKBhUM/4IybIFd9zO6d42sU+vtdpeIMAmYydpMw4L 966wVymZBBsYs9PbSBpMknd12tgFofJWr4TPKZ7HkMgd9TfR7pXupS3nJCnrD0gCf2lOjqugAZJ oKfXt79UnW+Ug3F2+WUnonzgr7AaOqYaZNkE/GmQNLx5FJka/gZou4DY0rQwZX2wBY0S8nmCA7a k5FlFyIpXjD0l2y2cGvs+drE4Y2i4T4TZ+lQK6yOloyilXvRkNXGorO5NxT7i3HJeJhToiO8zTH gSL+JbkWVgX2gju3aQewWAKHLYgviIypMX9YfRiIhNJ9nt5hjUYYqpbpT0bqQY0JWZzH3+wU9An qOLgV0vAbYXEmd4n64W+SH5DuEogfw/DDROuqPMFNTs98RDyUb1YX71hzgmjFDIoHR8EF0VnTkA k8NfF/8e7ov3brw== 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. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-loongson1.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/drivers/gpio/gpio-loongson1.c b/drivers/gpio/gpio-loongson1.c index 6ca3b969db4df231517d021a7b4b5e3ddcf626f7..9750a7a175081781624a49a7949= 26b3f1e45b4d2 100644 --- a/drivers/gpio/gpio-loongson1.c +++ b/drivers/gpio/gpio-loongson1.c @@ -5,10 +5,11 @@ * Copyright (C) 2015-2023 Keguang Zhang */ =20 +#include #include #include +#include #include -#include =20 /* Loongson 1 GPIO Register Definitions */ #define GPIO_CFG 0x0 @@ -17,19 +18,18 @@ #define GPIO_OUTPUT 0x30 =20 struct ls1x_gpio_chip { - struct gpio_chip gc; + struct gpio_generic_chip chip; void __iomem *reg_base; }; =20 static int ls1x_gpio_request(struct gpio_chip *gc, unsigned int offset) { struct ls1x_gpio_chip *ls1x_gc =3D gpiochip_get_data(gc); - unsigned long flags; =20 - raw_spin_lock_irqsave(&gc->bgpio_lock, flags); + guard(gpio_generic_lock_irqsave)(&ls1x_gc->chip); + __raw_writel(__raw_readl(ls1x_gc->reg_base + GPIO_CFG) | BIT(offset), ls1x_gc->reg_base + GPIO_CFG); - raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags); =20 return 0; } @@ -37,16 +37,16 @@ static int ls1x_gpio_request(struct gpio_chip *gc, unsi= gned int offset) static void ls1x_gpio_free(struct gpio_chip *gc, unsigned int offset) { struct ls1x_gpio_chip *ls1x_gc =3D gpiochip_get_data(gc); - unsigned long flags; =20 - raw_spin_lock_irqsave(&gc->bgpio_lock, flags); + guard(gpio_generic_lock_irqsave)(&ls1x_gc->chip); + __raw_writel(__raw_readl(ls1x_gc->reg_base + GPIO_CFG) & ~BIT(offset), ls1x_gc->reg_base + GPIO_CFG); - raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags); } =20 static int ls1x_gpio_probe(struct platform_device *pdev) { + struct gpio_generic_chip_config config; struct device *dev =3D &pdev->dev; struct ls1x_gpio_chip *ls1x_gc; int ret; @@ -59,29 +59,35 @@ static int ls1x_gpio_probe(struct platform_device *pdev) if (IS_ERR(ls1x_gc->reg_base)) return PTR_ERR(ls1x_gc->reg_base); =20 - ret =3D bgpio_init(&ls1x_gc->gc, dev, 4, ls1x_gc->reg_base + GPIO_DATA, - ls1x_gc->reg_base + GPIO_OUTPUT, NULL, - NULL, ls1x_gc->reg_base + GPIO_DIR, 0); + config =3D (struct gpio_generic_chip_config) { + .dev =3D dev, + .sz =3D 4, + .dat =3D ls1x_gc->reg_base + GPIO_DATA, + .set =3D ls1x_gc->reg_base + GPIO_OUTPUT, + .dirin =3D ls1x_gc->reg_base + GPIO_DIR, + }; + + ret =3D gpio_generic_chip_init(&ls1x_gc->chip, &config); if (ret) goto err; =20 - ls1x_gc->gc.owner =3D THIS_MODULE; - ls1x_gc->gc.request =3D ls1x_gpio_request; - ls1x_gc->gc.free =3D ls1x_gpio_free; + ls1x_gc->chip.gc.owner =3D THIS_MODULE; + ls1x_gc->chip.gc.request =3D ls1x_gpio_request; + ls1x_gc->chip.gc.free =3D ls1x_gpio_free; /* * Clear ngpio to let gpiolib get the correct number * by reading ngpios property */ - ls1x_gc->gc.ngpio =3D 0; + ls1x_gc->chip.gc.ngpio =3D 0; =20 - ret =3D devm_gpiochip_add_data(dev, &ls1x_gc->gc, ls1x_gc); + ret =3D devm_gpiochip_add_data(dev, &ls1x_gc->chip.gc, ls1x_gc); if (ret) goto err; =20 platform_set_drvdata(pdev, ls1x_gc); =20 dev_info(dev, "GPIO controller registered with %d pins\n", - ls1x_gc->gc.ngpio); + ls1x_gc->chip.gc.ngpio); =20 return 0; err: --=20 2.48.1