iio: stx104: Move to addac subdirectory
authorWilliam Breathitt Gray <william.gray@linaro.org>
Mon, 15 Aug 2022 22:29:21 +0000 (18:29 -0400)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 20 Aug 2022 12:09:38 +0000 (13:09 +0100)
The stx104 driver supports both ADC and DAC functionality.

Signed-off-by: William Breathitt Gray <william.gray@linaro.org>
Link: https://lore.kernel.org/r/20220815222921.138945-1-william.gray@linaro.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
MAINTAINERS
drivers/iio/adc/Kconfig
drivers/iio/adc/Makefile
drivers/iio/adc/stx104.c [deleted file]
drivers/iio/addac/Kconfig
drivers/iio/addac/Makefile
drivers/iio/addac/stx104.c [new file with mode: 0644]

index a88edf508003a88ee2546be57d3b24cd438f93f3..7dcae9243256392cf339097e6e8dfe757a2af573 100644 (file)
@@ -1374,7 +1374,7 @@ APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
 M:     William Breathitt Gray <william.gray@linaro.org>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
-F:     drivers/iio/adc/stx104.c
+F:     drivers/iio/addac/stx104.c
 
 APM DRIVER
 M:     Jiri Kosina <jikos@kernel.org>
index 5a3e8d9ae26c8056361f8252f968c6dca2b349e1..e3c2881ed23ab5c4ffa90b0ab79cbb9376a7d994 100644 (file)
@@ -1037,22 +1037,6 @@ config STMPE_ADC
          Say yes here to build support for ST Microelectronics STMPE
          built-in ADC block (stmpe811).
 
-config STX104
-       tristate "Apex Embedded Systems STX104 driver"
-       depends on PC104 && X86
-       select ISA_BUS_API
-       select GPIOLIB
-       help
-         Say yes here to build support for the Apex Embedded Systems STX104
-         integrated analog PC/104 card.
-
-         This driver supports the 16 channels of single-ended (8 channels of
-         differential) analog inputs, 2 channels of analog output, 4 digital
-         inputs, and 4 digital outputs provided by the STX104.
-
-         The base port addresses for the devices may be configured via the base
-         array module parameter.
-
 config SUN4I_GPADC
        tristate "Support for the Allwinner SoCs GPADC"
        depends on IIO
index c1a861a978ad152f36bf4ca58bfdab4ddc5203f0..ab084094263bb2f6a015c7eb17605bd5625d1f62 100644 (file)
@@ -89,7 +89,6 @@ obj-$(CONFIG_RICHTEK_RTQ6056) += rtq6056.o
 obj-$(CONFIG_RZG2L_ADC) += rzg2l_adc.o
 obj-$(CONFIG_SC27XX_ADC) += sc27xx_adc.o
 obj-$(CONFIG_SPEAR_ADC) += spear_adc.o
-obj-$(CONFIG_STX104) += stx104.o
 obj-$(CONFIG_SUN4I_GPADC) += sun4i-gpadc-iio.o
 obj-$(CONFIG_STM32_ADC_CORE) += stm32-adc-core.o
 obj-$(CONFIG_STM32_ADC) += stm32-adc.o
