From nobody Sun Feb 8 17:22:20 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52D71C54E76 for ; Tue, 27 Dec 2022 14:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232139AbiL0Odk (ORCPT ); Tue, 27 Dec 2022 09:33:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231817AbiL0Oc6 (ORCPT ); Tue, 27 Dec 2022 09:32:58 -0500 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 540C0BC37 for ; Tue, 27 Dec 2022 06:32:51 -0800 (PST) Received: by mail-oi1-x231.google.com with SMTP id s187so12529981oie.10 for ; Tue, 27 Dec 2022 06:32:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=FJEY+4UPfziWTYrg1f/jmeyTc6jk/LjJf8U+AI6c1hc=; b=Y1cteymX6YacSALc2NOBsWmRC7ReJsFzgkk1qj6wRmkgv1LhaWdWHFr95nRISrTMYU XEqkdCC9VS5jM+8KK5d/Lsgo0+9Nngb5dpWqr3hZ9BjAyiaky+xdVropnfPjrb+evDl+ DLNqOW6Lvg7y1jWdu+HVgoe1qwjQL/Mm7JpE6KgQMTmhOntCuQMlDIdqNJWba8rxXG4Z wERhSil1CDyCoHuTw1Ukxg2pvTx1sVGtSM678yADPKTIOVA+3Ip6tz7GmXOsCy+Ztm3O 7glF5ElMSk/kz68jfCHbB5yJ7ZDsBbEwHvAoplO3jHzw6zFrsRPtmcgTivNYKKBDMH6Q 6/tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FJEY+4UPfziWTYrg1f/jmeyTc6jk/LjJf8U+AI6c1hc=; b=UGWnOw6JI/j/aLoEPvbzxgR932NNRMU/8zJtcekFrGBhItSYFZyk9DmbyTKbwTmRuY D+xPyZfvWUd8vzDdbF7wgO6yjwm4/lj1WDP0l+AHX5qZYL6/5p+sO8nnjoLPh+2R6yry 1u4gMR4tWWCqd+tnP49WnJ3hZrbwohz2wPVIE6HGwDJtyGb3eCjy5h803gihizltc5Gn DTl3LnDS9E9zjWAedm9lYFgy7Nk5GsxchA4ShVAtsyL+iu8m3WcDJXL9rU6kOCUFFsNk 9mmV4VQ9QObtdM04urcijqfQaUbiYCN90zj5Ea5dLKkygmUeqdhXWrhcSmZhJQjkBstP fTjQ== X-Gm-Message-State: AFqh2kpeNw2qlHBfBChNK/u6hA/kBAuWcpw2PS4KtD05vQfk1KFPEsHg kOk0m53PwOKBX0bFrAlz44UTEiq8NiiEn94C X-Google-Smtp-Source: AMrXdXvB/aj7ocN3PAWOBjT0ugN+C39cQ4jAlQs9XPN9fegqWe1qziobxJqtuoybYKWKepdRqzJoqg== X-Received: by 2002:a05:6808:238e:b0:35e:aa28:a433 with SMTP id bp14-20020a056808238e00b0035eaa28a433mr12990340oib.25.1672151570422; Tue, 27 Dec 2022 06:32:50 -0800 (PST) Received: from fedora.attlocal.net (69-109-179-158.lightspeed.dybhfl.sbcglobal.net. [69.109.179.158]) by smtp.gmail.com with ESMTPSA id q205-20020acac0d6000000b0035bce2a39c7sm5864969oif.21.2022.12.27.06.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 06:32:50 -0800 (PST) From: William Breathitt Gray To: linus.walleij@linaro.org, brgl@bgdev.pl Cc: andriy.shevchenko@linux.intel.com, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, michael@walle.cc, William Breathitt Gray Subject: [PATCH v5 7/8] gpio: gpio-mm: Migrate to regmap API Date: Tue, 27 Dec 2022 09:09:45 -0500 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The regmap API supports IO port accessors so we can take advantage of regmap abstractions rather than handling access to the device registers directly in the driver. The gpio-mm module is migrated to the new i8255 library interface leveraging the gpio-regmap API. Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: William Breathitt Gray --- drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-gpio-mm.c | 154 +++++++----------------------------- 2 files changed, 31 insertions(+), 124 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 63acb9cb4c58..525b911b4ac7 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -898,6 +898,7 @@ config GPIO_GPIO_MM tristate "Diamond Systems GPIO-MM GPIO support" depends on PC104 select ISA_BUS_API + select REGMAP_MMIO select GPIO_I8255 help Enables GPIO support for the Diamond Systems GPIO-MM and GPIO-MM-12. diff --git a/drivers/gpio/gpio-gpio-mm.c b/drivers/gpio/gpio-gpio-mm.c index 2689671b6b01..43d823a56e59 100644 --- a/drivers/gpio/gpio-gpio-mm.c +++ b/drivers/gpio/gpio-gpio-mm.c @@ -8,13 +8,13 @@ */ #include #include -#include -#include #include #include #include #include #include +#include +#include =20 #include "gpio-i8255.h" =20 @@ -30,83 +30,22 @@ MODULE_PARM_DESC(base, "Diamond Systems GPIO-MM base ad= dresses"); =20 #define GPIOMM_NUM_PPI 2 =20 -/** - * struct gpiomm_gpio - GPIO device private data structure - * @chip: instance of the gpio_chip - * @ppi_state: Programmable Peripheral Interface group states - * @ppi: Programmable Peripheral Interface groups - */ -struct gpiomm_gpio { - struct gpio_chip chip; - struct i8255_state ppi_state[GPIOMM_NUM_PPI]; - struct i8255 __iomem *ppi; +static const struct regmap_range gpiomm_volatile_ranges[] =3D { + i8255_volatile_regmap_range(0x0), i8255_volatile_regmap_range(0x4), +}; +static const struct regmap_access_table gpiomm_volatile_table =3D { + .yes_ranges =3D gpiomm_volatile_ranges, + .n_yes_ranges =3D ARRAY_SIZE(gpiomm_volatile_ranges), +}; +static const struct regmap_config gpiomm_regmap_config =3D { + .reg_bits =3D 8, + .reg_stride =3D 1, + .val_bits =3D 8, + .io_port =3D true, + .max_register =3D 0x7, + .volatile_table =3D &gpiomm_volatile_table, + .cache_type =3D REGCACHE_FLAT, }; - -static int gpiomm_gpio_get_direction(struct gpio_chip *chip, - unsigned int offset) -{ - struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - - if (i8255_get_direction(gpiommgpio->ppi_state, offset)) - return GPIO_LINE_DIRECTION_IN; - - return GPIO_LINE_DIRECTION_OUT; -} - -static int gpiomm_gpio_direction_input(struct gpio_chip *chip, - unsigned int offset) -{ - struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - - i8255_direction_input(gpiommgpio->ppi, gpiommgpio->ppi_state, offset); - - return 0; -} - -static int gpiomm_gpio_direction_output(struct gpio_chip *chip, - unsigned int offset, int value) -{ - struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - - i8255_direction_output(gpiommgpio->ppi, gpiommgpio->ppi_state, offset, - value); - - return 0; -} - -static int gpiomm_gpio_get(struct gpio_chip *chip, unsigned int offset) -{ - struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - - return i8255_get(gpiommgpio->ppi, offset); -} - -static int gpiomm_gpio_get_multiple(struct gpio_chip *chip, unsigned long = *mask, - unsigned long *bits) -{ - struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - - i8255_get_multiple(gpiommgpio->ppi, mask, bits, chip->ngpio); - - return 0; -} - -static void gpiomm_gpio_set(struct gpio_chip *chip, unsigned int offset, - int value) -{ - struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - - i8255_set(gpiommgpio->ppi, gpiommgpio->ppi_state, offset, value); -} - -static void gpiomm_gpio_set_multiple(struct gpio_chip *chip, - unsigned long *mask, unsigned long *bits) -{ - struct gpiomm_gpio *const gpiommgpio =3D gpiochip_get_data(chip); - - i8255_set_multiple(gpiommgpio->ppi, gpiommgpio->ppi_state, mask, bits, - chip->ngpio); -} =20 #define GPIOMM_NGPIO 48 static const char *gpiomm_names[GPIOMM_NGPIO] =3D { @@ -120,30 +59,11 @@ static const char *gpiomm_names[GPIOMM_NGPIO] =3D { "Port 2C2", "Port 2C3", "Port 2C4", "Port 2C5", "Port 2C6", "Port 2C7", }; =20 -static void gpiomm_init_dio(struct i8255 __iomem *const ppi, - struct i8255_state *const ppi_state) -{ - const unsigned long ngpio =3D 24; - const unsigned long mask =3D GENMASK(ngpio - 1, 0); - const unsigned long bits =3D 0; - unsigned long i; - - /* Initialize all GPIO to output 0 */ - for (i =3D 0; i < GPIOMM_NUM_PPI; i++) { - i8255_mode0_output(&ppi[i]); - i8255_set_multiple(&ppi[i], &ppi_state[i], &mask, &bits, ngpio); - } -} - static int gpiomm_probe(struct device *dev, unsigned int id) { - struct gpiomm_gpio *gpiommgpio; const char *const name =3D dev_name(dev); - int err; - - gpiommgpio =3D devm_kzalloc(dev, sizeof(*gpiommgpio), GFP_KERNEL); - if (!gpiommgpio) - return -ENOMEM; + struct i8255_regmap_config config =3D {}; + void __iomem *regs; =20 if (!devm_request_region(dev, base[id], GPIOMM_EXTENT, name)) { dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n", @@ -151,34 +71,20 @@ static int gpiomm_probe(struct device *dev, unsigned i= nt id) return -EBUSY; } =20 - gpiommgpio->ppi =3D devm_ioport_map(dev, base[id], GPIOMM_EXTENT); - if (!gpiommgpio->ppi) + regs =3D devm_ioport_map(dev, base[id], GPIOMM_EXTENT); + if (!regs) return -ENOMEM; =20 - gpiommgpio->chip.label =3D name; - gpiommgpio->chip.parent =3D dev; - gpiommgpio->chip.owner =3D THIS_MODULE; - gpiommgpio->chip.base =3D -1; - gpiommgpio->chip.ngpio =3D GPIOMM_NGPIO; - gpiommgpio->chip.names =3D gpiomm_names; - gpiommgpio->chip.get_direction =3D gpiomm_gpio_get_direction; - gpiommgpio->chip.direction_input =3D gpiomm_gpio_direction_input; - gpiommgpio->chip.direction_output =3D gpiomm_gpio_direction_output; - gpiommgpio->chip.get =3D gpiomm_gpio_get; - gpiommgpio->chip.get_multiple =3D gpiomm_gpio_get_multiple; - gpiommgpio->chip.set =3D gpiomm_gpio_set; - gpiommgpio->chip.set_multiple =3D gpiomm_gpio_set_multiple; - - i8255_state_init(gpiommgpio->ppi_state, GPIOMM_NUM_PPI); - gpiomm_init_dio(gpiommgpio->ppi, gpiommgpio->ppi_state); - - err =3D devm_gpiochip_add_data(dev, &gpiommgpio->chip, gpiommgpio); - if (err) { - dev_err(dev, "GPIO registering failed (%d)\n", err); - return err; - } + config.map =3D devm_regmap_init_mmio(dev, regs, &gpiomm_regmap_config); + if (IS_ERR(config.map)) + return dev_err_probe(dev, PTR_ERR(config.map), + "Unable to initialize register map\n"); + + config.parent =3D dev; + config.num_ppi =3D GPIOMM_NUM_PPI; + config.names =3D gpiomm_names; =20 - return 0; + return devm_i8255_regmap_register(dev, &config); } =20 static struct isa_driver gpiomm_driver =3D { --=20 2.38.1