From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (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 DF7EF28C84A for ; Tue, 2 Jun 2026 05:02:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780376530; cv=none; b=fSZvYDLNUs6xhoaW14CGL6CI3NwPzBt5M11bHCzbv6jwDkt2PYJwpF1VbpFIks7fxHFqvI0yg2ICam65fP5Ps7ol40LI+1k2JVLv33EHi+uSBnFG2DUYtGuDhYRMtRQCIa+u2dRP1XBt4IYiwU8WaNVvviCNGcIY1mF1YEYqqiw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780376530; c=relaxed/simple; bh=PkS84usnPdqdxgf1CnilQiWCG1S+vb0BnjAvWxF/mYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lOSl3oooUwM5AeyMCLvSdD48bH0xDOT6iX8oJ2wRgCcgRAj2CAibUZ4tKV8zSrSHNg/fB8XLCnxEpKelQA07tGxZGm6fVLkc2jfnTEHhpvBs+1Npx/9nzxRaO/+0QBAv/NScNQy3sREaA/A0NHZTnxO8wd6P0thljhl5RxguLaw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iy/law28; arc=none smtp.client-ip=209.85.215.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iy/law28" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-c8585c51f1fso1049537a12.1 for ; Mon, 01 Jun 2026 22:02:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780376524; x=1780981324; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gM2FIUryBRQiEGRMHtydSbfKjl7tClJ0BToQ5C2TWsg=; b=iy/law28fQAONKO5YrlDt8AxBky93H9ogiI2Lh2pJKpJkI8BqHP9paX8JKcgFnTlpb y3hly9kPS6tx+MU7PKFAL4WHt7Cokz3W1a25Tn9iId8i0ABZt0WET/0fOQAYUq1HXhiw Sx/dZmo8qU/l1zqtPWroCGa154Cy6NI6CK9uvwdQNE3lhKh0ecG4od9e0g3zBhPJ7wiV 7u9l28k1yWJ6bIX67SnVgIE8qvsdGmMKl7S8uxqM972XWILVLvwY+pZu4NvET4voXzBs VUu+nD6x2OM5h0Fw59rPzJTMIj7Rkdfh748RkT2GTEqpSynsEVdf6rT4EJihygRNq9wZ 6Rlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780376524; x=1780981324; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gM2FIUryBRQiEGRMHtydSbfKjl7tClJ0BToQ5C2TWsg=; b=CCl7+FLupP0Ywo1gIdMWL70VI3tPJCxbKV2xZtEOKmcNwBQoX/mSW8abvdAngjUy5e HUWEu0K1YOCnLinzzH/vnFwS0CrJOCMu9r90dqBvNUq9Jf6aU46oxpOlaZcFwYPKwvJ3 cyQsDhmC0+mNDtJCnT0ug643sXVRLctwMmgfIpJWRhD5D/lJdwCPV74St/v3r2VYr6E+ ZkxUKZA2QsDvAoq/tSjs33phZQo8Wf0gr176vJlfL77CRGmbMoeffxe74Twi8FGDOwlg ijcm8CAN33HZvrRjIDiXuEXKmA7HdjbcafrsGwE2cp6JYXYVnzHnHY1A7Ea4IEamFXz0 qsfw== X-Forwarded-Encrypted: i=1; AFNElJ8EQqpj6pwKIdFFr+jWKUMsGfEQk2azkBfXDsmqoHALzVjeRCdeQWdVeZdLAq5i2SAH+nQHOBntVowF8nI=@vger.kernel.org X-Gm-Message-State: AOJu0YzY5sdY+qE3MSNjVhDhwlO4SaIYOKPhY6CKIs76kjqiu1yVLRe1 NDQmml4bPr7kGEV+KgcJycwcpcbSgcDjOfdaw3iQDusCja9VCnoEmppG X-Gm-Gg: Acq92OFQNGhmzBOHuCR+vqT2YnT28YcuvC+P6ms3/46LzLLoCzf8wdMBsoMhUJfeXF5 Z4bB2qfZriQDrCKBILqbbs6IEFc1cGCtZ33KZfbs8vQgo6uyEWDvuZ83dJI+ujLm1OZUQK9v1zc UOpxtZDyHBsJskMhM6l3kawdBA2sQESbtl276z4kVVhATH9IpDN5A4KvUUV+I3v/BU9CZF1NEND cxnyyd06/gAUbVqiJluDUAovpSfSjLNZFXBDRlzRHC9T/DuuSLyOgBhpAF6OA2B0g77b11GRRrU EfIaJuph/8A6lUqF9/53Tcj3Hr4GN6kG1Kwlq0mK8FSewj8NrpDd1K42a9Wv2IyGTuDWMiLF7/x kYzkpPrEPYtWzn1ltUFkGymjLFpvvoL4/QM2r+uvS9XHLD/eeddmG3b6J6xzbu7r3Vlq6MHOZsR 7H8rrklyx6Tp8xq9WLFTW97GCH7eeV5sGRfKStFiRdbYN34CNEHHJcxLd53/AhHrgd78IYGeXZQ cEZO4WRDZDoE3E9VHv0elDfCuP/YW5G7ygjX8Vtrvr9fQ== X-Received: by 2002:a05:6a20:c998:b0:3a2:d53f:691c with SMTP id adf61e73a8af0-3b478d11b1bmr2304417637.26.1780376524097; Mon, 01 Jun 2026 22:02:04 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c8589d055c7sm8958467a12.9.2026.06.01.22.02.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2026 22:02:03 -0700 (PDT) From: Rosen Penev To: linux-gpio@vger.kernel.org Cc: Madhavan Srinivasan , chleroy@kernel.org, Michael Ellerman , Nicholas Piggin , Linus Walleij , Bartosz Golaszewski , linuxppc-dev@lists.ozlabs.org (open list:LINUX FOR POWERPC (32-BIT AND 64-BIT)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 6/7] gpio: ppc44x: drop PPC-specific IO helpers and rename to ppc44x Date: Mon, 1 Jun 2026 22:01:30 -0700 Message-ID: <20260602050131.856789-7-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260602050131.856789-1-rosenp@gmail.com> References: <20260602050131.856789-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace PPC-specific clrbits32()/setbits32() with local helpers using ioread32be()/iowrite32be() which are equivalent on PPC since commit 894fa235eb4c ("powerpc: inline iomap accessors"). This allows the driver to be compiled on any architecture with COMPILE_TEST. - Changed Kconfig dependency to depends on 44x || COMPILE_TEST Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/gpio/Kconfig | 3 +- drivers/gpio/gpio-ppc44x.c | 88 ++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 38 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 77991da43ec1..7374f82b7040 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -595,9 +595,8 @@ config GPIO_POLARFIRE_SOC config GPIO_PPC44X tristate "PPC44x GPIO support" - depends on 44x + depends on 44x || COMPILE_TEST select GPIO_GENERIC - select GPIOLIB help Enable gpiolib support for ppc440 based boards. diff --git a/drivers/gpio/gpio-ppc44x.c b/drivers/gpio/gpio-ppc44x.c index 6b4814ed12b5..cc7796e0cfbd 100644 --- a/drivers/gpio/gpio-ppc44x.c +++ b/drivers/gpio/gpio-ppc44x.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * PPC4xx gpio driver + * PPC44x gpio driver * * Copyright (c) 2008 Harris Corporation * Copyright (c) 2008 Sascha Hauer , Pengutronix @@ -22,7 +22,7 @@ #define GPIO_MASK2(gpio) (0xc0000000 >> ((gpio) * 2)) /* Physical GPIO register layout */ -struct ppc4xx_gpio { +struct ppc44x_gpio { __be32 or; __be32 tcr; __be32 osrl; @@ -43,11 +43,27 @@ struct ppc4xx_gpio { __be32 isr3h; }; -struct ppc4xx_gpio_chip { +struct ppc44x_gpio_chip { struct gpio_generic_chip chip; void __iomem *regs; }; +static inline void ppc44x_clrbits32(void __iomem *addr, u32 mask) +{ + u32 val = ioread32be(addr); + + val &= ~mask; + iowrite32be(val, addr); +} + +static inline void ppc44x_setbits32(void __iomem *addr, u32 mask) +{ + u32 val = ioread32be(addr); + + val |= mask; + iowrite32be(val, addr); +} + /* * GPIO LIB API implementation for GPIOs * @@ -55,9 +71,9 @@ struct ppc4xx_gpio_chip { */ static inline void -__ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) +__ppc44x_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) { - struct ppc4xx_gpio_chip *chip = gpiochip_get_data(gc); + struct ppc44x_gpio_chip *chip = gpiochip_get_data(gc); struct gpio_generic_chip *gen_gc = &chip->chip; if (val) @@ -68,29 +84,29 @@ __ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) gpio_generic_write_reg(gen_gc, gen_gc->reg_set, gen_gc->sdata); } -static int ppc4xx_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) +static int ppc44x_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) { - struct ppc4xx_gpio_chip *chip = gpiochip_get_data(gc); + struct ppc44x_gpio_chip *chip = gpiochip_get_data(gc); struct gpio_generic_chip *gen_gc = &chip->chip; - struct ppc4xx_gpio __iomem *regs = chip->regs; + struct ppc44x_gpio __iomem *regs = chip->regs; unsigned long flags; gpio_generic_chip_lock_irqsave(gen_gc, flags); /* Disable open-drain function */ - clrbits32(®s->odr, GPIO_MASK(gpio)); + ppc44x_clrbits32(®s->odr, GPIO_MASK(gpio)); /* Float the pin */ - clrbits32(®s->tcr, GPIO_MASK(gpio)); + ppc44x_clrbits32(®s->tcr, GPIO_MASK(gpio)); gen_gc->sdir &= ~GPIO_MASK(gpio); /* Bits 0-15 use TSRL/OSRL, bits 16-31 use TSRH/OSRH */ if (gpio < 16) { - clrbits32(®s->osrl, GPIO_MASK2(gpio)); - clrbits32(®s->tsrl, GPIO_MASK2(gpio)); + ppc44x_clrbits32(®s->osrl, GPIO_MASK2(gpio)); + ppc44x_clrbits32(®s->tsrl, GPIO_MASK2(gpio)); } else { - clrbits32(®s->osrh, GPIO_MASK2(gpio)); - clrbits32(®s->tsrh, GPIO_MASK2(gpio)); + ppc44x_clrbits32(®s->osrh, GPIO_MASK2(gpio)); + ppc44x_clrbits32(®s->tsrh, GPIO_MASK2(gpio)); } gpio_generic_chip_unlock_irqrestore(gen_gc, flags); @@ -99,32 +115,32 @@ static int ppc4xx_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) } static int -ppc4xx_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) +ppc44x_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) { - struct ppc4xx_gpio_chip *chip = gpiochip_get_data(gc); + struct ppc44x_gpio_chip *chip = gpiochip_get_data(gc); struct gpio_generic_chip *gen_gc = &chip->chip; - struct ppc4xx_gpio __iomem *regs = chip->regs; + struct ppc44x_gpio __iomem *regs = chip->regs; unsigned long flags; gpio_generic_chip_lock_irqsave(gen_gc, flags); /* First set initial value */ - __ppc4xx_gpio_set(gc, gpio, val); + __ppc44x_gpio_set(gc, gpio, val); /* Disable open-drain function */ - clrbits32(®s->odr, GPIO_MASK(gpio)); + ppc44x_clrbits32(®s->odr, GPIO_MASK(gpio)); /* Drive the pin */ - setbits32(®s->tcr, GPIO_MASK(gpio)); + ppc44x_setbits32(®s->tcr, GPIO_MASK(gpio)); gen_gc->sdir |= GPIO_MASK(gpio); /* Bits 0-15 use TSRL, bits 16-31 use TSRH */ if (gpio < 16) { - clrbits32(®s->osrl, GPIO_MASK2(gpio)); - clrbits32(®s->tsrl, GPIO_MASK2(gpio)); + ppc44x_clrbits32(®s->osrl, GPIO_MASK2(gpio)); + ppc44x_clrbits32(®s->tsrl, GPIO_MASK2(gpio)); } else { - clrbits32(®s->osrh, GPIO_MASK2(gpio)); - clrbits32(®s->tsrh, GPIO_MASK2(gpio)); + ppc44x_clrbits32(®s->osrh, GPIO_MASK2(gpio)); + ppc44x_clrbits32(®s->tsrh, GPIO_MASK2(gpio)); } gpio_generic_chip_unlock_irqrestore(gen_gc, flags); @@ -134,14 +150,14 @@ ppc4xx_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) return 0; } -static int ppc4xx_gpio_probe(struct platform_device *ofdev) +static int ppc44x_gpio_probe(struct platform_device *ofdev) { struct device *dev = &ofdev->dev; struct device_node *np = dev->of_node; - struct ppc4xx_gpio_chip *chip; + struct ppc44x_gpio_chip *chip; struct gpio_generic_chip_config config; struct gpio_chip *gc; - struct ppc4xx_gpio __iomem *regs; + struct ppc44x_gpio __iomem *regs; int ret; chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); @@ -169,8 +185,8 @@ static int ppc4xx_gpio_probe(struct platform_device *ofdev) gc = &chip->chip.gc; gc->fwnode = dev_fwnode(dev); - gc->direction_input = ppc4xx_gpio_dir_in; - gc->direction_output = ppc4xx_gpio_dir_out; + gc->direction_input = ppc44x_gpio_dir_in; + gc->direction_output = ppc44x_gpio_dir_out; gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", np); if (!gc->label) @@ -179,20 +195,20 @@ static int ppc4xx_gpio_probe(struct platform_device *ofdev) return devm_gpiochip_add_data(dev, gc, chip); } -static const struct of_device_id ppc4xx_gpio_match[] = { +static const struct of_device_id ppc44x_gpio_match[] = { { .compatible = "ibm,ppc4xx-gpio", }, {}, }; -MODULE_DEVICE_TABLE(of, ppc4xx_gpio_match); +MODULE_DEVICE_TABLE(of, ppc44x_gpio_match); -static struct platform_driver ppc4xx_gpio_driver = { - .probe = ppc4xx_gpio_probe, +static struct platform_driver ppc44x_gpio_driver = { + .probe = ppc44x_gpio_probe, .driver = { - .name = "ppc4xx-gpio", - .of_match_table = ppc4xx_gpio_match, + .name = "ppc44x-gpio", + .of_match_table = ppc44x_gpio_match, }, }; -module_platform_driver(ppc4xx_gpio_driver); +module_platform_driver(ppc44x_gpio_driver); -- 2.54.0