diff --git a/drivers/iio/adc/stx104.c b/drivers/iio/adc/stx104.c
deleted file mode 100644 (file)
index 48a91a9..0000000
+++ /dev/null
@@ -1,402 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * IIO driver for the Apex Embedded Systems STX104
- * Copyright (C) 2016 William Breathitt Gray
- */
-#include <linux/bitops.h>
-#include <linux/device.h>
-#include <linux/errno.h>
-#include <linux/gpio/driver.h>
-#include <linux/iio/iio.h>
-#include <linux/iio/types.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <linux/isa.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/spinlock.h>
-#include <linux/types.h>
-
-#define STX104_OUT_CHAN(chan) {                                \
-       .type = IIO_VOLTAGE,                            \
-       .channel = chan,                                \
-       .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
-       .indexed = 1,                                   \
-       .output = 1                                     \
-}
-#define STX104_IN_CHAN(chan, diff) {                                   \
-       .type = IIO_VOLTAGE,                                            \
-       .channel = chan,                                                \
-       .channel2 = chan,                                               \
-       .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_HARDWAREGAIN) |   \
-               BIT(IIO_CHAN_INFO_OFFSET) | BIT(IIO_CHAN_INFO_SCALE),   \
-       .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),                   \
-       .indexed = 1,                                                   \
-       .differential = diff                                            \
-}
-
-#define STX104_NUM_OUT_CHAN 2
-
-#define STX104_EXTENT 16
-
-static unsigned int base[max_num_isa_dev(STX104_EXTENT)];
-static unsigned int num_stx104;
-module_param_hw_array(base, uint, ioport, &num_stx104, 0);
-MODULE_PARM_DESC(base, "Apex Embedded Systems STX104 base addresses");
-
-/**
- * struct stx104_reg - device register structure
- * @ssr_ad:    Software Strobe Register and ADC Data
- * @achan:     ADC Channel
- * @dio:       Digital I/O
- * @dac:       DAC Channels
- * @cir_asr:   Clear Interrupts and ADC Status
- * @acr:       ADC Control
- * @pccr_fsh:  Pacer Clock Control and FIFO Status MSB
- * @acfg:      ADC Configuration
- */
-struct stx104_reg {
-       u16 ssr_ad;
-       u8 achan;
-       u8 dio;
-       u16 dac[2];
-       u8 cir_asr;
-       u8 acr;
-       u8 pccr_fsh;
-       u8 acfg;
-};
-
-/**
- * struct stx104_iio - IIO device private data structure
- * @chan_out_states:   channels' output states
- * @reg:               I/O address offset for the device registers
- */
-struct stx104_iio {
-       unsigned int chan_out_states[STX104_NUM_OUT_CHAN];
-       struct stx104_reg __iomem *reg;
-};
-
-/**
- * struct stx104_gpio - GPIO device private data structure
- * @chip:      instance of the gpio_chip
- * @lock:      synchronization lock to prevent I/O race conditions
- * @base:      base port address of the GPIO device
- * @out_state: output bits state
- */
-struct stx104_gpio {
-       struct gpio_chip chip;
-       spinlock_t lock;
-       u8 __iomem *base;
-       unsigned int out_state;
-};
-
-static int stx104_read_raw(struct iio_dev *indio_dev,
-       struct iio_chan_spec const *chan, int *val, int *val2, long mask)
-{
-       struct stx104_iio *const priv = iio_priv(indio_dev);
-       struct stx104_reg __iomem *const reg = priv->reg;
-       unsigned int adc_config;
-       int adbu;
-       int gain;
-
-       switch (mask) {
-       case IIO_CHAN_INFO_HARDWAREGAIN:
-               /* get gain configuration */
-               adc_config = ioread8(&reg->acfg);
-               gain = adc_config & 0x3;
-
-               *val = 1 << gain;
-               return IIO_VAL_INT;
-       case IIO_CHAN_INFO_RAW:
-               if (chan->output) {
-                       *val = priv->chan_out_states[chan->channel];
-                       return IIO_VAL_INT;
-               }
-
-               /* select ADC channel */
-               iowrite8(chan->channel | (chan->channel << 4), &reg->achan);
-
-               /* trigger ADC sample capture by writing to the 8-bit
-                * Software Strobe Register and wait for completion
-                */
-               iowrite8(0, &reg->ssr_ad);
-               while (ioread8(&reg->cir_asr) & BIT(7));
-
-               *val = ioread16(&reg->ssr_ad);
-               return IIO_VAL_INT;
-       case IIO_CHAN_INFO_OFFSET:
-               /* get ADC bipolar/unipolar configuration */
-               adc_config = ioread8(&reg->acfg);
-               adbu = !(adc_config & BIT(2));
-
-               *val = -32768 * adbu;
-               return IIO_VAL_INT;
-       case IIO_CHAN_INFO_SCALE:
-               /* get ADC bipolar/unipolar and gain configuration */
-               adc_config = ioread8(&reg->acfg);
-               adbu = !(adc_config & BIT(2));
-               gain = adc_config & 0x3;
-
-               *val = 5;
-               *val2 = 15 - adbu + gain;
-               return IIO_VAL_FRACTIONAL_LOG2;
-       }
-
-       return -EINVAL;
-}
-
-static int stx104_write_raw(struct iio_dev *indio_dev,
-       struct iio_chan_spec const *chan, int val, int val2, long mask)
-{
-       struct stx104_iio *const priv = iio_priv(indio_dev);
-
-       switch (mask) {
-       case IIO_CHAN_INFO_HARDWAREGAIN:
-               /* Only four gain states (x1, x2, x4, x8) */
-               switch (val) {
-               case 1:
-                       iowrite8(0, &priv->reg->acfg);
-                       break;
-               case 2:
-                       iowrite8(1, &priv->reg->acfg);
-                       break;
-               case 4:
-                       iowrite8(2, &priv->reg->acfg);
-                       break;
-               case 8:
-                       iowrite8(3, &priv->reg->acfg);
-                       break;
-               default:
-                       return -EINVAL;
-               }
-
-               return 0;
-       case IIO_CHAN_INFO_RAW:
-               if (chan->output) {
-                       /* DAC can only accept up to a 16-bit value */
-                       if ((unsigned int)val > 65535)
-                               return -EINVAL;
-
-                       priv->chan_out_states[chan->channel] = val;
-                       iowrite16(val, &priv->reg->dac[chan->channel]);
-
-                       return 0;
-               }
-               return -EINVAL;
-       }
-
-       return -EINVAL;
-}
-
-static const struct iio_info stx104_info = {
-       .read_raw = stx104_read_raw,
-       .write_raw = stx104_write_raw
-};
-
-/* single-ended input channels configuration */
-static const struct iio_chan_spec stx104_channels_sing[] = {
-       STX104_OUT_CHAN(0), STX104_OUT_CHAN(1),
-       STX104_IN_CHAN(0, 0), STX104_IN_CHAN(1, 0), STX104_IN_CHAN(2, 0),
-       STX104_IN_CHAN(3, 0), STX104_IN_CHAN(4, 0), STX104_IN_CHAN(5, 0),
-       STX104_IN_CHAN(6, 0), STX104_IN_CHAN(7, 0), STX104_IN_CHAN(8, 0),
-       STX104_IN_CHAN(9, 0), STX104_IN_CHAN(10, 0), STX104_IN_CHAN(11, 0),
-       STX104_IN_CHAN(12, 0), STX104_IN_CHAN(13, 0), STX104_IN_CHAN(14, 0),
-       STX104_IN_CHAN(15, 0)
-};
-/* differential input channels configuration */
-static const struct iio_chan_spec stx104_channels_diff[] = {
-       STX104_OUT_CHAN(0), STX104_OUT_CHAN(1),
-       STX104_IN_CHAN(0, 1), STX104_IN_CHAN(1, 1), STX104_IN_CHAN(2, 1),
-       STX104_IN_CHAN(3, 1), STX104_IN_CHAN(4, 1), STX104_IN_CHAN(5, 1),
-       STX104_IN_CHAN(6, 1), STX104_IN_CHAN(7, 1)
-};
-
-static int stx104_gpio_get_direction(struct gpio_chip *chip,
-       unsigned int offset)
-{
-       /* GPIO 0-3 are input only, while the rest are output only */
-       if (offset < 4)
-               return 1;
-
-       return 0;
-}
-
-static int stx104_gpio_direction_input(struct gpio_chip *chip,
-       unsigned int offset)
-{
-       if (offset >= 4)
-               return -EINVAL;
-
-       return 0;
-}
-
-static int stx104_gpio_direction_output(struct gpio_chip *chip,
-       unsigned int offset, int value)
-{
-       if (offset < 4)
-               return -EINVAL;
-
-       chip->set(chip, offset, value);
-       return 0;
-}
-
-static int stx104_gpio_get(struct gpio_chip *chip, unsigned int offset)
-{
-       struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
-
-       if (offset >= 4)
-               return -EINVAL;
-
-       return !!(ioread8(stx104gpio->base) & BIT(offset));
-}
-
-static int stx104_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,
-       unsigned long *bits)
-{
-       struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
-
-       *bits = ioread8(stx104gpio->base);
-
-       return 0;
-}
-
-static void stx104_gpio_set(struct gpio_chip *chip, unsigned int offset,
-       int value)
-{
-       struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
-       const unsigned int mask = BIT(offset) >> 4;
-       unsigned long flags;
-
-       if (offset < 4)
-               return;
-
-       spin_lock_irqsave(&stx104gpio->lock, flags);
-
-       if (value)
-               stx104gpio->out_state |= mask;
-       else
-               stx104gpio->out_state &= ~mask;
-
-       iowrite8(stx104gpio->out_state, stx104gpio->base);
-
-       spin_unlock_irqrestore(&stx104gpio->lock, flags);
-}
-
-#define STX104_NGPIO 8
-static const char *stx104_names[STX104_NGPIO] = {
-       "DIN0", "DIN1", "DIN2", "DIN3", "DOUT0", "DOUT1", "DOUT2", "DOUT3"
-};
-
-static void stx104_gpio_set_multiple(struct gpio_chip *chip,
-       unsigned long *mask, unsigned long *bits)
-{
-       struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
-       unsigned long flags;
-
-       /* verify masked GPIO are output */
-       if (!(*mask & 0xF0))
-               return;
-
-       *mask >>= 4;
-       *bits >>= 4;
-
-       spin_lock_irqsave(&stx104gpio->lock, flags);
-
-       stx104gpio->out_state &= ~*mask;
-       stx104gpio->out_state |= *mask & *bits;
-       iowrite8(stx104gpio->out_state, stx104gpio->base);
-
-       spin_unlock_irqrestore(&stx104gpio->lock, flags);
-}
-
-static int stx104_probe(struct device *dev, unsigned int id)
-{
-       struct iio_dev *indio_dev;
-       struct stx104_iio *priv;
-       struct stx104_gpio *stx104gpio;
-       int err;
-
-       indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
-       if (!indio_dev)
-               return -ENOMEM;
-
-       stx104gpio = devm_kzalloc(dev, sizeof(*stx104gpio), GFP_KERNEL);
-       if (!stx104gpio)
-               return -ENOMEM;
-
-       if (!devm_request_region(dev, base[id], STX104_EXTENT,
-               dev_name(dev))) {
-               dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
-                       base[id], base[id] + STX104_EXTENT);
-               return -EBUSY;
-       }
-
-       priv = iio_priv(indio_dev);
-       priv->reg = devm_ioport_map(dev, base[id], STX104_EXTENT);
-       if (!priv->reg)
-               return -ENOMEM;
-
-       indio_dev->info = &stx104_info;
-       indio_dev->modes = INDIO_DIRECT_MODE;
-
-       /* determine if differential inputs */
-       if (ioread8(&priv->reg->cir_asr) & BIT(5)) {
-               indio_dev->num_channels = ARRAY_SIZE(stx104_channels_diff);
-               indio_dev->channels = stx104_channels_diff;
-       } else {
-               indio_dev->num_channels = ARRAY_SIZE(stx104_channels_sing);
-               indio_dev->channels = stx104_channels_sing;
-       }
-
-       indio_dev->name = dev_name(dev);
-
-       /* configure device for software trigger operation */
-       iowrite8(0, &priv->reg->acr);
-
-       /* initialize gain setting to x1 */
-       iowrite8(0, &priv->reg->acfg);
-
-       /* initialize DAC output to 0V */
-       iowrite16(0, &priv->reg->dac[0]);
-       iowrite16(0, &priv->reg->dac[1]);
-
-       stx104gpio->chip.label = dev_name(dev);
-       stx104gpio->chip.parent = dev;
-       stx104gpio->chip.owner = THIS_MODULE;
-       stx104gpio->chip.base = -1;
-       stx104gpio->chip.ngpio = STX104_NGPIO;
-       stx104gpio->chip.names = stx104_names;
-       stx104gpio->chip.get_direction = stx104_gpio_get_direction;
-       stx104gpio->chip.direction_input = stx104_gpio_direction_input;
-       stx104gpio->chip.direction_output = stx104_gpio_direction_output;
-       stx104gpio->chip.get = stx104_gpio_get;
-       stx104gpio->chip.get_multiple = stx104_gpio_get_multiple;
-       stx104gpio->chip.set = stx104_gpio_set;
-       stx104gpio->chip.set_multiple = stx104_gpio_set_multiple;
-       stx104gpio->base = &priv->reg->dio;
-       stx104gpio->out_state = 0x0;
-
-       spin_lock_init(&stx104gpio->lock);
-
-       err = devm_gpiochip_add_data(dev, &stx104gpio->chip, stx104gpio);
-       if (err) {
-               dev_err(dev, "GPIO registering failed (%d)\n", err);
-               return err;
-       }
-
-       return devm_iio_device_register(dev, indio_dev);
-}
-
-static struct isa_driver stx104_driver = {
-       .probe = stx104_probe,
-       .driver = {
-               .name = "stx104"
-       },
-};
-
-module_isa_driver(stx104_driver, num_stx104);
-
-MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
-MODULE_DESCRIPTION("Apex Embedded Systems STX104 IIO driver");
-MODULE_LICENSE("GPL v2");
index 138492362f20974752a8b6eb1c50c55c07a0415a..fcf6d2269bfc25d9f497a25ef4ccf3ae5018e63a 100644 (file)
@@ -17,4 +17,20 @@ config AD74413R
          To compile this driver as a module, choose M here: the
          module will be called ad74413r.
 
