From nobody Sun May 12 10:53:54 2024 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 EC5ADC4167B for ; Tue, 27 Dec 2022 14:32:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231743AbiL0Oct (ORCPT ); Tue, 27 Dec 2022 09:32:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230267AbiL0Ocp (ORCPT ); Tue, 27 Dec 2022 09:32:45 -0500 Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 955C763E7 for ; Tue, 27 Dec 2022 06:32:44 -0800 (PST) Received: by mail-oi1-x22e.google.com with SMTP id u204so12064876oib.7 for ; Tue, 27 Dec 2022 06:32:44 -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=Ri0mZ2K/fUhEx8zLPRzENIukosBulaHGjs8vpkuOJm0=; b=FzsUiFWzBJpv2JmeTGUVSttBRVVcokZ01iBLWstsIaKIarGbhHdLV1eWQTjALe9WsZ ao99I0x39hdNKMhO08W1vKYeFDpvjnhPElDfw8mktYJIfFN+B1Why6P6g6nTaIKyFBEN 7x9EqwL+4A1mx/5F4BA5GcVi8QRvM+Bssn8Is/7xT6qBlMrdrEaa9WGXG3ElndaiuRpk 4/efYE43oJKDvOdnwvL5Y668pA4OGaH3q7gJsmAHMekeWzIUZnnfkB0/YTiu2KROtTB/ UPT0Z7n/FlLaAkHL2AaczxJycL5lFcy4VneFbp409c45Sq0vJ8K3ILSY3XQq/ijgqwWS jaww== 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=Ri0mZ2K/fUhEx8zLPRzENIukosBulaHGjs8vpkuOJm0=; b=3YAQvU7pDr4rtCVQjdmeVZfZ5vhmWP40g42SFSzICexJdh+nM9xaQFOzuYuNMVucKq 2DTTf75Qr7k0z+Lh8o2s7bp6ht/g+rBV8KpzzBcqQXh7sTHWdy3wU8V0xk9wpH3M9h9d 6cBtJ8X0ZnQnAj3etHlZlnuZtGbkWSvVHsaPg6Qg54WaqK4Qvntsc/53/b60s7gYa9ej IR09H0DAI0nW+fAE9JdXyW5EKiVWnPbuUGkcgceuIp31Q0OF3F+XNv53fKMi4qJYN9BU gJacx32ZsiCRClqnu52mL2I7dLl0rLp+65K26fSbrB6UaVCutxDWrPbZyksVqxc53UDp RUQA== X-Gm-Message-State: AFqh2kpvZ78Cl5iD2WuFLVy6/RbJ9LjYcbcPRRoPf55aac0Qs8wdhmjM 4t2wJqTGyqCJNHzCRAfy3EgZn6/n1ah93z2v X-Google-Smtp-Source: AMrXdXsfa8XvWG+xNY9yQw9yxMAS5xYahVfrADa6LKlUY/J9RXyRtrdeXRtLB/UnWVQmd+WtgQcbLQ== X-Received: by 2002:a54:4081:0:b0:35a:d72:5505 with SMTP id i1-20020a544081000000b0035a0d725505mr17025178oii.12.1672151563943; Tue, 27 Dec 2022 06:32:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 06:32:43 -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 1/8] gpio: regmap: Always set gpio_chip get_direction Date: Tue, 27 Dec 2022 09:09:39 -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" If you only have reg_dat_base set, then it is input-only; if you only have reg_set_base set, then it is output-only. Thus, we can always set gpio_chip get_direction to gpio_regmap_get_direction and return GPIO_LINE_DIRECTION_IN/GPIO_LINE_DIRECTION_OUT given the respective register base addresses configuration. Reviewed-by: Andy Shevchenko Acked-by: Michael Walle Signed-off-by: William Breathitt Gray --- drivers/gpio/gpio-regmap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c index 6383136cbe59..f907c9c19fce 100644 --- a/drivers/gpio/gpio-regmap.c +++ b/drivers/gpio/gpio-regmap.c @@ -111,6 +111,11 @@ static int gpio_regmap_get_direction(struct gpio_chip = *chip, unsigned int base, val, reg, mask; int invert, ret; =20 + if (gpio->reg_dat_base && !gpio->reg_set_base) + return GPIO_LINE_DIRECTION_IN; + if (gpio->reg_set_base && !gpio->reg_dat_base) + return GPIO_LINE_DIRECTION_OUT; + if (gpio->reg_dir_out_base) { base =3D gpio_regmap_addr(gpio->reg_dir_out_base); invert =3D 0; @@ -265,8 +270,8 @@ struct gpio_regmap *gpio_regmap_register(const struct g= pio_regmap_config *config else if (gpio->reg_set_base) chip->set =3D gpio_regmap_set; =20 + chip->get_direction =3D gpio_regmap_get_direction; if (gpio->reg_dir_in_base || gpio->reg_dir_out_base) { - chip->get_direction =3D gpio_regmap_get_direction; chip->direction_input =3D gpio_regmap_direction_input; chip->direction_output =3D gpio_regmap_direction_output; } --=20 2.38.1 From nobody Sun May 12 10:53:54 2024 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 55F7BC4332F for ; Tue, 27 Dec 2022 14:33:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229445AbiL0Ocy (ORCPT ); Tue, 27 Dec 2022 09:32:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231614AbiL0Ocq (ORCPT ); Tue, 27 Dec 2022 09:32:46 -0500 Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 774E3B1E for ; Tue, 27 Dec 2022 06:32:45 -0800 (PST) Received: by mail-oi1-x22e.google.com with SMTP id u204so12064921oib.7 for ; Tue, 27 Dec 2022 06:32:45 -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=S8/L0fjGmelRY1w1zXRaRkpn8vBd8u1KBvpXVWvyaHM=; b=ffjdghcU3/Igjaeg6IHe7XH9dJBtq4/t6/BVkmGTXDu3G6ifvcm3TIDRnZG+TBPJB0 9ydSWuCnCWCR9AFjpESW1CJ0ceYuMCocGTBJtOx4SHHVgljepllo7yZQwb2+/sCyOHgw dqp9RH2wmzwqgg82EjapGy0je9Fc0UCQmRr2fNZYJRCSgIpYSUj2DrYwL6u5zjtITeYu goetUW48000zKzeV7mDB4+AV4uP8B2g98MLctD/HuIMj3yaw/M+pXJVJsE80PlR74x04 T9LKAYEsWXNrxVUtVAHv+uPa1TVy9CMFPi4+dXAW60/56ZeZuxY3LYad5kNEipOkXHkn eMDA== 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=S8/L0fjGmelRY1w1zXRaRkpn8vBd8u1KBvpXVWvyaHM=; b=w4+llY2xagUOssGBPYOehXKIJ+kIxJiKkiNX7hCGOAuTvph6wm0mn4XnGhLLQonVUz GITDt0gTAohV6lMXYnbT0JWb4ynY3WH8/Ri6MNIioFWrzlyoZ3R7Co0nygDISwaqlg/Y 9Advb4uP+C33I5foLHx9gpeBWHkZr3ccaFHvcEN4SNMToYNyikxVM22nS/Bx38ETRsdx F+Sa7hY0xzNsi4lqsX+ZFDrAiyhVhwQvAFpR8mmhGutjGd+F+jc7YUmVkozge7uL4upS 0Fil58NU2WAgkxrqwlOR7SBi9BIgsWALF6cPmlA4d/BBFa8/HJ7XMdlDZTBa50yuvZ9t xE3A== X-Gm-Message-State: AFqh2kp/tzLjLIkqSXs44n7ESg+SuOx1ukH2L/It6/kVxBhlw4ftGNmm N4vxjuW4sT4mtuGTEJcsD5xUyA== X-Google-Smtp-Source: AMrXdXvq9ODv7EsWCJl7M1zVc0621ohTSA1IsHEmmWWQfqBasWw6IW2HY+KDhFpbly/qi2ER0RtnhA== X-Received: by 2002:aca:1918:0:b0:35c:560f:e2ee with SMTP id l24-20020aca1918000000b0035c560fe2eemr10275887oii.34.1672151565087; Tue, 27 Dec 2022 06:32:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 06:32:44 -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 2/8] gpio: 104-dio-48e: Migrate to the regmap-irq API Date: Tue, 27 Dec 2022 09:09:40 -0500 Message-Id: <3db2ae905ffad298d14005472a823aa66a8afbce.1672149007.git.william.gray@linaro.org> 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. For the 104-dio-48e we have the following IRQ registers (0xB and 0xF): Base Address +B (Write): Enable Interrupt Base Address +B (Read): Disable Interrupt Base Address +F (Read/Write): Clear Interrupt Any write to 0xB will enable interrupts, while any read will disable interrupts. Interrupts are cleared by a write to 0xF. There's no IRQ status register, so software has to assume that if an interrupt is raised then it was for the 104-DIO-48E device. Reviewed-by: Andy Shevchenko Signed-off-by: William Breathitt Gray --- drivers/gpio/Kconfig | 2 + drivers/gpio/gpio-104-dio-48e.c | 275 +++++++++++++++----------------- 2 files changed, 135 insertions(+), 142 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index ec7cfd4f52b1..2f8cb03bd975 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -845,6 +845,8 @@ config GPIO_104_DIO_48E tristate "ACCES 104-DIO-48E GPIO support" depends on PC104 select ISA_BUS_API + select REGMAP_MMIO + select REGMAP_IRQ select GPIOLIB_IRQCHIP select GPIO_I8255 help diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48= e.c index 7b8829c8e423..e053a4e46b27 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -8,17 +8,15 @@ */ #include #include -#include +#include #include -#include #include -#include -#include +#include #include #include #include #include -#include +#include #include =20 #include "gpio-i8255.h" @@ -38,46 +36,30 @@ static unsigned int num_irq; module_param_hw_array(irq, uint, irq, &num_irq, 0); MODULE_PARM_DESC(irq, "ACCES 104-DIO-48E interrupt line numbers"); =20 +#define DIO48E_ENABLE_INTERRUPT 0xB +#define DIO48E_DISABLE_INTERRUPT DIO48E_ENABLE_INTERRUPT +#define DIO48E_CLEAR_INTERRUPT 0xF + #define DIO48E_NUM_PPI 2 =20 /** * struct dio48e_reg - device register structure * @ppi: Programmable Peripheral Interface groups - * @enable_buffer: Enable/Disable Buffer groups - * @unused1: Unused - * @enable_interrupt: Write: Enable Interrupt - * Read: Disable Interrupt - * @unused2: Unused - * @enable_counter: Write: Enable Counter/Timer Addressing - * Read: Disable Counter/Timer Addressing - * @unused3: Unused - * @clear_interrupt: Clear Interrupt */ struct dio48e_reg { struct i8255 ppi[DIO48E_NUM_PPI]; - u8 enable_buffer[DIO48E_NUM_PPI]; - u8 unused1; - u8 enable_interrupt; - u8 unused2; - u8 enable_counter; - u8 unused3; - u8 clear_interrupt; }; =20 /** * struct dio48e_gpio - GPIO device private data structure * @chip: instance of the gpio_chip * @ppi_state: PPI device states - * @lock: synchronization lock to prevent I/O race conditions * @reg: I/O address offset for the device registers - * @irq_mask: I/O bits affected by interrupts */ struct dio48e_gpio { struct gpio_chip chip; struct i8255_state ppi_state[DIO48E_NUM_PPI]; - raw_spinlock_t lock; struct dio48e_reg __iomem *reg; - unsigned char irq_mask; }; =20 static int dio48e_gpio_get_direction(struct gpio_chip *chip, unsigned int = offset) @@ -144,106 +126,95 @@ static void dio48e_gpio_set_multiple(struct gpio_chi= p *chip, bits, chip->ngpio); } =20 -static void dio48e_irq_ack(struct irq_data *data) -{ -} - -static void dio48e_irq_mask(struct irq_data *data) -{ - struct gpio_chip *chip =3D irq_data_get_irq_chip_data(data); - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - const unsigned long offset =3D irqd_to_hwirq(data); - unsigned long flags; - - /* only bit 3 on each respective Port C supports interrupts */ - if (offset !=3D 19 && offset !=3D 43) - return; - - raw_spin_lock_irqsave(&dio48egpio->lock, flags); - - if (offset =3D=3D 19) - dio48egpio->irq_mask &=3D ~BIT(0); - else - dio48egpio->irq_mask &=3D ~BIT(1); - gpiochip_disable_irq(chip, offset); - - if (!dio48egpio->irq_mask) - /* disable interrupts */ - ioread8(&dio48egpio->reg->enable_interrupt); - - raw_spin_unlock_irqrestore(&dio48egpio->lock, flags); -} - -static void dio48e_irq_unmask(struct irq_data *data) -{ - struct gpio_chip *chip =3D irq_data_get_irq_chip_data(data); - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - const unsigned long offset =3D irqd_to_hwirq(data); - unsigned long flags; - - /* only bit 3 on each respective Port C supports interrupts */ - if (offset !=3D 19 && offset !=3D 43) - return; - - raw_spin_lock_irqsave(&dio48egpio->lock, flags); +static const struct regmap_range dio48e_wr_ranges[] =3D { + regmap_reg_range(0x0, 0x9), regmap_reg_range(0xB, 0xB), + regmap_reg_range(0xD, 0xD), regmap_reg_range(0xF, 0xF), +}; +static const struct regmap_range dio48e_rd_ranges[] =3D { + regmap_reg_range(0x0, 0x2), regmap_reg_range(0x4, 0x6), + regmap_reg_range(0xB, 0xB), regmap_reg_range(0xD, 0xD), + regmap_reg_range(0xF, 0xF), +}; +static const struct regmap_range dio48e_volatile_ranges[] =3D { + i8255_volatile_regmap_range(0x0), i8255_volatile_regmap_range(0x4), + regmap_reg_range(0xB, 0xB), regmap_reg_range(0xD, 0xD), + regmap_reg_range(0xF, 0xF), +}; +static const struct regmap_range dio48e_precious_ranges[] =3D { + regmap_reg_range(0xB, 0xB), regmap_reg_range(0xD, 0xD), + regmap_reg_range(0xF, 0xF), +}; +static const struct regmap_access_table dio48e_wr_table =3D { + .yes_ranges =3D dio48e_wr_ranges, + .n_yes_ranges =3D ARRAY_SIZE(dio48e_wr_ranges), +}; +static const struct regmap_access_table dio48e_rd_table =3D { + .yes_ranges =3D dio48e_rd_ranges, + .n_yes_ranges =3D ARRAY_SIZE(dio48e_rd_ranges), +}; +static const struct regmap_access_table dio48e_volatile_table =3D { + .yes_ranges =3D dio48e_volatile_ranges, + .n_yes_ranges =3D ARRAY_SIZE(dio48e_volatile_ranges), +}; +static const struct regmap_access_table dio48e_precious_table =3D { + .yes_ranges =3D dio48e_precious_ranges, + .n_yes_ranges =3D ARRAY_SIZE(dio48e_precious_ranges), +}; +static const struct regmap_config dio48e_regmap_config =3D { + .reg_bits =3D 8, + .reg_stride =3D 1, + .val_bits =3D 8, + .io_port =3D true, + .max_register =3D 0xF, + .wr_table =3D &dio48e_wr_table, + .rd_table =3D &dio48e_rd_table, + .volatile_table =3D &dio48e_volatile_table, + .precious_table =3D &dio48e_precious_table, + .cache_type =3D REGCACHE_FLAT, +}; =20 - if (!dio48egpio->irq_mask) { - /* enable interrupts */ - iowrite8(0x00, &dio48egpio->reg->clear_interrupt); - iowrite8(0x00, &dio48egpio->reg->enable_interrupt); +/* only bit 3 on each respective Port C supports interrupts */ +#define DIO48E_REGMAP_IRQ(_ppi) \ + [19 + (_ppi) * 24] =3D { \ + .mask =3D BIT(_ppi), \ + .type =3D { .types_supported =3D IRQ_TYPE_EDGE_RISING }, \ } =20 - gpiochip_enable_irq(chip, offset); - if (offset =3D=3D 19) - dio48egpio->irq_mask |=3D BIT(0); - else - dio48egpio->irq_mask |=3D BIT(1); - - raw_spin_unlock_irqrestore(&dio48egpio->lock, flags); -} - -static int dio48e_irq_set_type(struct irq_data *data, unsigned int flow_ty= pe) -{ - const unsigned long offset =3D irqd_to_hwirq(data); - - /* only bit 3 on each respective Port C supports interrupts */ - if (offset !=3D 19 && offset !=3D 43) - return -EINVAL; - - if (flow_type !=3D IRQ_TYPE_NONE && flow_type !=3D IRQ_TYPE_EDGE_RISING) - return -EINVAL; - - return 0; -} - -static const struct irq_chip dio48e_irqchip =3D { - .name =3D "104-dio-48e", - .irq_ack =3D dio48e_irq_ack, - .irq_mask =3D dio48e_irq_mask, - .irq_unmask =3D dio48e_irq_unmask, - .irq_set_type =3D dio48e_irq_set_type, - .flags =3D IRQCHIP_IMMUTABLE, - GPIOCHIP_IRQ_RESOURCE_HELPERS, +static const struct regmap_irq dio48e_regmap_irqs[] =3D { + DIO48E_REGMAP_IRQ(0), DIO48E_REGMAP_IRQ(1), }; =20 -static irqreturn_t dio48e_irq_handler(int irq, void *dev_id) +static int dio48e_handle_mask_sync(struct regmap *const map, const int ind= ex, + const unsigned int mask_buf_def, + const unsigned int mask_buf, + void *const irq_drv_data) { - struct dio48e_gpio *const dio48egpio =3D dev_id; - struct gpio_chip *const chip =3D &dio48egpio->chip; - const unsigned long irq_mask =3D dio48egpio->irq_mask; - unsigned long gpio; + unsigned int *const irq_mask =3D irq_drv_data; + const unsigned int prev_mask =3D *irq_mask; + const unsigned int all_masked =3D GENMASK(1, 0); + int err; + unsigned int val; =20 - for_each_set_bit(gpio, &irq_mask, 2) - generic_handle_domain_irq(chip->irq.domain, - 19 + gpio*24); + /* exit early if no change since the previous mask */ + if (mask_buf =3D=3D prev_mask) + return 0; =20 - raw_spin_lock(&dio48egpio->lock); + /* remember the current mask for the next mask sync */ + *irq_mask =3D mask_buf; =20 - iowrite8(0x00, &dio48egpio->reg->clear_interrupt); + /* if all previously masked, enable interrupts when unmasking */ + if (prev_mask =3D=3D all_masked) { + err =3D regmap_write(map, DIO48E_CLEAR_INTERRUPT, 0x00); + if (err) + return err; + return regmap_write(map, DIO48E_ENABLE_INTERRUPT, 0x00); + } =20 - raw_spin_unlock(&dio48egpio->lock); + /* if all are currently masked, disable interrupts */ + if (mask_buf =3D=3D all_masked) + return regmap_read(map, DIO48E_DISABLE_INTERRUPT, &val); =20 - return IRQ_HANDLED; + return 0; } =20 #define DIO48E_NGPIO 48 @@ -266,14 +237,12 @@ static const char *dio48e_names[DIO48E_NGPIO] =3D { "PPI Group 1 Port C 5", "PPI Group 1 Port C 6", "PPI Group 1 Port C 7" }; =20 -static int dio48e_irq_init_hw(struct gpio_chip *gc) +static int dio48e_irq_init_hw(struct regmap *const map) { - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(gc); + unsigned int val; =20 /* Disable IRQ by default */ - ioread8(&dio48egpio->reg->enable_interrupt); - - return 0; + return regmap_read(map, DIO48E_DISABLE_INTERRUPT, &val); } =20 static void dio48e_init_ppi(struct i8255 __iomem *const ppi, @@ -295,8 +264,12 @@ static int dio48e_probe(struct device *dev, unsigned i= nt id) { struct dio48e_gpio *dio48egpio; const char *const name =3D dev_name(dev); - struct gpio_irq_chip *girq; + void __iomem *regs; + struct regmap *map; int err; + struct regmap_irq_chip *chip; + unsigned int irq_mask; + struct regmap_irq_chip_data *chip_data; =20 dio48egpio =3D devm_kzalloc(dev, sizeof(*dio48egpio), GFP_KERNEL); if (!dio48egpio) @@ -308,10 +281,46 @@ static int dio48e_probe(struct device *dev, unsigned = int id) return -EBUSY; } =20 - dio48egpio->reg =3D devm_ioport_map(dev, base[id], DIO48E_EXTENT); - if (!dio48egpio->reg) + regs =3D devm_ioport_map(dev, base[id], DIO48E_EXTENT); + if (!regs) + return -ENOMEM; + dio48egpio->reg =3D regs; + + map =3D devm_regmap_init_mmio(dev, regs, &dio48e_regmap_config); + if (IS_ERR(map)) + return dev_err_probe(dev, PTR_ERR(map), + "Unable to initialize register map\n"); + + chip =3D devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); + if (!chip) + return -ENOMEM; + + chip->irq_drv_data =3D devm_kzalloc(dev, sizeof(irq_mask), GFP_KERNEL); + if (!chip->irq_drv_data) return -ENOMEM; =20 + chip->name =3D name; + /* No IRQ status register so use CLEAR_INTERRUPT register instead */ + chip->status_base =3D DIO48E_CLEAR_INTERRUPT; + chip->mask_base =3D DIO48E_ENABLE_INTERRUPT; + chip->ack_base =3D DIO48E_CLEAR_INTERRUPT; + /* CLEAR_INTERRUPT doubles as status register so we need it cleared */ + chip->clear_ack =3D true; + chip->status_invert =3D true; + chip->num_regs =3D 1; + chip->irqs =3D dio48e_regmap_irqs; + chip->num_irqs =3D ARRAY_SIZE(dio48e_regmap_irqs); + chip->handle_mask_sync =3D dio48e_handle_mask_sync; + + /* Initialize to prevent spurious interrupts before we're ready */ + err =3D dio48e_irq_init_hw(map); + if (err) + return err; + + err =3D devm_regmap_add_irq_chip(dev, map, irq[id], 0, 0, chip, &chip_dat= a); + if (err) + return dev_err_probe(dev, err, "IRQ registration failed\n"); + dio48egpio->chip.label =3D name; dio48egpio->chip.parent =3D dev; dio48egpio->chip.owner =3D THIS_MODULE; @@ -326,18 +335,6 @@ static int dio48e_probe(struct device *dev, unsigned i= nt id) dio48egpio->chip.set =3D dio48e_gpio_set; dio48egpio->chip.set_multiple =3D dio48e_gpio_set_multiple; =20 - girq =3D &dio48egpio->chip.irq; - gpio_irq_chip_set_chip(girq, &dio48e_irqchip); - /* This will let us handle the parent IRQ in the driver */ - girq->parent_handler =3D NULL; - girq->num_parents =3D 0; - girq->parents =3D NULL; - girq->default_type =3D IRQ_TYPE_NONE; - girq->handler =3D handle_edge_irq; - girq->init_hw =3D dio48e_irq_init_hw; - - raw_spin_lock_init(&dio48egpio->lock); - i8255_state_init(dio48egpio->ppi_state, DIO48E_NUM_PPI); dio48e_init_ppi(dio48egpio->reg->ppi, dio48egpio->ppi_state); =20 @@ -347,14 +344,8 @@ static int dio48e_probe(struct device *dev, unsigned i= nt id) return err; } =20 - err =3D devm_request_irq(dev, irq[id], dio48e_irq_handler, 0, name, - dio48egpio); - if (err) { - dev_err(dev, "IRQ handler registering failed (%d)\n", err); - return err; - } - - return 0; + return gpiochip_irqchip_add_domain(&dio48egpio->chip, + regmap_irq_get_domain(chip_data)); } =20 static struct isa_driver dio48e_driver =3D { --=20 2.38.1 From nobody Sun May 12 10:53:54 2024 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 061F0C46467 for ; Tue, 27 Dec 2022 14:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231853AbiL0OdZ (ORCPT ); Tue, 27 Dec 2022 09:33:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231737AbiL0Oct (ORCPT ); Tue, 27 Dec 2022 09:32:49 -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 2D47FB1E for ; Tue, 27 Dec 2022 06:32:47 -0800 (PST) Received: by mail-oi1-x231.google.com with SMTP id d127so11182269oif.12 for ; Tue, 27 Dec 2022 06:32:47 -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=4L1E7RhMTiH/UWtSkfN+ucoyiUM+JfqTJtDnkFpC5QQ=; b=NUuwGW9a0I+EPv+tEFRWImDPXpqXWpUhlRjHkRNgmLVd401tOGdsp+6Do2yw3hSltN EndsDu6R4gR0Xf9m6/EBXGD84xPqiJGwMBweDiMWsOFsAFcuUtPMMhtKbZRLNPvfGXkM 7xgYvH2zYztWVXcx+VCqsKrPNb0wIUlBTwzh2e5zmn0L4CZ8yllb93FH86qoxG7BGOVV 2yWLWohdO0x3MYYdyZbQPAgWh+QpCYZ1rDY0Ffg5EVrCNT5Q2WfnnHmnlHkyT1/VTslH 6Q1wwxhARZr7AyyO+wQJT5SKfPivOeLgejhcNQFotOuhXpqiVeysl37SSGKZhDttg7P8 XJUw== 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=4L1E7RhMTiH/UWtSkfN+ucoyiUM+JfqTJtDnkFpC5QQ=; b=gS1HA+XOlz2UHtSVmEAiMFsFXypj7v6O/b2UXzMuK0I8sj8lPTJvGqYYbAFpnPRixG cEEZO1GfSex/1w2UBUtH5VyZWZVr9FKFjSHVg9jvxOaDW4/gi7Q4r0lhym1zeBIxaa6X MP12pqsIGRKgVTJb5BJ5uYaKgwoR4aUlHYRn51h9gX90PcJHb1jiB7hnlF5GzSIW2nNb eyKfHUVygRPk9EiS15F0wAF36FlJ/hH/hEZQDQ7BI6suitcFS3bc03PZfaqQErUZOCWN HiJqeGI2/80Ql0+v+Hmapmo91OxuvAKfBi1FcecKZ604dPBxeYr+PkIF5dtKJgFvRdcD YOBg== X-Gm-Message-State: AFqh2koAgIGE2A22JLp3FrGUIzKrFFpJXyT1EGP9oK7Yyoe1SShFQZxJ LERXQhvge3CC8Be90lyBFJVRsQ== X-Google-Smtp-Source: AMrXdXtRfocrgVRf7o2+wozr6vCIaMrj7gQqN8/cDFQUQyQ5K8JDSMMOkFoOYONZ36xkmND6vc4QxA== X-Received: by 2002:a05:6808:14c1:b0:35b:beed:fc48 with SMTP id f1-20020a05680814c100b0035bbeedfc48mr13286822oiw.6.1672151566412; Tue, 27 Dec 2022 06:32:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 06:32:46 -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 3/8] gpio: 104-idi-48: Migrate to the regmap-irq API Date: Tue, 27 Dec 2022 09:09:41 -0500 Message-Id: <7e711114966b18c76e4999f1b4d01fb8881c1d43.1672149007.git.william.gray@linaro.org> 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. For the 104-idi-48, we get an IRQ register with some status information and basic masking, but it's broken down by banks rather than individual GPIO. There are six banks (8 GPIO lines each) that correspond to the lower six bits of the IRQ register (bits 0-5): Base Address + 7 (Read): IRQ Status Register/IRQ Clear Bit 0-5: Respective Bank IRQ Statuses Bit 6: IRQ Status (Active Low) Bit 7: IRQ Enable Status Base Address + 7 (Write): IRQ Enable/Disable Bit 0-5: Respective Bank IRQ Enable/Disable Reviewed-by: Andy Shevchenko Signed-off-by: William Breathitt Gray --- drivers/gpio/Kconfig | 2 + drivers/gpio/gpio-104-idi-48.c | 249 ++++++++++++--------------------- 2 files changed, 93 insertions(+), 158 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 2f8cb03bd975..30f9e3f48559 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -872,6 +872,8 @@ config GPIO_104_IDI_48 tristate "ACCES 104-IDI-48 GPIO support" depends on PC104 select ISA_BUS_API + select REGMAP_MMIO + select REGMAP_IRQ select GPIOLIB_IRQCHIP select GPIO_I8255 help diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c index c5e231fde1af..f936e3e0ff12 100644 --- a/drivers/gpio/gpio-104-idi-48.c +++ b/drivers/gpio/gpio-104-idi-48.c @@ -8,17 +8,16 @@ */ #include #include -#include +#include #include -#include -#include #include -#include +#include +#include #include #include #include #include -#include +#include #include =20 #include "gpio-i8255.h" @@ -38,6 +37,9 @@ static unsigned int num_irq; module_param_hw_array(irq, uint, irq, &num_irq, 0); MODULE_PARM_DESC(irq, "ACCES 104-IDI-48 interrupt line numbers"); =20 +#define IDI48_IRQ_STATUS 0x7 +#define IDI48_IRQ_ENABLE IDI48_IRQ_STATUS + /** * struct idi_48_reg - device register structure * @port0: Port 0 Inputs @@ -56,17 +58,11 @@ struct idi_48_reg { /** * struct idi_48_gpio - GPIO device private data structure * @chip: instance of the gpio_chip - * @lock: synchronization lock to prevent I/O race conditions - * @irq_mask: input bits affected by interrupts * @reg: I/O address offset for the device registers - * @cos_enb: Change-Of-State IRQ enable boundaries mask */ struct idi_48_gpio { struct gpio_chip chip; - spinlock_t lock; - unsigned char irq_mask[6]; struct idi_48_reg __iomem *reg; - unsigned char cos_enb; }; =20 static int idi_48_gpio_get_direction(struct gpio_chip *chip, unsigned int = offset) @@ -98,125 +94,65 @@ static int idi_48_gpio_get_multiple(struct gpio_chip *= chip, unsigned long *mask, return 0; } =20 -static void idi_48_irq_ack(struct irq_data *data) -{ -} - -static void idi_48_irq_mask(struct irq_data *data) -{ - struct gpio_chip *chip =3D irq_data_get_irq_chip_data(data); - struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(chip); - const unsigned int offset =3D irqd_to_hwirq(data); - const unsigned long boundary =3D offset / 8; - const unsigned long mask =3D BIT(offset % 8); - unsigned long flags; - - spin_lock_irqsave(&idi48gpio->lock, flags); - - idi48gpio->irq_mask[boundary] &=3D ~mask; - gpiochip_disable_irq(chip, offset); - - /* Exit early if there are still input lines with IRQ unmasked */ - if (idi48gpio->irq_mask[boundary]) - goto exit; - - idi48gpio->cos_enb &=3D ~BIT(boundary); - - iowrite8(idi48gpio->cos_enb, &idi48gpio->reg->irq); - -exit: - spin_unlock_irqrestore(&idi48gpio->lock, flags); -} - -static void idi_48_irq_unmask(struct irq_data *data) -{ - struct gpio_chip *chip =3D irq_data_get_irq_chip_data(data); - struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(chip); - const unsigned int offset =3D irqd_to_hwirq(data); - const unsigned long boundary =3D offset / 8; - const unsigned long mask =3D BIT(offset % 8); - unsigned int prev_irq_mask; - unsigned long flags; - - spin_lock_irqsave(&idi48gpio->lock, flags); - - prev_irq_mask =3D idi48gpio->irq_mask[boundary]; - - gpiochip_enable_irq(chip, offset); - idi48gpio->irq_mask[boundary] |=3D mask; - - /* Exit early if IRQ was already unmasked for this boundary */ - if (prev_irq_mask) - goto exit; - - idi48gpio->cos_enb |=3D BIT(boundary); - - iowrite8(idi48gpio->cos_enb, &idi48gpio->reg->irq); - -exit: - spin_unlock_irqrestore(&idi48gpio->lock, flags); -} - -static int idi_48_irq_set_type(struct irq_data *data, unsigned int flow_ty= pe) -{ - /* The only valid irq types are none and both-edges */ - if (flow_type !=3D IRQ_TYPE_NONE && - (flow_type & IRQ_TYPE_EDGE_BOTH) !=3D IRQ_TYPE_EDGE_BOTH) - return -EINVAL; - - return 0; -} - -static const struct irq_chip idi_48_irqchip =3D { - .name =3D "104-idi-48", - .irq_ack =3D idi_48_irq_ack, - .irq_mask =3D idi_48_irq_mask, - .irq_unmask =3D idi_48_irq_unmask, - .irq_set_type =3D idi_48_irq_set_type, - .flags =3D IRQCHIP_IMMUTABLE, - GPIOCHIP_IRQ_RESOURCE_HELPERS, +static const struct regmap_range idi_48_wr_ranges[] =3D { + regmap_reg_range(0x0, 0x6), +}; +static const struct regmap_range idi_48_rd_ranges[] =3D { + regmap_reg_range(0x0, 0x2), regmap_reg_range(0x4, 0x7), +}; +static const struct regmap_range idi_48_precious_ranges[] =3D { + regmap_reg_range(0x7, 0x7), +}; +static const struct regmap_access_table idi_48_wr_table =3D { + .no_ranges =3D idi_48_wr_ranges, + .n_no_ranges =3D ARRAY_SIZE(idi_48_wr_ranges), +}; +static const struct regmap_access_table idi_48_rd_table =3D { + .yes_ranges =3D idi_48_rd_ranges, + .n_yes_ranges =3D ARRAY_SIZE(idi_48_rd_ranges), +}; +static const struct regmap_access_table idi_48_precious_table =3D { + .yes_ranges =3D idi_48_precious_ranges, + .n_yes_ranges =3D ARRAY_SIZE(idi_48_precious_ranges), +}; +static const struct regmap_config idi48_regmap_config =3D { + .reg_bits =3D 8, + .reg_stride =3D 1, + .val_bits =3D 8, + .io_port =3D true, + .max_register =3D 0x6, + .wr_table =3D &idi_48_wr_table, + .rd_table =3D &idi_48_rd_table, + .precious_table =3D &idi_48_precious_table, }; =20 -static irqreturn_t idi_48_irq_handler(int irq, void *dev_id) -{ - struct idi_48_gpio *const idi48gpio =3D dev_id; - unsigned long cos_status; - unsigned long boundary; - unsigned long irq_mask; - unsigned long bit_num; - unsigned long gpio; - struct gpio_chip *const chip =3D &idi48gpio->chip; - - spin_lock(&idi48gpio->lock); - - cos_status =3D ioread8(&idi48gpio->reg->irq); - - /* IRQ Status (bit 6) is active low (0 =3D IRQ generated by device) */ - if (cos_status & BIT(6)) { - spin_unlock(&idi48gpio->lock); - return IRQ_NONE; - } - - /* Bit 0-5 indicate which Change-Of-State boundary triggered the IRQ */ - cos_status &=3D 0x3F; - - for_each_set_bit(boundary, &cos_status, 6) { - irq_mask =3D idi48gpio->irq_mask[boundary]; - - for_each_set_bit(bit_num, &irq_mask, 8) { - gpio =3D bit_num + boundary * 8; +#define IDI48_NGPIO 48 =20 - generic_handle_domain_irq(chip->irq.domain, - gpio); - } +#define IDI48_REGMAP_IRQ(_id) \ + [_id] =3D { \ + .mask =3D BIT((_id) / 8), \ + .type =3D { .types_supported =3D IRQ_TYPE_EDGE_BOTH }, \ } =20 - spin_unlock(&idi48gpio->lock); - - return IRQ_HANDLED; -} +static const struct regmap_irq idi48_regmap_irqs[IDI48_NGPIO] =3D { + IDI48_REGMAP_IRQ(0), IDI48_REGMAP_IRQ(1), IDI48_REGMAP_IRQ(2), /* 0-2 */ + IDI48_REGMAP_IRQ(3), IDI48_REGMAP_IRQ(4), IDI48_REGMAP_IRQ(5), /* 3-5 */ + IDI48_REGMAP_IRQ(6), IDI48_REGMAP_IRQ(7), IDI48_REGMAP_IRQ(8), /* 6-8 */ + IDI48_REGMAP_IRQ(9), IDI48_REGMAP_IRQ(10), IDI48_REGMAP_IRQ(11), /* 9-11 = */ + IDI48_REGMAP_IRQ(12), IDI48_REGMAP_IRQ(13), IDI48_REGMAP_IRQ(14), /* 12-1= 4 */ + IDI48_REGMAP_IRQ(15), IDI48_REGMAP_IRQ(16), IDI48_REGMAP_IRQ(17), /* 15-1= 7 */ + IDI48_REGMAP_IRQ(18), IDI48_REGMAP_IRQ(19), IDI48_REGMAP_IRQ(20), /* 18-2= 0 */ + IDI48_REGMAP_IRQ(21), IDI48_REGMAP_IRQ(22), IDI48_REGMAP_IRQ(23), /* 21-2= 3 */ + IDI48_REGMAP_IRQ(24), IDI48_REGMAP_IRQ(25), IDI48_REGMAP_IRQ(26), /* 24-2= 6 */ + IDI48_REGMAP_IRQ(27), IDI48_REGMAP_IRQ(28), IDI48_REGMAP_IRQ(29), /* 27-2= 9 */ + IDI48_REGMAP_IRQ(30), IDI48_REGMAP_IRQ(31), IDI48_REGMAP_IRQ(32), /* 30-3= 2 */ + IDI48_REGMAP_IRQ(33), IDI48_REGMAP_IRQ(34), IDI48_REGMAP_IRQ(35), /* 33-3= 5 */ + IDI48_REGMAP_IRQ(36), IDI48_REGMAP_IRQ(37), IDI48_REGMAP_IRQ(38), /* 36-3= 8 */ + IDI48_REGMAP_IRQ(39), IDI48_REGMAP_IRQ(40), IDI48_REGMAP_IRQ(41), /* 39-4= 1 */ + IDI48_REGMAP_IRQ(42), IDI48_REGMAP_IRQ(43), IDI48_REGMAP_IRQ(44), /* 42-4= 4 */ + IDI48_REGMAP_IRQ(45), IDI48_REGMAP_IRQ(46), IDI48_REGMAP_IRQ(47), /* 45-4= 7 */ +}; =20 -#define IDI48_NGPIO 48 static const char *idi48_names[IDI48_NGPIO] =3D { "Bit 0 A", "Bit 1 A", "Bit 2 A", "Bit 3 A", "Bit 4 A", "Bit 5 A", "Bit 6 A", "Bit 7 A", "Bit 8 A", "Bit 9 A", "Bit 10 A", "Bit 11 A", @@ -228,22 +164,14 @@ static const char *idi48_names[IDI48_NGPIO] =3D { "Bit 18 B", "Bit 19 B", "Bit 20 B", "Bit 21 B", "Bit 22 B", "Bit 23 B" }; =20 -static int idi_48_irq_init_hw(struct gpio_chip *gc) -{ - struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(gc); - - /* Disable IRQ by default */ - iowrite8(0, &idi48gpio->reg->irq); - ioread8(&idi48gpio->reg->irq); - - return 0; -} - static int idi_48_probe(struct device *dev, unsigned int id) { struct idi_48_gpio *idi48gpio; const char *const name =3D dev_name(dev); - struct gpio_irq_chip *girq; + void __iomem *regs; + struct regmap *map; + struct regmap_irq_chip *chip; + struct regmap_irq_chip_data *chip_data; int err; =20 idi48gpio =3D devm_kzalloc(dev, sizeof(*idi48gpio), GFP_KERNEL); @@ -256,9 +184,32 @@ static int idi_48_probe(struct device *dev, unsigned i= nt id) return -EBUSY; } =20 - idi48gpio->reg =3D devm_ioport_map(dev, base[id], IDI_48_EXTENT); - if (!idi48gpio->reg) + regs =3D devm_ioport_map(dev, base[id], IDI_48_EXTENT); + if (!regs) return -ENOMEM; + idi48gpio->reg =3D regs; + + map =3D devm_regmap_init_mmio(dev, regs, &idi48_regmap_config); + if (IS_ERR(map)) + return dev_err_probe(dev, PTR_ERR(map), + "Unable to initialize register map\n"); + + chip =3D devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); + if (!chip) + return -ENOMEM; + + chip->name =3D name; + chip->status_base =3D IDI48_IRQ_STATUS; + chip->unmask_base =3D IDI48_IRQ_ENABLE; + chip->clear_on_unmask =3D true; + chip->num_regs =3D 1; + chip->irqs =3D idi48_regmap_irqs; + chip->num_irqs =3D ARRAY_SIZE(idi48_regmap_irqs); + + err =3D devm_regmap_add_irq_chip(dev, map, irq[id], IRQF_SHARED, 0, chip, + &chip_data); + if (err) + return dev_err_probe(dev, err, "IRQ registration failed\n"); =20 idi48gpio->chip.label =3D name; idi48gpio->chip.parent =3D dev; @@ -271,32 +222,14 @@ static int idi_48_probe(struct device *dev, unsigned = int id) idi48gpio->chip.get =3D idi_48_gpio_get; idi48gpio->chip.get_multiple =3D idi_48_gpio_get_multiple; =20 - girq =3D &idi48gpio->chip.irq; - gpio_irq_chip_set_chip(girq, &idi_48_irqchip); - /* This will let us handle the parent IRQ in the driver */ - girq->parent_handler =3D NULL; - girq->num_parents =3D 0; - girq->parents =3D NULL; - girq->default_type =3D IRQ_TYPE_NONE; - girq->handler =3D handle_edge_irq; - girq->init_hw =3D idi_48_irq_init_hw; - - spin_lock_init(&idi48gpio->lock); - err =3D devm_gpiochip_add_data(dev, &idi48gpio->chip, idi48gpio); if (err) { dev_err(dev, "GPIO registering failed (%d)\n", err); return err; } =20 - err =3D devm_request_irq(dev, irq[id], idi_48_irq_handler, IRQF_SHARED, - name, idi48gpio); - if (err) { - dev_err(dev, "IRQ handler registering failed (%d)\n", err); - return err; - } - - return 0; + return gpiochip_irqchip_add_domain(&idi48gpio->chip, + regmap_irq_get_domain(chip_data)); } =20 static struct isa_driver idi_48_driver =3D { --=20 2.38.1 From nobody Sun May 12 10:53:54 2024 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 14DE6C4167B for ; Tue, 27 Dec 2022 14:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231899AbiL0Od1 (ORCPT ); Tue, 27 Dec 2022 09:33:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231751AbiL0Oct (ORCPT ); Tue, 27 Dec 2022 09:32:49 -0500 Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 143CAA47F for ; Tue, 27 Dec 2022 06:32:48 -0800 (PST) Received: by mail-oi1-x230.google.com with SMTP id o66so12544275oia.6 for ; Tue, 27 Dec 2022 06:32:48 -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=WNp7uGPW9jsY51/S2PIwAMe5JoUFVPui7ZQaf3/kblM=; b=MpJ7UksEgNqMArIicRBKncWVhZ3fUx23I+v+lt/iNBdbXZjQDZ/pDBuP0I41VdNCNs 2/zcOaU4p2hAyAP0C48qGV89sRLZR5fVBJ2LcZJ8CDVxeMMO95lUVZGTEK7LjcJMTXiO P3v5StHw7Hxwr0aYoUOk9jyo8L/p7BuymvALPchbyu3WMHvlJl7OmHGCr3/cCbQHfSfo 1rZRT5ifuxwoKu3VaDQNLVX1tTTVa5x1enqxuN9LOdZSdv0RPPLDg8D6ozUIwHLv121Z fo7VbVFTGwRXJeDKhZBhKgHNCUCqtvkeZg3mhmJ9lEwEYwzUhJb3nN1s/HlrZKULkDY7 gtGw== 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=WNp7uGPW9jsY51/S2PIwAMe5JoUFVPui7ZQaf3/kblM=; b=wfkMLWTAbZ9ddjFkKivrBF8PFK1BTAe4TfifhnRE8zj27z5OGVltHA0abWWWcNSJtX SVfYhosqKPD4iPGMoVo33qeOP/FJuPBNiMN8MaFjtYsyEBG6uYnqagw/xO3CKdKBnk8K SPaBNgR56RE+YZ9JGGtBMdNi29AntnTFcvqfInuo2C78PIB/EZOHUdUJpUJvvxXOWYz9 C6k8T5/4EHo+/RbOTSTzjA+vyMyJpafasZYAGtU3pfC84QLIvC7MN3pwIdBN9eplAwW8 rb6yQO6ECZhjYqEcMXEDh8FQqEOFAdPeVsdaIt/4MXYFWobVQhwRlG9fTXvW4yrd9+pi a7+w== X-Gm-Message-State: AFqh2kq/gQMrNtzYOksNkMTbooAfVwEm69CrWfglds92rXDj7r8kWu6t YInJ+bafeG4WOMJZp7Y6z39BCw== X-Google-Smtp-Source: AMrXdXsnKZngJL9r7cJVLTar4E9TmuVww7mUq92OtMTyQJVbMlCThQ6wH0M39D4D6QpB2VWSWUR2JA== X-Received: by 2002:a05:6808:1b12:b0:35a:463e:258d with SMTP id bx18-20020a0568081b1200b0035a463e258dmr11843405oib.5.1672151567386; Tue, 27 Dec 2022 06:32:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 06:32:47 -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 4/8] gpio: 104-idi-48: Migrate to gpio-regmap API Date: Tue, 27 Dec 2022 09:09:42 -0500 Message-Id: <1219e41557e5426e1486e56a5c9318bd3acc2f37.1672149007.git.william.gray@linaro.org> 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. Despite the underlying interface being based on i8255, it is simpler to use the gpio-regmap API directly because the 104-IDI-48 device features only input signals. Therefore, the dependence on the i8255 GPIO library is removed in this patch. Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: William Breathitt Gray --- drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-104-idi-48.c | 97 +++++++--------------------------- 2 files changed, 21 insertions(+), 78 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 30f9e3f48559..84316924574f 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -875,7 +875,7 @@ config GPIO_104_IDI_48 select REGMAP_MMIO select REGMAP_IRQ select GPIOLIB_IRQCHIP - select GPIO_I8255 + select GPIO_REGMAP help Enables GPIO support for the ACCES 104-IDI-48 family (104-IDI-48A, 104-IDI-48AC, 104-IDI-48B, 104-IDI-48BC). The base port addresses for diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c index f936e3e0ff12..ca2175b84e24 100644 --- a/drivers/gpio/gpio-104-idi-48.c +++ b/drivers/gpio/gpio-104-idi-48.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -20,10 +20,6 @@ #include #include =20 -#include "gpio-i8255.h" - -MODULE_IMPORT_NS(I8255); - #define IDI_48_EXTENT 8 #define MAX_NUM_IDI_48 max_num_isa_dev(IDI_48_EXTENT) =20 @@ -40,56 +36,17 @@ MODULE_PARM_DESC(irq, "ACCES 104-IDI-48 interrupt line = numbers"); #define IDI48_IRQ_STATUS 0x7 #define IDI48_IRQ_ENABLE IDI48_IRQ_STATUS =20 -/** - * struct idi_48_reg - device register structure - * @port0: Port 0 Inputs - * @unused: Unused - * @port1: Port 1 Inputs - * @irq: Read: IRQ Status Register/IRQ Clear - * Write: IRQ Enable/Disable - */ -struct idi_48_reg { - u8 port0[3]; - u8 unused; - u8 port1[3]; - u8 irq; -}; - -/** - * struct idi_48_gpio - GPIO device private data structure - * @chip: instance of the gpio_chip - * @reg: I/O address offset for the device registers - */ -struct idi_48_gpio { - struct gpio_chip chip; - struct idi_48_reg __iomem *reg; -}; - -static int idi_48_gpio_get_direction(struct gpio_chip *chip, unsigned int = offset) -{ - return GPIO_LINE_DIRECTION_IN; -} - -static int idi_48_gpio_direction_input(struct gpio_chip *chip, unsigned in= t offset) +static int idi_48_reg_mask_xlate(struct gpio_regmap *gpio, unsigned int ba= se, + unsigned int offset, unsigned int *reg, + unsigned int *mask) { - return 0; -} - -static int idi_48_gpio_get(struct gpio_chip *chip, unsigned int offset) -{ - struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(chip); - void __iomem *const ppi =3D idi48gpio->reg; + const unsigned int line =3D offset % 8; + const unsigned int stride =3D offset / 8; + const unsigned int port =3D (stride / 3) * 4; + const unsigned int port_stride =3D stride % 3; =20 - return i8255_get(ppi, offset); -} - -static int idi_48_gpio_get_multiple(struct gpio_chip *chip, unsigned long = *mask, - unsigned long *bits) -{ - struct idi_48_gpio *const idi48gpio =3D gpiochip_get_data(chip); - void __iomem *const ppi =3D idi48gpio->reg; - - i8255_get_multiple(ppi, mask, bits, chip->ngpio); + *reg =3D base + port + port_stride; + *mask =3D BIT(line); =20 return 0; } @@ -166,18 +123,14 @@ static const char *idi48_names[IDI48_NGPIO] =3D { =20 static int idi_48_probe(struct device *dev, unsigned int id) { - struct idi_48_gpio *idi48gpio; const char *const name =3D dev_name(dev); + struct gpio_regmap_config config =3D {}; void __iomem *regs; struct regmap *map; struct regmap_irq_chip *chip; struct regmap_irq_chip_data *chip_data; int err; =20 - idi48gpio =3D devm_kzalloc(dev, sizeof(*idi48gpio), GFP_KERNEL); - if (!idi48gpio) - return -ENOMEM; - if (!devm_request_region(dev, base[id], IDI_48_EXTENT, name)) { dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n", base[id], base[id] + IDI_48_EXTENT); @@ -187,7 +140,6 @@ static int idi_48_probe(struct device *dev, unsigned in= t id) regs =3D devm_ioport_map(dev, base[id], IDI_48_EXTENT); if (!regs) return -ENOMEM; - idi48gpio->reg =3D regs; =20 map =3D devm_regmap_init_mmio(dev, regs, &idi48_regmap_config); if (IS_ERR(map)) @@ -211,25 +163,16 @@ static int idi_48_probe(struct device *dev, unsigned = int id) if (err) return dev_err_probe(dev, err, "IRQ registration failed\n"); =20 - idi48gpio->chip.label =3D name; - idi48gpio->chip.parent =3D dev; - idi48gpio->chip.owner =3D THIS_MODULE; - idi48gpio->chip.base =3D -1; - idi48gpio->chip.ngpio =3D IDI48_NGPIO; - idi48gpio->chip.names =3D idi48_names; - idi48gpio->chip.get_direction =3D idi_48_gpio_get_direction; - idi48gpio->chip.direction_input =3D idi_48_gpio_direction_input; - idi48gpio->chip.get =3D idi_48_gpio_get; - idi48gpio->chip.get_multiple =3D idi_48_gpio_get_multiple; - - err =3D devm_gpiochip_add_data(dev, &idi48gpio->chip, idi48gpio); - if (err) { - dev_err(dev, "GPIO registering failed (%d)\n", err); - return err; - } + config.parent =3D dev; + config.regmap =3D map; + config.ngpio =3D IDI48_NGPIO; + config.names =3D idi48_names; + config.reg_dat_base =3D GPIO_REGMAP_ADDR(0x0); + config.ngpio_per_reg =3D 8; + config.reg_mask_xlate =3D idi_48_reg_mask_xlate; + config.irq_domain =3D regmap_irq_get_domain(chip_data); =20 - return gpiochip_irqchip_add_domain(&idi48gpio->chip, - regmap_irq_get_domain(chip_data)); + return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(dev, &config)); } =20 static struct isa_driver idi_48_driver =3D { --=20 2.38.1 From nobody Sun May 12 10:53:54 2024 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 2C8C9C53210 for ; Tue, 27 Dec 2022 14:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231962AbiL0Odb (ORCPT ); Tue, 27 Dec 2022 09:33:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231771AbiL0Oc6 (ORCPT ); Tue, 27 Dec 2022 09:32:58 -0500 Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36E25BCA7 for ; Tue, 27 Dec 2022 06:32:49 -0800 (PST) Received: by mail-oi1-x22b.google.com with SMTP id r11so12517036oie.13 for ; Tue, 27 Dec 2022 06:32:49 -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=1uRuu1UfJFMdmi1/wTADm7WY/0yQto4LnL2JRG710R4=; b=cifHAwixb58gkXHwFfWuc1fTdCr0qVcsv+K99JJmM7DaaYITTVIrJXa2KzjZT5yV93 lK4f/qbIpbNMOp3iDQHs5YHko2I4ztYesatH6MALukxDUnvweX5NGYrnMJGDtbxPqlrx ErdKDLLt0shuVSLXc8TeVbnZJis3GfRA7tGAu3/mXwzJ+YvKLbqZNtbjEsTJq5LzRvgb vlF7wsgl+Y1JYDW+cIwUzBox/rCbVeO5xHlZnVo9ZY8raSbdUtlbe8lvuu/sHDpW8Ixh V0xsUI1ifN++4I48DstIr1vZrlOJyaHerMxuoiavzSVncLcL1ovckK1NjMrCL2OgVQfH r/Ow== 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=1uRuu1UfJFMdmi1/wTADm7WY/0yQto4LnL2JRG710R4=; b=0Me2qQZ5KUGFeUkPBB/Pe1obkGuEMLW/Nxjb3SigXNxxelK0rb0SRW8dqa4W9rJmz9 H3m7uzaqo1cxTZlvhZEkN4jyLqeP+lpG/oQGGSn82xlYlzdRD+dDfNJDagb7YT4yf58l 1GG3NB77eSQzuRemxStBR8CM63J6qx4AxDUvrqEF0EccU1AxoZewB2PJWGUyLjrPRJVB o0ZjekUB+lr+b8ZGKy7nHoyBA50H1Vo6AMOOMYMpSDXCqMcNz3rAE+3QmBNhIlDFaUY0 KMfl3WAwGKXMxd83CVGnpNV+gmGkyp2Orwn5pqVnlbwKiHKdfqQ6b0dioWxhd5FhLEaG qDxw== X-Gm-Message-State: AFqh2krIOdAI349sonlIeshPkNHLvbgpiUKMg9HNdTeWTohrvlNaFpDa 7148zTOA4rcDUP99R9D+0ECNbQ== X-Google-Smtp-Source: AMrXdXscoPinLee4A+PsS9cfO9HtMkGd5TmIFMAxtu37W9tXUC1R0GLA9MZ3FjkLFxlNQTIVV4kpFg== X-Received: by 2002:aca:d841:0:b0:35c:29d0:fda5 with SMTP id p62-20020acad841000000b0035c29d0fda5mr9711902oig.59.1672151568438; Tue, 27 Dec 2022 06:32:48 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 06:32:48 -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 5/8] gpio: i8255: Migrate to gpio-regmap API Date: Tue, 27 Dec 2022 09:09:43 -0500 Message-Id: <85d221804aad710ee0eae96ef442c7a33865274f.1672149007.git.william.gray@linaro.org> 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. By leveraging the gpio-regmap API, the i8255 library is reduced to simply a devm_i8255_regmap_register() function, a configuration structure struct i8255_regmap_config, and a helper macro i8255_volatile_regmap_range() provided to simplify volatile PPI register hinting for the regmap. Legacy functions and code will be removed once all consumers have migrated to the new i8255 library interface. Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: William Breathitt Gray --- drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-i8255.c | 119 ++++++++++++++++++++++++++++++++++---- drivers/gpio/gpio-i8255.h | 28 +++++++++ 3 files changed, 136 insertions(+), 12 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 84316924574f..63acb9cb4c58 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -831,6 +831,7 @@ menu "Port-mapped I/O GPIO drivers" =20 config GPIO_I8255 tristate + select GPIO_REGMAP help Enables support for the i8255 interface library functions. The i8255 interface library provides functions to facilitate communication with diff --git a/drivers/gpio/gpio-i8255.c b/drivers/gpio/gpio-i8255.c index 9b97db418df1..9ecb2e9b97f9 100644 --- a/drivers/gpio/gpio-i8255.c +++ b/drivers/gpio/gpio-i8255.c @@ -4,23 +4,31 @@ * Copyright (C) 2022 William Breathitt Gray */ #include +#include #include #include +#include #include #include +#include #include #include =20 #include "gpio-i8255.h" =20 +#define I8255_NGPIO 24 +#define I8255_NGPIO_PER_REG 8 #define I8255_CONTROL_PORTC_LOWER_DIRECTION BIT(0) #define I8255_CONTROL_PORTB_DIRECTION BIT(1) #define I8255_CONTROL_PORTC_UPPER_DIRECTION BIT(3) #define I8255_CONTROL_PORTA_DIRECTION BIT(4) #define I8255_CONTROL_MODE_SET BIT(7) -#define I8255_PORTA 0 -#define I8255_PORTB 1 -#define I8255_PORTC 2 +#define I8255_PORTA 0x0 +#define I8255_PORTB 0x1 +#define I8255_PORTC 0x2 +#define I8255_CONTROL 0x3 +#define I8255_REG_DAT_BASE I8255_PORTA +#define I8255_REG_DIR_IN_BASE I8255_CONTROL =20 static int i8255_get_port(struct i8255 __iomem *const ppi, const unsigned long io_port, const unsigned long mask) @@ -31,20 +39,19 @@ static int i8255_get_port(struct i8255 __iomem *const p= pi, return ioread8(&ppi[bank].port[ppi_port]) & mask; } =20 -static u8 i8255_direction_mask(const unsigned long offset) +static int i8255_direction_mask(const unsigned int offset) { - const unsigned long port_offset =3D offset % 8; - const unsigned long io_port =3D offset / 8; - const unsigned long ppi_port =3D io_port % 3; + const unsigned int stride =3D offset / I8255_NGPIO_PER_REG; + const unsigned int line =3D offset % I8255_NGPIO_PER_REG; =20 - switch (ppi_port) { + switch (stride) { case I8255_PORTA: return I8255_CONTROL_PORTA_DIRECTION; case I8255_PORTB: return I8255_CONTROL_PORTB_DIRECTION; case I8255_PORTC: /* Port C can be configured by nibble */ - if (port_offset >=3D 4) + if (line >=3D 4) return I8255_CONTROL_PORTC_UPPER_DIRECTION; return I8255_CONTROL_PORTC_LOWER_DIRECTION; default: @@ -53,6 +60,49 @@ static u8 i8255_direction_mask(const unsigned long offse= t) } } =20 +static int i8255_ppi_init(struct regmap *const map, const unsigned int bas= e) +{ + int err; + + /* Configure all ports to MODE 0 output mode */ + err =3D regmap_write(map, base + I8255_CONTROL, I8255_CONTROL_MODE_SET); + if (err) + return err; + + /* Initialize all GPIO to output 0 */ + err =3D regmap_write(map, base + I8255_PORTA, 0x00); + if (err) + return err; + err =3D regmap_write(map, base + I8255_PORTB, 0x00); + if (err) + return err; + return regmap_write(map, base + I8255_PORTC, 0x00); +} + +static int i8255_reg_mask_xlate(struct gpio_regmap *gpio, unsigned int bas= e, + unsigned int offset, unsigned int *reg, + unsigned int *mask) +{ + const unsigned int ppi =3D offset / I8255_NGPIO; + const unsigned int ppi_offset =3D offset % I8255_NGPIO; + const unsigned int stride =3D ppi_offset / I8255_NGPIO_PER_REG; + const unsigned int line =3D ppi_offset % I8255_NGPIO_PER_REG; + + switch (base) { + case I8255_REG_DAT_BASE: + *reg =3D base + stride + ppi * 4; + *mask =3D BIT(line); + return 0; + case I8255_REG_DIR_IN_BASE: + *reg =3D base + ppi * 4; + *mask =3D i8255_direction_mask(ppi_offset); + return 0; + default: + /* Should never reach this path */ + return -EINVAL; + } +} + static void i8255_set_port(struct i8255 __iomem *const ppi, struct i8255_state *const state, const unsigned long io_port, @@ -93,7 +143,7 @@ void i8255_direction_input(struct i8255 __iomem *const p= pi, spin_lock_irqsave(&state[bank].lock, flags); =20 state[bank].control_state |=3D I8255_CONTROL_MODE_SET; - state[bank].control_state |=3D i8255_direction_mask(offset); + state[bank].control_state |=3D i8255_direction_mask(offset % 24); =20 iowrite8(state[bank].control_state, &ppi[bank].control); =20 @@ -125,7 +175,7 @@ void i8255_direction_output(struct i8255 __iomem *const= ppi, spin_lock_irqsave(&state[bank].lock, flags); =20 state[bank].control_state |=3D I8255_CONTROL_MODE_SET; - state[bank].control_state &=3D ~i8255_direction_mask(offset); + state[bank].control_state &=3D ~i8255_direction_mask(offset % 24); =20 iowrite8(state[bank].control_state, &ppi[bank].control); =20 @@ -165,7 +215,7 @@ int i8255_get_direction(const struct i8255_state *const= state, const unsigned long io_port =3D offset / 8; const unsigned long bank =3D io_port / 3; =20 - return !!(state[bank].control_state & i8255_direction_mask(offset)); + return !!(state[bank].control_state & i8255_direction_mask(offset % 24)); } EXPORT_SYMBOL_NS_GPL(i8255_get_direction, I8255); =20 @@ -282,6 +332,51 @@ void i8255_state_init(struct i8255_state *const state, } EXPORT_SYMBOL_NS_GPL(i8255_state_init, I8255); =20 +/** + * devm_i8255_regmap_register - Register an i8255 GPIO controller + * @dev: device that is registering this i8255 GPIO device + * @config: configuration for i8255_regmap_config + * + * Registers an Intel 8255 Programmable Peripheral Interface GPIO controll= er. + * Returns 0 on success and negative error number on failure. + */ +int devm_i8255_regmap_register(struct device *const dev, + const struct i8255_regmap_config *const config) +{ + struct gpio_regmap_config gpio_config =3D {0}; + unsigned long i; + int err; + + if (!config->parent) + return -EINVAL; + + if (!config->map) + return -EINVAL; + + if (!config->num_ppi) + return -EINVAL; + + for (i =3D 0; i < config->num_ppi; i++) { + err =3D i8255_ppi_init(config->map, i * 4); + if (err) + return err; + } + + gpio_config.parent =3D config->parent; + gpio_config.regmap =3D config->map; + gpio_config.ngpio =3D I8255_NGPIO * config->num_ppi; + gpio_config.names =3D config->names; + gpio_config.reg_dat_base =3D GPIO_REGMAP_ADDR(I8255_REG_DAT_BASE); + gpio_config.reg_set_base =3D GPIO_REGMAP_ADDR(I8255_REG_DAT_BASE); + gpio_config.reg_dir_in_base =3D GPIO_REGMAP_ADDR(I8255_REG_DIR_IN_BASE); + gpio_config.ngpio_per_reg =3D I8255_NGPIO_PER_REG; + gpio_config.irq_domain =3D config->domain; + gpio_config.reg_mask_xlate =3D i8255_reg_mask_xlate; + + return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(dev, &gpio_config)); +} +EXPORT_SYMBOL_NS_GPL(devm_i8255_regmap_register, I8255); + MODULE_AUTHOR("William Breathitt Gray"); MODULE_DESCRIPTION("Intel 8255 Programmable Peripheral Interface"); MODULE_LICENSE("GPL"); diff --git a/drivers/gpio/gpio-i8255.h b/drivers/gpio/gpio-i8255.h index d9084aae9446..3daa0b145890 100644 --- a/drivers/gpio/gpio-i8255.h +++ b/drivers/gpio/gpio-i8255.h @@ -26,6 +26,34 @@ struct i8255_state { u8 control_state; }; =20 +struct device; +struct irq_domain; +struct regmap; + +#define i8255_volatile_regmap_range(_base) regmap_reg_range(_base, _base += 0x2) + +/** + * struct i8255_regmap_config - Configuration for the register map of an i= 8255 + * @parent: parent device + * @map: regmap for the i8255 + * @num_ppi: number of i8255 Programmable Peripheral Interface + * @names: (optional) array of names for gpios + * @domain: (optional) IRQ domain if the controller is interrupt-capable + * + * Note: The regmap is expected to have cache enabled and i8255 control + * registers not marked as volatile. + */ +struct i8255_regmap_config { + struct device *parent; + struct regmap *map; + int num_ppi; + const char *const *names; + struct irq_domain *domain; +}; + +int devm_i8255_regmap_register(struct device *dev, + const struct i8255_regmap_config *config); + void i8255_direction_input(struct i8255 __iomem *ppi, struct i8255_state *= state, unsigned long offset); void i8255_direction_output(struct i8255 __iomem *ppi, --=20 2.38.1 From nobody Sun May 12 10:53:54 2024 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 3DD2AC4708E for ; Tue, 27 Dec 2022 14:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232000AbiL0Ode (ORCPT ); Tue, 27 Dec 2022 09:33:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231781AbiL0Oc6 (ORCPT ); Tue, 27 Dec 2022 09:32:58 -0500 Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D827CBCBA for ; Tue, 27 Dec 2022 06:32:49 -0800 (PST) Received: by mail-oi1-x230.google.com with SMTP id s186so12547219oia.5 for ; Tue, 27 Dec 2022 06:32:49 -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=hhPywnIu0oHq46vQgQ1v3uZDHE34LJl/8jn0V5hUOLk=; b=vmoMp0OzfWaG073gvBNXZoHaUT8xZAjxs0EW257xMxsE/BuyMVsMNd8tExuSv5T25m q5lhqgGwoi/wNKDF2fQUDZv3JQcLICo1WtvO5Xa8RUFqkG+0jG2kds5IQv+muvXmejAf fUtl5yzdnneUi/JI09CelbExNuxOY2qdWXhkoVXow+iVhzXjyWzFcZ+YTqroDc19JDvN oSD1SE73gRmqur/tYa4uUOd5UsEMALjAmoC1XhypH/gx+vZClrH7P6lXXDUs93ahn48l C5ly7CpGdwMOvGwswFBbytp5wGiBVFYAvIHF7WgsRA+JlkBqP63UneL82DodKweZhEf8 zEHA== 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=hhPywnIu0oHq46vQgQ1v3uZDHE34LJl/8jn0V5hUOLk=; b=2nlBs5ijwi/eqJDZ0wFtPYnLOpbsbRYlP5Us3q/ydsKu3X+nW/zlmZPd59HsS9AE7S gjWkz140QorDVM6oit/4PlkbsTFOpNIqmyOZJum571tG5g8eQgI0E7NQvIfT0umsji7i 2SShaL4QKAw6/UGr0mUxH7owIhatALcGQxgmoNjupllkGuUn5+syW36gI2NQb7lzfrcV rsYzJAnop4dBDLHVfo90H6D+8cQDBP3R5M3f6VErnqXP1AO83BjvPSKjy+BKUQjH+Rf4 jqblL52qUuIQaY0ZdIDncAF5tjfaTIK2DtaQv2Ux9jH+oKy+pNTCBUTBz79S6L2aSUjy zyfA== X-Gm-Message-State: AFqh2kpfKxkbPN+9fpOXjGtZkIWKEqCz0Jj6SDfLCQQcouLq6WhwoS7e 6zBrHNwcBvAQcLYSqB48gelEFw== X-Google-Smtp-Source: AMrXdXsvMx5pfrKgqtmJ7r34ccZpqKyL2UyRjyZ1bxuKYIfq58PznfRePNaE4GKCfqW0bgKX8OQo9w== X-Received: by 2002:a05:6808:2908:b0:35a:6f80:63c5 with SMTP id ev8-20020a056808290800b0035a6f8063c5mr9388884oib.2.1672151569422; Tue, 27 Dec 2022 06:32:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 06:32:49 -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 6/8] gpio: 104-dio-48e: Migrate to regmap API Date: Tue, 27 Dec 2022 09:09:44 -0500 Message-Id: <3749203f86a048ae6c0915ec793fafc9b3b3f739.1672149007.git.william.gray@linaro.org> 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 104-dio-48e 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/gpio-104-dio-48e.c | 137 ++------------------------------ 1 file changed, 7 insertions(+), 130 deletions(-) diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48= e.c index e053a4e46b27..a3846faf3780 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -42,90 +41,6 @@ MODULE_PARM_DESC(irq, "ACCES 104-DIO-48E interrupt line = numbers"); =20 #define DIO48E_NUM_PPI 2 =20 -/** - * struct dio48e_reg - device register structure - * @ppi: Programmable Peripheral Interface groups - */ -struct dio48e_reg { - struct i8255 ppi[DIO48E_NUM_PPI]; -}; - -/** - * struct dio48e_gpio - GPIO device private data structure - * @chip: instance of the gpio_chip - * @ppi_state: PPI device states - * @reg: I/O address offset for the device registers - */ -struct dio48e_gpio { - struct gpio_chip chip; - struct i8255_state ppi_state[DIO48E_NUM_PPI]; - struct dio48e_reg __iomem *reg; -}; - -static int dio48e_gpio_get_direction(struct gpio_chip *chip, unsigned int = offset) -{ - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - - if (i8255_get_direction(dio48egpio->ppi_state, offset)) - return GPIO_LINE_DIRECTION_IN; - - return GPIO_LINE_DIRECTION_OUT; -} - -static int dio48e_gpio_direction_input(struct gpio_chip *chip, unsigned in= t offset) -{ - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - - i8255_direction_input(dio48egpio->reg->ppi, dio48egpio->ppi_state, - offset); - - return 0; -} - -static int dio48e_gpio_direction_output(struct gpio_chip *chip, unsigned i= nt offset, - int value) -{ - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - - i8255_direction_output(dio48egpio->reg->ppi, dio48egpio->ppi_state, - offset, value); - - return 0; -} - -static int dio48e_gpio_get(struct gpio_chip *chip, unsigned int offset) -{ - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - - return i8255_get(dio48egpio->reg->ppi, offset); -} - -static int dio48e_gpio_get_multiple(struct gpio_chip *chip, unsigned long = *mask, - unsigned long *bits) -{ - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - - i8255_get_multiple(dio48egpio->reg->ppi, mask, bits, chip->ngpio); - - return 0; -} - -static void dio48e_gpio_set(struct gpio_chip *chip, unsigned int offset, i= nt value) -{ - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - - i8255_set(dio48egpio->reg->ppi, dio48egpio->ppi_state, offset, value); -} - -static void dio48e_gpio_set_multiple(struct gpio_chip *chip, - unsigned long *mask, unsigned long *bits) -{ - struct dio48e_gpio *const dio48egpio =3D gpiochip_get_data(chip); - - i8255_set_multiple(dio48egpio->reg->ppi, dio48egpio->ppi_state, mask, - bits, chip->ngpio); -} - static const struct regmap_range dio48e_wr_ranges[] =3D { regmap_reg_range(0x0, 0x9), regmap_reg_range(0xB, 0xB), regmap_reg_range(0xD, 0xD), regmap_reg_range(0xF, 0xF), @@ -245,25 +160,10 @@ static int dio48e_irq_init_hw(struct regmap *const ma= p) return regmap_read(map, DIO48E_DISABLE_INTERRUPT, &val); } =20 -static void dio48e_init_ppi(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 < DIO48E_NUM_PPI; i++) { - i8255_mode0_output(&ppi[i]); - i8255_set_multiple(&ppi[i], &ppi_state[i], &mask, &bits, ngpio); - } -} - static int dio48e_probe(struct device *dev, unsigned int id) { - struct dio48e_gpio *dio48egpio; const char *const name =3D dev_name(dev); + struct i8255_regmap_config config =3D {}; void __iomem *regs; struct regmap *map; int err; @@ -271,10 +171,6 @@ static int dio48e_probe(struct device *dev, unsigned i= nt id) unsigned int irq_mask; struct regmap_irq_chip_data *chip_data; =20 - dio48egpio =3D devm_kzalloc(dev, sizeof(*dio48egpio), GFP_KERNEL); - if (!dio48egpio) - return -ENOMEM; - if (!devm_request_region(dev, base[id], DIO48E_EXTENT, name)) { dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n", base[id], base[id] + DIO48E_EXTENT); @@ -284,7 +180,6 @@ static int dio48e_probe(struct device *dev, unsigned in= t id) regs =3D devm_ioport_map(dev, base[id], DIO48E_EXTENT); if (!regs) return -ENOMEM; - dio48egpio->reg =3D regs; =20 map =3D devm_regmap_init_mmio(dev, regs, &dio48e_regmap_config); if (IS_ERR(map)) @@ -321,31 +216,13 @@ static int dio48e_probe(struct device *dev, unsigned = int id) if (err) return dev_err_probe(dev, err, "IRQ registration failed\n"); =20 - dio48egpio->chip.label =3D name; - dio48egpio->chip.parent =3D dev; - dio48egpio->chip.owner =3D THIS_MODULE; - dio48egpio->chip.base =3D -1; - dio48egpio->chip.ngpio =3D DIO48E_NGPIO; - dio48egpio->chip.names =3D dio48e_names; - dio48egpio->chip.get_direction =3D dio48e_gpio_get_direction; - dio48egpio->chip.direction_input =3D dio48e_gpio_direction_input; - dio48egpio->chip.direction_output =3D dio48e_gpio_direction_output; - dio48egpio->chip.get =3D dio48e_gpio_get; - dio48egpio->chip.get_multiple =3D dio48e_gpio_get_multiple; - dio48egpio->chip.set =3D dio48e_gpio_set; - dio48egpio->chip.set_multiple =3D dio48e_gpio_set_multiple; - - i8255_state_init(dio48egpio->ppi_state, DIO48E_NUM_PPI); - dio48e_init_ppi(dio48egpio->reg->ppi, dio48egpio->ppi_state); - - err =3D devm_gpiochip_add_data(dev, &dio48egpio->chip, dio48egpio); - if (err) { - dev_err(dev, "GPIO registering failed (%d)\n", err); - return err; - } + config.parent =3D dev; + config.map =3D map; + config.num_ppi =3D DIO48E_NUM_PPI; + config.names =3D dio48e_names; + config.domain =3D regmap_irq_get_domain(chip_data); =20 - return gpiochip_irqchip_add_domain(&dio48egpio->chip, - regmap_irq_get_domain(chip_data)); + return devm_i8255_regmap_register(dev, &config); } =20 static struct isa_driver dio48e_driver =3D { --=20 2.38.1 From nobody Sun May 12 10:53:54 2024 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 From nobody Sun May 12 10:53:54 2024 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 62BF7C5479D for ; Tue, 27 Dec 2022 14:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232174AbiL0Odn (ORCPT ); Tue, 27 Dec 2022 09:33:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231793AbiL0Oc6 (ORCPT ); Tue, 27 Dec 2022 09:32:58 -0500 Received: from mail-oi1-x229.google.com (mail-oi1-x229.google.com [IPv6:2607:f8b0:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F148BCB5 for ; Tue, 27 Dec 2022 06:32:52 -0800 (PST) Received: by mail-oi1-x229.google.com with SMTP id n8so5773970oih.0 for ; Tue, 27 Dec 2022 06:32:52 -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=dIOIvFeXi/+DuXzCtwKMgaypAC1l5I+Malp46WLaEVA=; b=CsVgnU2DVIEIntrf7AY2Np2X9Pj0NAFY1uGKUimSuwTRNnzMTPxEbwphmZaPc4DRQw 14YpcWPGiVkB3fGb33TEuU71CsQr1Q38CJYp8hkcEvYvZ41BEa+auDeq8x6BvQ+qHtYb FiwrRjgTxrMR1SAwmwgxhFsXao1tnxCVA5yhzegUFCvOEvpz5LnuGbr8wsD3tiSr3Rlo 8c16L5dnAzFNRTgj0C3NrM66XIjPYO4Ui7re2CbWN6m5oTFw+A4n7v7UmYiH0+sE2rmh XYSdWZYLWbRd+lkkg2VDSrvsJ3UcsEb6ffSSreLV3+jTgQaQw51e6/uuCMJk4jTqnMvi +6kw== 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=dIOIvFeXi/+DuXzCtwKMgaypAC1l5I+Malp46WLaEVA=; b=iybsIPGtcbpeP20vlaXno0tMTaAmEnDbBHUGcNcvrQ0pmCaQpp/VMvPD7dispKT7Uu /B+l1KPd6NpU5sSpy2vCyvLVcFsKo6Kxu7UukCX866rXVfr71vL+QlwoP7vnl3ABd+9W CxkK3OyBjcQ5aFmJw/NIvii+NTr6fDhvNFIQJqxTB4uK9/RqHj8P1fCaYbgaqcZwXzWQ x6NjF68hT0Li9DOWVCV8yKRkBebI296whLOiJnuGpcrW1zlM/L1U4rRVGCK/0RfKzJb6 UDSIpklBxZIIxmCCO6gQCHb4FLzTlkd9iFsCzHJ6nGrYh9FIlsLoYLrgYhfIkQWVxVru Aupg== X-Gm-Message-State: AFqh2kppHDRl+Xsxb8pE36yZPQv0GVcNBEF0mrZ1OCLzIILhl2wiJbnu N8ey0hFUVl+GxA6p0Xs839xmgg== X-Google-Smtp-Source: AMrXdXtFuj/FYrA/V3WZhmWnjQlmCRIjJXgbqBGIYAy07uKw++DL8vJqE4a1RRY0tCs5wP8WgigwNg== X-Received: by 2002:a05:6808:2019:b0:35b:ba66:276a with SMTP id q25-20020a056808201900b0035bba66276amr13865335oiw.47.1672151571646; Tue, 27 Dec 2022 06:32:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 06:32:51 -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 8/8] gpio: i8255: Remove unused legacy interface Date: Tue, 27 Dec 2022 09:09:46 -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" All i8255 library consumers have migrated to the new interface leveraging the gpio-regmap API. Legacy interface functions and code are removed as no longer needed. Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: William Breathitt Gray --- drivers/gpio/gpio-i8255.c | 243 +------------------------------------- drivers/gpio/gpio-i8255.h | 40 ------- 2 files changed, 1 insertion(+), 282 deletions(-) diff --git a/drivers/gpio/gpio-i8255.c b/drivers/gpio/gpio-i8255.c index 9ecb2e9b97f9..64ab80fc4a1e 100644 --- a/drivers/gpio/gpio-i8255.c +++ b/drivers/gpio/gpio-i8255.c @@ -3,16 +3,13 @@ * Intel 8255 Programmable Peripheral Interface * Copyright (C) 2022 William Breathitt Gray */ -#include +#include #include #include #include #include -#include #include #include -#include -#include =20 #include "gpio-i8255.h" =20 @@ -30,15 +27,6 @@ #define I8255_REG_DAT_BASE I8255_PORTA #define I8255_REG_DIR_IN_BASE I8255_CONTROL =20 -static int i8255_get_port(struct i8255 __iomem *const ppi, - const unsigned long io_port, const unsigned long mask) -{ - const unsigned long bank =3D io_port / 3; - const unsigned long ppi_port =3D io_port % 3; - - return ioread8(&ppi[bank].port[ppi_port]) & mask; -} - static int i8255_direction_mask(const unsigned int offset) { const unsigned int stride =3D offset / I8255_NGPIO_PER_REG; @@ -103,235 +91,6 @@ static int i8255_reg_mask_xlate(struct gpio_regmap *gp= io, unsigned int base, } } =20 -static void i8255_set_port(struct i8255 __iomem *const ppi, - struct i8255_state *const state, - const unsigned long io_port, - const unsigned long mask, const unsigned long bits) -{ - const unsigned long bank =3D io_port / 3; - const unsigned long ppi_port =3D io_port % 3; - unsigned long flags; - unsigned long out_state; - - spin_lock_irqsave(&state[bank].lock, flags); - - out_state =3D ioread8(&ppi[bank].port[ppi_port]); - out_state =3D (out_state & ~mask) | (bits & mask); - iowrite8(out_state, &ppi[bank].port[ppi_port]); - - spin_unlock_irqrestore(&state[bank].lock, flags); -} - -/** - * i8255_direction_input - configure signal offset as input - * @ppi: Intel 8255 Programmable Peripheral Interface banks - * @state: devices states of the respective PPI banks - * @offset: signal offset to configure as input - * - * Configures a signal @offset as input for the respective Intel 8255 - * Programmable Peripheral Interface (@ppi) banks. The @state control_state - * values are updated to reflect the new configuration. - */ -void i8255_direction_input(struct i8255 __iomem *const ppi, - struct i8255_state *const state, - const unsigned long offset) -{ - const unsigned long io_port =3D offset / 8; - const unsigned long bank =3D io_port / 3; - unsigned long flags; - - spin_lock_irqsave(&state[bank].lock, flags); - - state[bank].control_state |=3D I8255_CONTROL_MODE_SET; - state[bank].control_state |=3D i8255_direction_mask(offset % 24); - - iowrite8(state[bank].control_state, &ppi[bank].control); - - spin_unlock_irqrestore(&state[bank].lock, flags); -} -EXPORT_SYMBOL_NS_GPL(i8255_direction_input, I8255); - -/** - * i8255_direction_output - configure signal offset as output - * @ppi: Intel 8255 Programmable Peripheral Interface banks - * @state: devices states of the respective PPI banks - * @offset: signal offset to configure as output - * @value: signal value to output - * - * Configures a signal @offset as output for the respective Intel 8255 - * Programmable Peripheral Interface (@ppi) banks and sets the respective = signal - * output to the desired @value. The @state control_state values are updat= ed to - * reflect the new configuration. - */ -void i8255_direction_output(struct i8255 __iomem *const ppi, - struct i8255_state *const state, - const unsigned long offset, - const unsigned long value) -{ - const unsigned long io_port =3D offset / 8; - const unsigned long bank =3D io_port / 3; - unsigned long flags; - - spin_lock_irqsave(&state[bank].lock, flags); - - state[bank].control_state |=3D I8255_CONTROL_MODE_SET; - state[bank].control_state &=3D ~i8255_direction_mask(offset % 24); - - iowrite8(state[bank].control_state, &ppi[bank].control); - - spin_unlock_irqrestore(&state[bank].lock, flags); - - i8255_set(ppi, state, offset, value); -} -EXPORT_SYMBOL_NS_GPL(i8255_direction_output, I8255); - -/** - * i8255_get - get signal value at signal offset - * @ppi: Intel 8255 Programmable Peripheral Interface banks - * @offset: offset of signal to get - * - * Returns the signal value (0=3Dlow, 1=3Dhigh) for the signal at @offset = for the - * respective Intel 8255 Programmable Peripheral Interface (@ppi) banks. - */ -int i8255_get(struct i8255 __iomem *const ppi, const unsigned long offset) -{ - const unsigned long io_port =3D offset / 8; - const unsigned long offset_mask =3D BIT(offset % 8); - - return !!i8255_get_port(ppi, io_port, offset_mask); -} -EXPORT_SYMBOL_NS_GPL(i8255_get, I8255); - -/** - * i8255_get_direction - get the I/O direction for a signal offset - * @state: devices states of the respective PPI banks - * @offset: offset of signal to get direction - * - * Returns the signal direction (0=3Doutput, 1=3Dinput) for the signal at = @offset. - */ -int i8255_get_direction(const struct i8255_state *const state, - const unsigned long offset) -{ - const unsigned long io_port =3D offset / 8; - const unsigned long bank =3D io_port / 3; - - return !!(state[bank].control_state & i8255_direction_mask(offset % 24)); -} -EXPORT_SYMBOL_NS_GPL(i8255_get_direction, I8255); - -/** - * i8255_get_multiple - get multiple signal values at multiple signal offs= ets - * @ppi: Intel 8255 Programmable Peripheral Interface banks - * @mask: mask of signals to get - * @bits: bitmap to store signal values - * @ngpio: number of GPIO signals of the respective PPI banks - * - * Stores in @bits the values (0=3Dlow, 1=3Dhigh) for the signals defined = by @mask - * for the respective Intel 8255 Programmable Peripheral Interface (@ppi) = banks. - */ -void i8255_get_multiple(struct i8255 __iomem *const ppi, - const unsigned long *const mask, - unsigned long *const bits, const unsigned long ngpio) -{ - unsigned long offset; - unsigned long port_mask; - unsigned long io_port; - unsigned long port_state; - - bitmap_zero(bits, ngpio); - - for_each_set_clump8(offset, port_mask, mask, ngpio) { - io_port =3D offset / 8; - port_state =3D i8255_get_port(ppi, io_port, port_mask); - - bitmap_set_value8(bits, port_state, offset); - } -} -EXPORT_SYMBOL_NS_GPL(i8255_get_multiple, I8255); - -/** - * i8255_mode0_output - configure all PPI ports to MODE 0 output mode - * @ppi: Intel 8255 Programmable Peripheral Interface bank - * - * Configures all Intel 8255 Programmable Peripheral Interface (@ppi) port= s to - * MODE 0 (Basic Input/Output) output mode. - */ -void i8255_mode0_output(struct i8255 __iomem *const ppi) -{ - iowrite8(I8255_CONTROL_MODE_SET, &ppi->control); -} -EXPORT_SYMBOL_NS_GPL(i8255_mode0_output, I8255); - -/** - * i8255_set - set signal value at signal offset - * @ppi: Intel 8255 Programmable Peripheral Interface banks - * @state: devices states of the respective PPI banks - * @offset: offset of signal to set - * @value: value of signal to set - * - * Assigns output @value for the signal at @offset for the respective Inte= l 8255 - * Programmable Peripheral Interface (@ppi) banks. - */ -void i8255_set(struct i8255 __iomem *const ppi, struct i8255_state *const = state, - const unsigned long offset, const unsigned long value) -{ - const unsigned long io_port =3D offset / 8; - const unsigned long port_offset =3D offset % 8; - const unsigned long mask =3D BIT(port_offset); - const unsigned long bits =3D value << port_offset; - - i8255_set_port(ppi, state, io_port, mask, bits); -} -EXPORT_SYMBOL_NS_GPL(i8255_set, I8255); - -/** - * i8255_set_multiple - set signal values at multiple signal offsets - * @ppi: Intel 8255 Programmable Peripheral Interface banks - * @state: devices states of the respective PPI banks - * @mask: mask of signals to set - * @bits: bitmap of signal output values - * @ngpio: number of GPIO signals of the respective PPI banks - * - * Assigns output values defined by @bits for the signals defined by @mask= for - * the respective Intel 8255 Programmable Peripheral Interface (@ppi) bank= s. - */ -void i8255_set_multiple(struct i8255 __iomem *const ppi, - struct i8255_state *const state, - const unsigned long *const mask, - const unsigned long *const bits, - const unsigned long ngpio) -{ - unsigned long offset; - unsigned long port_mask; - unsigned long io_port; - unsigned long value; - - for_each_set_clump8(offset, port_mask, mask, ngpio) { - io_port =3D offset / 8; - value =3D bitmap_get_value8(bits, offset); - i8255_set_port(ppi, state, io_port, port_mask, value); - } -} -EXPORT_SYMBOL_NS_GPL(i8255_set_multiple, I8255); - -/** - * i8255_state_init - initialize i8255_state structure - * @state: devices states of the respective PPI banks - * @nbanks: number of Intel 8255 Programmable Peripheral Interface banks - * - * Initializes the @state of each Intel 8255 Programmable Peripheral Inter= face - * bank for use in i8255 library functions. - */ -void i8255_state_init(struct i8255_state *const state, - const unsigned long nbanks) -{ - unsigned long bank; - - for (bank =3D 0; bank < nbanks; bank++) - spin_lock_init(&state[bank].lock); -} -EXPORT_SYMBOL_NS_GPL(i8255_state_init, I8255); - /** * devm_i8255_regmap_register - Register an i8255 GPIO controller * @dev: device that is registering this i8255 GPIO device diff --git a/drivers/gpio/gpio-i8255.h b/drivers/gpio/gpio-i8255.h index 3daa0b145890..9dcf639b94df 100644 --- a/drivers/gpio/gpio-i8255.h +++ b/drivers/gpio/gpio-i8255.h @@ -3,29 +3,6 @@ #ifndef _I8255_H_ #define _I8255_H_ =20 -#include -#include - -/** - * struct i8255 - Intel 8255 register structure - * @port: Port A, B, and C - * @control: Control register - */ -struct i8255 { - u8 port[3]; - u8 control; -}; - -/** - * struct i8255_state - Intel 8255 state structure - * @lock: synchronization lock for accessing device state - * @control_state: Control register state - */ -struct i8255_state { - spinlock_t lock; - u8 control_state; -}; - struct device; struct irq_domain; struct regmap; @@ -54,21 +31,4 @@ struct i8255_regmap_config { int devm_i8255_regmap_register(struct device *dev, const struct i8255_regmap_config *config); =20 -void i8255_direction_input(struct i8255 __iomem *ppi, struct i8255_state *= state, - unsigned long offset); -void i8255_direction_output(struct i8255 __iomem *ppi, - struct i8255_state *state, unsigned long offset, - unsigned long value); -int i8255_get(struct i8255 __iomem *ppi, unsigned long offset); -int i8255_get_direction(const struct i8255_state *state, unsigned long off= set); -void i8255_get_multiple(struct i8255 __iomem *ppi, const unsigned long *ma= sk, - unsigned long *bits, unsigned long ngpio); -void i8255_mode0_output(struct i8255 __iomem *const ppi); -void i8255_set(struct i8255 __iomem *ppi, struct i8255_state *state, - unsigned long offset, unsigned long value); -void i8255_set_multiple(struct i8255 __iomem *ppi, struct i8255_state *sta= te, - const unsigned long *mask, const unsigned long *bits, - unsigned long ngpio); -void i8255_state_init(struct i8255_state *const state, unsigned long nbank= s); - #endif /* _I8255_H_ */ --=20 2.38.1