From patchwork Tue Oct 6 00:08:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 526604 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A6D67140082 for ; Tue, 6 Oct 2015 11:08:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Igv+vbpj; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751165AbbJFAIu (ORCPT ); Mon, 5 Oct 2015 20:08:50 -0400 Received: from mail-yk0-f170.google.com ([209.85.160.170]:33100 "EHLO mail-yk0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751159AbbJFAIt (ORCPT ); Mon, 5 Oct 2015 20:08:49 -0400 Received: by ykft14 with SMTP id t14so188206884ykf.0; Mon, 05 Oct 2015 17:08:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=p2/OXaFAfZUf5+zVAv72emfSmS2TKOejBeJFWZNVUME=; b=Igv+vbpjbWapSMUQM0jeQP+J1oMw/1DaZcHDSoejQT5yfOO209DyUMybUCd2amcFcO aSAHz9gCBAmHlaKSe5oIPqqL7ZMY7x4WyCqCP2w74mYaVA+cOGVCP9YCJhzqHyNf4w2v ubzbVeHxxSvY/BoaILR7c++xywUaR5KM1jPaHVzB6bY9kNAG/K1Htld1UJblXQraRdMX IRD4Zz/DBKrEs6q5TllkqjEvJhGM+TmxhbasUWaRU4dKIdm1f2BUmVCa7y81YW8Si2Yo DbbDY0xTgVnfbctJqZQEAnK+lFNRFsMi2x5kwKKFgMw5B5D24yOsPakcNsy7l/Tl6HoG eaew== X-Received: by 10.129.131.75 with SMTP id t72mr27737222ywf.157.1444090128905; Mon, 05 Oct 2015 17:08:48 -0700 (PDT) Received: from sophia (71-47-58-73.res.bhn.net. [71.47.58.73]) by smtp.gmail.com with ESMTPSA id f67sm20541066ywd.19.2015.10.05.17.08.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Oct 2015 17:08:48 -0700 (PDT) Date: Mon, 5 Oct 2015 20:08:41 -0400 From: William Breathitt Gray To: linus.walleij@linaro.org, gnurou@gmail.com Cc: bhelgaas@google.com, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org Subject: [PATCH v3] gpio: Add GPIO support for the ACCES 104-IDIO-16 Message-ID: <20151006000841.GA20844@sophia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The ACCES 104-IDIO-16 family of PC/104 utility boards feature 16 optically isolated inputs and 16 optically isolated FET solid state outputs. This driver provides GPIO support for these 32 channels of digital I/O. Change-of-State detection interrupts are not supported. GPIO 0-15 correspond to digital outputs 0-15, while GPIO 16-31 correspond to digital inputs 0-15. Signed-off-by: William Breathitt Gray --- Changes in v3: - Replace gpio.h include with gpio/driver.h since all needed relevant symbols and resources are within the latter - Rename struct a_104_idio_16 'data' member to the more apt and descriptive 'out_state' - Add kerneldoc for struct a_104_idio_16_gpio - Reorganize function definitions to eliminate need for forward declarations drivers/gpio/Kconfig | 15 ++++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-104-idio-16.c | 154 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+) create mode 100644 drivers/gpio/gpio-104-idio-16.c diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 8949b3f..70b63f1 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -684,6 +684,21 @@ config GPIO_SX150X endmenu +menu "ISA GPIO expanders" + +menuconfig GPIO_104_IDIO_16 + tristate "ACCES 104-IDIO-16 GPIO support" + depends on X86 + help + Enables GPIO support for the ACCES 104-IDIO-16 family. + +config 104_IDIO_16_BASE + hex "ACCES 104-IDIO-16 base address" + depends on GPIO_104_IDIO_16 + default 0x000 + +endmenu + menu "MFD GPIO expanders" config GPIO_ADP5520 diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index f79a7c4..6f2fea5 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_GPIO_ACPI) += gpiolib-acpi.o # Device drivers. Generally keep list sorted alphabetically obj-$(CONFIG_GPIO_GENERIC) += gpio-generic.o +obj-$(CONFIG_GPIO_104_IDIO_16) += gpio-104-idio-16.o obj-$(CONFIG_GPIO_74X164) += gpio-74x164.o obj-$(CONFIG_GPIO_74XX_MMIO) += gpio-74xx-mmio.o obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o diff --git a/drivers/gpio/gpio-104-idio-16.c b/drivers/gpio/gpio-104-idio-16.c new file mode 100644 index 0000000..f6b2afd --- /dev/null +++ b/drivers/gpio/gpio-104-idio-16.c @@ -0,0 +1,154 @@ +/* + * GPIO driver for the ACCES 104-IDIO-16 family + * Copyright (C) 2015 William Breathitt Gray + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + */ +#include +#include +#include +#include +#include +#include +#include + +/** + * struct a_104_idio_16_gpio - gpio device private data structure + * @chip: instance of the gpio_chip + * @lock: synchronization lock to prevent gpio_set race conditions + * @base: base port address of the GPIO device + * @out_state: output bits state + */ +struct a_104_idio_16_gpio { + struct gpio_chip chip; + spinlock_t lock; + unsigned base; + unsigned out_state; +}; + +static const unsigned A_104_IDIO_16_EXTENT = 8; + +static int a_104_idio_16_gpio_direction_input(struct gpio_chip *chip, + unsigned offset) +{ + return 0; +} + +static int a_104_idio_16_gpio_direction_output(struct gpio_chip *chip, + unsigned offset, int value) +{ + chip->set(chip, offset, value); + return 0; +} + +static struct a_104_idio_16_gpio *to_a104i16gp(struct gpio_chip *gc) +{ + return container_of(gc, struct a_104_idio_16_gpio, chip); +} + +static int a_104_idio_16_gpio_get(struct gpio_chip *chip, unsigned offset) +{ + struct a_104_idio_16_gpio *a104i16gp = to_a104i16gp(chip); + const unsigned BIT_MASK = 1U << (offset-16); + + if (offset < 16) + return 0; + + if (offset < 24) + return !!(inb(a104i16gp->base + 1) & BIT_MASK); + + return !!(inb(a104i16gp->base + 5) & (BIT_MASK>>8)); +} + +static void a_104_idio_16_gpio_set(struct gpio_chip *chip, unsigned offset, + int value) +{ + struct a_104_idio_16_gpio *a104i16gp = to_a104i16gp(chip); + const unsigned BIT_MASK = 1U << offset; + unsigned long flags; + + if (offset > 15) + return; + + spin_lock_irqsave(&a104i16gp->lock, flags); + + if (value) + a104i16gp->out_state |= BIT_MASK; + else + a104i16gp->out_state &= ~BIT_MASK; + + if (offset > 7) + outb(~a104i16gp->out_state >> 8, a104i16gp->base + 4); + else + outb(~a104i16gp->out_state, a104i16gp->base); + + spin_unlock_irqrestore(&a104i16gp->lock, flags); +} + +static struct a_104_idio_16_gpio gp = { + .chip = { + .label = "104-IDIO-16 GPIO", + .owner = THIS_MODULE, + .base = -1, + .ngpio = 32, + .direction_input = a_104_idio_16_gpio_direction_input, + .direction_output = a_104_idio_16_gpio_direction_output, + .get = a_104_idio_16_gpio_get, + .set = a_104_idio_16_gpio_set + }, + .base = CONFIG_104_IDIO_16_BASE +}; + +static void __exit a_104_idio_16_exit(void) +{ + pr_info("104-idio-16: Exiting 104-idio-16 module\n"); + + gpiochip_remove(&gp.chip); + release_region(CONFIG_104_IDIO_16_BASE, A_104_IDIO_16_EXTENT); +} + +static int __init a_104_idio_16_init(void) +{ + int err = 0; + + pr_info("104-idio-16: Initializing 104-idio-16 module\n"); + + if (!request_region(CONFIG_104_IDIO_16_BASE, A_104_IDIO_16_EXTENT, + "104-idio-16")) { + pr_err("104-idio-16: Unable to lock 104-idio-16 port addresses (0x%X-0x%X)\n", + CONFIG_104_IDIO_16_BASE, + CONFIG_104_IDIO_16_BASE + A_104_IDIO_16_EXTENT); + err = -EBUSY; + goto out_lock_a_104_idio_16_port; + } + + spin_lock_init(&gp.lock); + + pr_info("104-idio-16: 104-IDIO-16 GPIO detected\n"); + err = gpiochip_add(&gp.chip); + if (err) { + pr_err("104-idio-16: GPIO registering failed (%d)\n", err); + goto out_gpio_register; + } + + return 0; + +out_gpio_register: + release_region(CONFIG_104_IDIO_16_BASE, A_104_IDIO_16_EXTENT); +out_lock_a_104_idio_16_port: + return err; +} + +module_init(a_104_idio_16_init); +module_exit(a_104_idio_16_exit); + +MODULE_AUTHOR("William Breathitt Gray "); +MODULE_DESCRIPTION("ACCES 104-IDIO-16 GPIO driver"); +MODULE_LICENSE("GPL");