+config STX104
+       tristate "Apex Embedded Systems STX104 driver"
+       depends on PC104 && X86
+       select ISA_BUS_API
+       select GPIOLIB
+       help
+         Say yes here to build support for the Apex Embedded Systems STX104
+         integrated analog PC/104 card.
+
+         This driver supports the 16 channels of single-ended (8 channels of
+         differential) analog inputs, 2 channels of analog output, 4 digital
+         inputs, and 4 digital outputs provided by the STX104.
+
+         The base port addresses for the devices may be configured via the base
+         array module parameter.
+
 endmenu
index cfd4bbe64ad3b506e3b4ccbf7cea239a540b6a2c..17de20ef0d8e9df868a33076b537e56f1ef2ee0f 100644 (file)
@@ -5,3 +5,4 @@
 
 # When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AD74413R) += ad74413r.o
+obj-$(CONFIG_STX104) += stx104.o
diff --git a/drivers/iio/addac/stx104.c b/drivers/iio/addac/stx104.c
new file mode 100644 (file)
index 0000000..48a91a9
--- /dev/null
@@ -0,0 +1,402 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * IIO driver for the Apex Embedded Systems STX104
+ * Copyright (C) 2016 William Breathitt Gray
+ */
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/gpio/driver.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/types.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/isa.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#define STX104_OUT_CHAN(chan) {                                \
+       .type = IIO_VOLTAGE,                            \
+       .channel = chan,                                \
+       .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),   \
+       .indexed = 1,                                   \
+       .output = 1                                     \
+}
+#define STX104_IN_CHAN(chan, diff) {                                   \
+       .type = IIO_VOLTAGE,                                            \
+       .channel = chan,                                                \
+       .channel2 = chan,                                               \
+       .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_HARDWAREGAIN) |   \
+               BIT(IIO_CHAN_INFO_OFFSET) | BIT(IIO_CHAN_INFO_SCALE),   \
+       .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),                   \
+       .indexed = 1,                                                   \
+       .differential = diff                                            \
+}
+
+#define STX104_NUM_OUT_CHAN 2
+
+#define STX104_EXTENT 16
+
+static unsigned int base[max_num_isa_dev(STX104_EXTENT)];
+static unsigned int num_stx104;
+module_param_hw_array(base, uint, ioport, &num_stx104, 0);
+MODULE_PARM_DESC(base, "Apex Embedded Systems STX104 base addresses");
+
+/**
+ * struct stx104_reg - device register structure
+ * @ssr_ad:    Software Strobe Register and ADC Data
+ * @achan:     ADC Channel
+ * @dio:       Digital I/O
+ * @dac:       DAC Channels
+ * @cir_asr:   Clear Interrupts and ADC Status
+ * @acr:       ADC Control
+ * @pccr_fsh:  Pacer Clock Control and FIFO Status MSB
+ * @acfg:      ADC Configuration
+ */
+struct stx104_reg {
+       u16 ssr_ad;
+       u8 achan;
+       u8 dio;
+       u16 dac[2];
+       u8 cir_asr;
+       u8 acr;
+       u8 pccr_fsh;
+       u8 acfg;
+};
+
+/**
+ * struct stx104_iio - IIO device private data structure
+ * @chan_out_states:   channels' output states
+ * @reg:               I/O address offset for the device registers
+ */
+struct stx104_iio {
+       unsigned int chan_out_states[STX104_NUM_OUT_CHAN];
+       struct stx104_reg __iomem *reg;
+};
+
+/**
+ * struct stx104_gpio - GPIO device private data structure
+ * @chip:      instance of the gpio_chip
+ * @lock:      synchronization lock to prevent I/O race conditions
+ * @base:      base port address of the GPIO device
+ * @out_state: output bits state
+ */
+struct stx104_gpio {
+       struct gpio_chip chip;
+       spinlock_t lock;
+       u8 __iomem *base;
+       unsigned int out_state;
+};
+
+static int stx104_read_raw(struct iio_dev *indio_dev,
+       struct iio_chan_spec const *chan, int *val, int *val2, long mask)
+{
+       struct stx104_iio *const priv = iio_priv(indio_dev);
+       struct stx104_reg __iomem *const reg = priv->reg;
+       unsigned int adc_config;
+       int adbu;
+       int gain;
+
+       switch (mask) {
+       case IIO_CHAN_INFO_HARDWAREGAIN:
+               /* get gain configuration */
+               adc_config = ioread8(&reg->acfg);
+               gain = adc_config & 0x3;
+
+               *val = 1 << gain;
+               return IIO_VAL_INT;
+       case IIO_CHAN_INFO_RAW:
+               if (chan->output) {
+                       *val = priv->chan_out_states[chan->channel];
+                       return IIO_VAL_INT;
+               }
+
+               /* select ADC channel */
+               iowrite8(chan->channel | (chan->channel << 4), &reg->achan);
+
+               /* trigger ADC sample capture by writing to the 8-bit
+                * Software Strobe Register and wait for completion
+                */
+               iowrite8(0, &reg->ssr_ad);
+               while (ioread8(&reg->cir_asr) & BIT(7));
+
+               *val = ioread16(&reg->ssr_ad);
+               return IIO_VAL_INT;
+       case IIO_CHAN_INFO_OFFSET:
+               /* get ADC bipolar/unipolar configuration */
+               adc_config = ioread8(&reg->acfg);
+               adbu = !(adc_config & BIT(2));
+
+               *val = -32768 * adbu;
+               return IIO_VAL_INT;
+       case IIO_CHAN_INFO_SCALE:
+               /* get ADC bipolar/unipolar and gain configuration */
+               adc_config = ioread8(&reg->acfg);
+               adbu = !(adc_config & BIT(2));
+               gain = adc_config & 0x3;
+
+               *val = 5;
+               *val2 = 15 - adbu + gain;
+               return IIO_VAL_FRACTIONAL_LOG2;
+       }
+
+       return -EINVAL;
+}
+
+static int stx104_write_raw(struct iio_dev *indio_dev,
+       struct iio_chan_spec const *chan, int val, int val2, long mask)
+{
+       struct stx104_iio *const priv = iio_priv(indio_dev);
+
+       switch (mask) {
+       case IIO_CHAN_INFO_HARDWAREGAIN:
+               /* Only four gain states (x1, x2, x4, x8) */
+               switch (val) {
+               case 1:
+                       iowrite8(0, &priv->reg->acfg);
+                       break;
+               case 2:
+                       iowrite8(1, &priv->reg->acfg);
+                       break;
+               case 4:
+                       iowrite8(2, &priv->reg->acfg);
+                       break;
+               case 8:
+                       iowrite8(3, &priv->reg->acfg);
+                       break;
+               default:
+                       return -EINVAL;
+               }
+
+               return 0;
+       case IIO_CHAN_INFO_RAW:
+               if (chan->output) {
+                       /* DAC can only accept up to a 16-bit value */
+                       if ((unsigned int)val > 65535)
+                               return -EINVAL;
+
+                       priv->chan_out_states[chan->channel] = val;
+                       iowrite16(val, &priv->reg->dac[chan->channel]);
+
+                       return 0;
+               }
+               return -EINVAL;
+       }
+
+       return -EINVAL;
+}
+
+static const struct iio_info stx104_info = {
+       .read_raw = stx104_read_raw,
+       .write_raw = stx104_write_raw
+};
+
+/* single-ended input channels configuration */
+static const struct iio_chan_spec stx104_channels_sing[] = {
+       STX104_OUT_CHAN(0), STX104_OUT_CHAN(1),
+       STX104_IN_CHAN(0, 0), STX104_IN_CHAN(1, 0), STX104_IN_CHAN(2, 0),
+       STX104_IN_CHAN(3, 0), STX104_IN_CHAN(4, 0), STX104_IN_CHAN(5, 0),
+       STX104_IN_CHAN(6, 0), STX104_IN_CHAN(7, 0), STX104_IN_CHAN(8, 0),
+       STX104_IN_CHAN(9, 0), STX104_IN_CHAN(10, 0), STX104_IN_CHAN(11, 0),
+       STX104_IN_CHAN(12, 0), STX104_IN_CHAN(13, 0), STX104_IN_CHAN(14, 0),
+       STX104_IN_CHAN(15, 0)
+};
+/* differential input channels configuration */
+static const struct iio_chan_spec stx104_channels_diff[] = {
+       STX104_OUT_CHAN(0), STX104_OUT_CHAN(1),
+       STX104_IN_CHAN(0, 1), STX104_IN_CHAN(1, 1), STX104_IN_CHAN(2, 1),
+       STX104_IN_CHAN(3, 1), STX104_IN_CHAN(4, 1), STX104_IN_CHAN(5, 1),
+       STX104_IN_CHAN(6, 1), STX104_IN_CHAN(7, 1)
+};
+
+static int stx104_gpio_get_direction(struct gpio_chip *chip,
+       unsigned int offset)
+{
+       /* GPIO 0-3 are input only, while the rest are output only */
+       if (offset < 4)
+               return 1;
+
+       return 0;
+}
+
+static int stx104_gpio_direction_input(struct gpio_chip *chip,
+       unsigned int offset)
+{
+       if (offset >= 4)
+               return -EINVAL;
+
+       return 0;
+}
+
+static int stx104_gpio_direction_output(struct gpio_chip *chip,
+       unsigned int offset, int value)
+{
+       if (offset < 4)
+               return -EINVAL;
+
+       chip->set(chip, offset, value);
+       return 0;
+}
+
+static int stx104_gpio_get(struct gpio_chip *chip, unsigned int offset)
+{
+       struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
+
+       if (offset >= 4)
+               return -EINVAL;
+
+       return !!(ioread8(stx104gpio->base) & BIT(offset));
+}
+
+static int stx104_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,
+       unsigned long *bits)
+{
+       struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
+
+       *bits = ioread8(stx104gpio->base);
+
+       return 0;
+}
+
+static void stx104_gpio_set(struct gpio_chip *chip, unsigned int offset,
+       int value)
+{
+       struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
+       const unsigned int mask = BIT(offset) >> 4;
+       unsigned long flags;
+
+       if (offset < 4)
+               return;
+
+       spin_lock_irqsave(&stx104gpio->lock, flags);
+
+       if (value)
+               stx104gpio->out_state |= mask;
+       else
+               stx104gpio->out_state &= ~mask;
+
+       iowrite8(stx104gpio->out_state, stx104gpio->base);
+
+       spin_unlock_irqrestore(&stx104gpio->lock, flags);
+}
+
+#define STX104_NGPIO 8
+static const char *stx104_names[STX104_NGPIO] = {
+       "DIN0", "DIN1", "DIN2", "DIN3", "DOUT0", "DOUT1", "DOUT2", "DOUT3"
+};
+
+static void stx104_gpio_set_multiple(struct gpio_chip *chip,
+       unsigned long *mask, unsigned long *bits)
+{
+       struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
+       unsigned long flags;
+
+       /* verify masked GPIO are output */
+       if (!(*mask & 0xF0))
+               return;
+
+       *mask >>= 4;
+       *bits >>= 4;
+
+       spin_lock_irqsave(&stx104gpio->lock, flags);
+
+       stx104gpio->out_state &= ~*mask;
+       stx104gpio->out_state |= *mask & *bits;
+       iowrite8(stx104gpio->out_state, stx104gpio->base);
+
+       spin_unlock_irqrestore(&stx104gpio->lock, flags);
+}
+
+static int stx104_probe(struct device *dev, unsigned int id)
+{
+       struct iio_dev *indio_dev;
+       struct stx104_iio *priv;
+       struct stx104_gpio *stx104gpio;
+       int err;
+
+       indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
+       if (!indio_dev)
+               return -ENOMEM;
+
+       stx104gpio = devm_kzalloc(dev, sizeof(*stx104gpio), GFP_KERNEL);
+       if (!stx104gpio)
+               return -ENOMEM;
+
+       if (!devm_request_region(dev, base[id], STX104_EXTENT,
+               dev_name(dev))) {
+               dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
+                       base[id], base[id] + STX104_EXTENT);
+               return -EBUSY;
+       }
+
+       priv = iio_priv(indio_dev);
+       priv->reg = devm_ioport_map(dev, base[id], STX104_EXTENT);
+       if (!priv->reg)
+               return -ENOMEM;
+
+       indio_dev->info = &stx104_info;
+       indio_dev->modes = INDIO_DIRECT_MODE;
+
+       /* determine if differential inputs */
+       if (ioread8(&priv->reg->cir_asr) & BIT(5)) {
+               indio_dev->num_channels = ARRAY_SIZE(stx104_channels_diff);
+               indio_dev->channels = stx104_channels_diff;
+       } else {
+               indio_dev->num_channels = ARRAY_SIZE(stx104_channels_sing);
+               indio_dev->channels = stx104_channels_sing;
+       }
+
+       indio_dev->name = dev_name(dev);
+
+       /* configure device for software trigger operation */
+       iowrite8(0, &priv->reg->acr);
+
+       /* initialize gain setting to x1 */
+       iowrite8(0, &priv->reg->acfg);
+
+       /* initialize DAC output to 0V */
+       iowrite16(0, &priv->reg->dac[0]);
+       iowrite16(0, &priv->reg->dac[1]);
+
+       stx104gpio->chip.label = dev_name(dev);
+       stx104gpio->chip.parent = dev;
+       stx104gpio->chip.owner = THIS_MODULE;
+       stx104gpio->chip.base = -1;
+       stx104gpio->chip.ngpio = STX104_NGPIO;
+       stx104gpio->chip.names = stx104_names;
+       stx104gpio->chip.get_direction = stx104_gpio_get_direction;
+       stx104gpio->chip.direction_input = stx104_gpio_direction_input;
+       stx104gpio->chip.direction_output = stx104_gpio_direction_output;
+       stx104gpio->chip.get = stx104_gpio_get;
+       stx104gpio->chip.get_multiple = stx104_gpio_get_multiple;
+       stx104gpio->chip.set = stx104_gpio_set;
+       stx104gpio->chip.set_multiple = stx104_gpio_set_multiple;
+       stx104gpio->base = &priv->reg->dio;
+       stx104gpio->out_state = 0x0;
+
+       spin_lock_init(&stx104gpio->lock);
+
+       err = devm_gpiochip_add_data(dev, &stx104gpio->chip, stx104gpio);
+       if (err) {
+               dev_err(dev, "GPIO registering failed (%d)\n", err);
+               return err;
+       }
+
+       return devm_iio_device_register(dev, indio_dev);
+}
+
+static struct isa_driver stx104_driver = {
+       .probe = stx104_probe,
+       .driver = {
+               .name = "stx104"
+       },
+};
+
+module_isa_driver(stx104_driver, num_stx104);
+
+MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
+MODULE_DESCRIPTION("Apex Embedded Systems STX104 IIO driver");
+MODULE_LICENSE("GPL v2");