From mboxrd@z Thu Jan 1 00:00:00 1970 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 3C9D82D5A01 for ; Mon, 25 Aug 2025 09:49:03 +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=1756115346; cv=none; b=RIRvcRSxW7f+ugJcskWP1+Wx4bWrqzOzlFXheOw6sIF+YO2TWM86TANCpn6UPglPxy/TAtsIhdAdc4XarDyRJQ3IGHmAAmxjRb9XT5QMQOy58cjMrF7zENbrtApzeN2ybN3BvF3bqeFEd/MlRctmDyxf/tFu8e/OG7qMP2LMHQo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756115346; c=relaxed/simple; bh=VZmT1mzJTnKz0ta2wfMvmpvQ/Njol7qiw7Xdu0aEovM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=A2stMrjF/XBqQchcybiXHhRSUImIWSvtDekiiausgBrchfvytizP0bMVSVA4dTsS0KxFCD+ZDnm4q26ulCbH5c8AjLPTG/1oK/OjdZTdoS2MKgvdmh4YxknDUXpaL/48dx9gkB8uQPpSSuNp8H/0dvhWK8KOPDDHdkhWXuPGqmI= 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=uSoeqAPF; 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="uSoeqAPF" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-45b5d49ae47so4769395e9.0 for ; Mon, 25 Aug 2025 02:49:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1756115342; x=1756720142; 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=wPrnuMVElbf0OVxOMvlRbagakQrZQomsS4SPCky3lf8=; b=uSoeqAPFWM1xx9+2xp8yPyV6oLVjrAddw/JW7fR9gHsJ4wRtu2vEJwWRNFB1KsEDRT WRZYxn77bAyk7VCSGCoWo2AsGxZwjupnoQQPjWZSKqjQZNiEVKvLVKHtnDluwQOoXx38 LAp8Fajm0pIGnBj7DW/n+/vVvPHx4qXbUHR9MZu8BiEc+jNaZRg2p/gNuZDy8Udnq4D8 6Thnt4k84QqJsTeFsjlzS2RBGI8881A+rlCeMOZneOWm3OAVAF6pyCQ5BauAciyOiJLN Bi7p0PnnJeh9NM5svfNrZxJDGuXd5vhvce653hsIFxI7t7z6EyfbafxSa/i8bUAxW0RG GjXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756115342; x=1756720142; 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=wPrnuMVElbf0OVxOMvlRbagakQrZQomsS4SPCky3lf8=; b=D9kg8Pxfu/FHvKpuViu/L5udRGr76FnuRn3W1J7GAmWvFjCHwjoNusrYXZqnu5C9TN smPd4qqKpy/X4Sgu0BIwz1Hgd93+kUxj1T5uccB6PMzvZa/9bbVoXtzo09wRBJ0erjbl T1x7qnPCJ+I5zZvphbF1GBTk0Qbm0AkXbcHjV9LazMGljQP5iGKDCV+1p81YctX8bKsE 3koFuJDpakyRz0hcvX2eIMN/bDmpP/A+NOaF+T984GpZlFnPaAYsBt5yysOn4+UQj2D9 zCGY2RAuFMQa1dGXbaKStDxlH5lbXgJ37oQUxkIE5Rh+vRi5Swmk8kgoGpkH2PAZX/G0 G64Q== X-Gm-Message-State: AOJu0YzfEQRbtYmkCJIcbiNtKBMIIXStVjmWVTX+BX7wMlvHm57Qk4Oe 2knrHJWml6L9D50gey0j94kkJB0b5pt8BAYRTAEMDsfL5uliWYhMy4cOcBk59JCjJf4= X-Gm-Gg: ASbGncumnBTA06xMR9EQiIaTyjw2T5WmNyjFfFIM//gm3pcVvNYWA27zo5sTjJbeSqP yPd8DrlsWgVJd1RRvE11WxdYIPu3DgCUhb+5L9xPJtZGmP2w6JUDNc0nuQvh9PgXpFD1AdJttsI qQg0Di7aivDsufjOmD+UnDovSWnkUBqLdnKGMLA1MpAc5cYZYVN7KH95imMExfNfusQW/ge3oKy lwtUXvS3Or9y+06kOvUbk1pDZcgL7kOhtO9VQbEhuBaWy2FcsAAkJMlmOCihQjImtFyON07r+lZ jl/9Hj+UtVIoZiG9gmI6IiirQd4eNpAEh7XV6JEcN/9c49+7ltNvyvXHrK8vNkFivltDVvWrUSF ra08GudW4eSbjm9O4RxSTWfrtXaPk X-Google-Smtp-Source: AGHT+IFjgey1nCIviQTiPa1PzQ/EHonjOfKoB/cv7f8o1CADReniSO0YUmXyqIETzZ5nTpWlT0Jdcw== X-Received: by 2002:a5d:5f81:0:b0:3b8:f2f2:e417 with SMTP id ffacd0b85a97d-3c5dcdfc643mr8781837f8f.51.1756115342395; Mon, 25 Aug 2025 02:49:02 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:ef52:fc8d:34ad:9bfe]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c711bb1e3asm10877449f8f.57.2025.08.25.02.49.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Aug 2025 02:49:01 -0700 (PDT) From: Bartosz Golaszewski Date: Mon, 25 Aug 2025 11:48:52 +0200 Subject: [PATCH RESEND 11/14] gpio: rda: use new generic GPIO chip API Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250825-gpio-mmio-gpio-conv-v1-11-356b4b1d5110@linaro.org> References: <20250825-gpio-mmio-gpio-conv-v1-0-356b4b1d5110@linaro.org> In-Reply-To: <20250825-gpio-mmio-gpio-conv-v1-0-356b4b1d5110@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Yinbo Zhu , Hoan Tran , Manivannan Sadhasivam , Yang Shen Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-unisoc@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2916; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=VEKDyVTn7CdAc/qOsHjVELR8QjmrXUmK9abPLIIpync=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBorDF/jKamudiWZeik6VJ09Xx/iCNsa+hN9IVns kkGZw2lPySJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaKwxfwAKCRARpy6gFHHX ck5ZEADI5Vf5PU/5cpxG04FkHdFGw+RZmg5X8m+J/hOxMzbMW/iLAflxzkvfGG99nUmCRaXb3/K s4Lh95pT29u2GXQmTtbBDEe+GLI/8kYLPkP/M7ihXlIMl/sck1TYC2+zeiaxLCDr8knUZoqJJcA CAmwq/244Fm2XAPjxTfScQo8FAqc0kH9x+/KQKxcXx9JO4i03ttbT6PTpf9QI4BQi3neUvE1A20 dxGk37C11FbihhBm5+9lLY12x0zIvZut+nMLEpuz5V3gYlPKda+Vd36VGvh8Gl/mw2JpqDfBJB+ GC2vYqAoTeDyBlN3DpgO64GzmL/f5lVIZbspk3xFXDeo27d9SDDPVdcnN+kVACVhGAxkKM8FIqi r+pFSNqqPrCnsgmKlksdOW0y4iLuEGT+ELXLry3dB+Bx8dxz7BXlTXx7CvZO8YRRnOpL7EFYSZP 5iBVm+Esr1+4ArdG/VB1Sx3MXoJXYCyg0lyEZVNGNhvJooLqhQNbLkNT8CF3XhJwoXVQ73fPsoI Kzm5ddFBOvovxO4DHfn2JQfL7no0OZU/wP6FGS6/7XEszAI7j73VXwvvV0ob1iyhv1lYzzZR7+7 xlpxZLbmzIFqlfkwBigT0D8RYQ8SsIiVXyO/dSzJHEKeEW8YxCVyU3eYmKYGnMMP3eooLetpb49 NCUph8Bx1R7VpNg== 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-rda.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-rda.c b/drivers/gpio/gpio-rda.c index cb2f63eee2aa10a2708ec91dfd610ed1ea76917d..bcd85a2237a532b875df9470d972ac88b95a91cc 100644 --- a/drivers/gpio/gpio-rda.c +++ b/drivers/gpio/gpio-rda.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -35,7 +36,7 @@ #define RDA_GPIO_BANK_NR 32 struct rda_gpio { - struct gpio_chip chip; + struct gpio_generic_chip chip; void __iomem *base; spinlock_t lock; int irq; @@ -208,6 +209,7 @@ static const struct irq_chip rda_gpio_irq_chip = { static int rda_gpio_probe(struct platform_device *pdev) { + struct gpio_generic_chip_config config; struct device *dev = &pdev->dev; struct gpio_irq_chip *girq; struct rda_gpio *rda_gpio; @@ -235,24 +237,29 @@ static int rda_gpio_probe(struct platform_device *pdev) spin_lock_init(&rda_gpio->lock); - ret = bgpio_init(&rda_gpio->chip, dev, 4, - rda_gpio->base + RDA_GPIO_VAL, - rda_gpio->base + RDA_GPIO_SET, - rda_gpio->base + RDA_GPIO_CLR, - rda_gpio->base + RDA_GPIO_OEN_SET_OUT, - rda_gpio->base + RDA_GPIO_OEN_SET_IN, - BGPIOF_READ_OUTPUT_REG_SET); + config = (typeof(config)){ + .dev = dev, + .sz = 4, + .dat = rda_gpio->base + RDA_GPIO_VAL, + .set = rda_gpio->base + RDA_GPIO_SET, + .clr = rda_gpio->base + RDA_GPIO_CLR, + .dirout = rda_gpio->base + RDA_GPIO_OEN_SET_OUT, + .dirin = rda_gpio->base + RDA_GPIO_OEN_SET_IN, + .flags = BGPIOF_READ_OUTPUT_REG_SET, + }; + + ret = gpio_generic_chip_init(&rda_gpio->chip, &config); if (ret) { - dev_err(dev, "bgpio_init failed\n"); + dev_err(dev, "failed to initialize the generic GPIO chip\n"); return ret; } - rda_gpio->chip.label = dev_name(dev); - rda_gpio->chip.ngpio = ngpios; - rda_gpio->chip.base = -1; + rda_gpio->chip.gc.label = dev_name(dev); + rda_gpio->chip.gc.ngpio = ngpios; + rda_gpio->chip.gc.base = -1; if (rda_gpio->irq >= 0) { - girq = &rda_gpio->chip.irq; + girq = &rda_gpio->chip.gc.irq; gpio_irq_chip_set_chip(girq, &rda_gpio_irq_chip); girq->handler = handle_bad_irq; girq->default_type = IRQ_TYPE_NONE; @@ -269,7 +276,7 @@ static int rda_gpio_probe(struct platform_device *pdev) platform_set_drvdata(pdev, rda_gpio); - return devm_gpiochip_add_data(dev, &rda_gpio->chip, rda_gpio); + return devm_gpiochip_add_data(dev, &rda_gpio->chip.gc, rda_gpio); } static const struct of_device_id rda_gpio_of_match[] = { -- 2.48.1