mirror of
https://github.com/torvalds/linux.git
synced 2026-04-19 23:34:00 -04:00
Jonathan writes:
1st set of IIO new device support, features and cleanups for the 6.4 cycle.
New device support
* bosch,bmp280
- Add support for BMP580 - includes significant refactoring and general
driver cleanup + support for non-volatile memory for trimming and config
parameters.
* rohm BU27034
- New driver for this 3 channel ambient light sensor.
- New support library for devices where both integration time and
amplifier gain are configurable. In these cases a scale change
may require changing bother underlying values. This library module
provides code to help with this.
* st,accel
- Add support for IIS328DQ (ID only as compatible wtih LIS331DL)
* st,lsm6dsx
- Add support for ASM330LHB automotive MEMS sensor.
* ti,ads1100, ads1000
- New driver for these 16 bit ADCs.
* ti,tmp117
- Add support for older tmp116 device. Includes some general driver cleanup.
Staging driver drops
* adi,ade7854
- Driver was a very long way from compliant with IIO infrastructure and ABI.
If anyone wants a non staging version of this driver they are better off
starting from scratch. Hence drop it and the associated meter.h header.
Features
* adi,ad7441r
- Add DT binding to set sink current for digital input.
* semtech,sx9324,9360
- Support older register mapping from firmware designed for windows.
Core improvements.
* Move iio_trigger_poll() docs to next to the implementation and add a note
on expected caller context.
* Rename iio_trigger_poll_chained() to iio_trigger_poll_nested() so
as to use more standard / common terminology.
* Improve main ABI docs references to offset and scale for raw values by
making them consistent and clear.
Cleanups and minor fixes:
* adi,ad5592r
- Add GPIO names - useful for debug.
* adi,ad7441r
- Fix current input, loop powered mode configuration setup.
* adi,adis16475
- Fix wrong commented value for minimum advised lower rate.
* adi,admv1013
- Use devm_clk_get_enabled() to reduce boilerplate.
* adi,ads1210
- Fix wrong bits for writing config register (late fix and has
been broken a long time so not rushed upstream)
* amlogic,meson-saradc
- Improve cleanup in error handling if BL30 handshake fails.
* apex-embedded,stx104
- Migrate to regmap and use regmap_read_poll_timeout() to neatly handle
retries.
- Add local mutex to close various races.
- Use define U16_MAX rather than value for limit.
- Improve code readability with minor reorganization.
* atmel,ad91-sama5d2
- Drop trivial dead code.
* kionix,kx022a
- Drop unused structure element.
* linear,ltc2983
- Reorganize bindings doc to enable unevaluatedProperties to be set
in one place for all child nodes.
- Make binding for adi,custom-thermocouple accept signed values.
* maxim,max44000
- Add OF Device matching (of_match_table was not correctly set).
* maxim,max5522
- Missing static
* measurement-computing,cio-dac
- Fix wrong part name in comments.
- Migrate to regmap.
- Improve includes by replacing bitops.h with more direct bits.h
* qcom,pm8xxx-xoadc
- Remove a check that can never fail.
* renesas,rcar-gyroadc
- DT binding documentation improvements.
- Tidy up an unused warning with __maybe_unused.
* semtech,sx_common
- Drop docs for a structure element that doesn't exist.
* semtech,sx9500
- Drop ACPI_PTR() and of_match_ptr() protections that just complicate
the code / block some firmware registration types that would otherwise
work.
* sensiron,sps30
- Comment formatting tidy up.
* st,sensors
- Drop duplicate text in DT binding.
* st,stm32-adc
- Add some missing static markings.
* ti,ads1100
- Use correct return code in dev_err_probe() call.
* x-powers,axp20x_adc - precursor series to simplify addition of AXP192.
- General code cleanup / minor refactoring for better readabilty of code.
- Switch from boolean value to mask for adc_en2 field to avoid hard coding
a mask that will be different in AXP192
* tag 'iio-for-6.4a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (63 commits)
MAINTAINERS: Add ROHM BU27034
iio: light: ROHM BU27034 Ambient Light Sensor
dt-bindings: iio: light: Support ROHM BU27034
MAINTAINERS: Add IIO gain-time-scale helpers
iio: light: Add gain-time-scale helpers
doc: Make sysfs-bus-iio doc more exact
iio: dac: set variable max5522_channels storage-class-specifier to static
dt-bindings: iio: temperature: ltc2983: Make 'adi,custom-thermocouple' signed
dt-bindings: iio: temperature: ltc2983: Fix child node unevaluated properties
iio: addac: stx104: Use regmap_read_poll_timeout() for conversion poll
iio: addac: stx104: Migrate to the regmap API
iio: addac: stx104: Improve indentation in stx104_write_raw()
iio: addac: stx104: Use define rather than hardcoded limit for write val
iio: addac: stx104: Fix race condition when converting analog-to-digital
iio: addac: stx104: Fix race condition for stx104_write_raw()
dt-bindings: iio: st-sensors: Fix repeated text
staging: iio: resolver: ads1210: fix config mode
iio: adc: ti-ads1100: fix error code in probe()
iio: accel: add support for IIS328DQ variant
dt-bindings: iio: st-sensors: Add IIS328DQ accelerometer
...
162 lines
4.2 KiB
C
162 lines
4.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* IIO driver for the Measurement Computing CIO-DAC
|
|
* Copyright (C) 2016 William Breathitt Gray
|
|
*
|
|
* This driver supports the following Measurement Computing devices: CIO-DAC16,
|
|
* CIO-DAC08, and PC104-DAC06.
|
|
*/
|
|
#include <linux/bits.h>
|
|
#include <linux/device.h>
|
|
#include <linux/err.h>
|
|
#include <linux/iio/iio.h>
|
|
#include <linux/iio/types.h>
|
|
#include <linux/isa.h>
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/types.h>
|
|
|
|
#define CIO_DAC_NUM_CHAN 16
|
|
|
|
#define CIO_DAC_CHAN(chan) { \
|
|
.type = IIO_VOLTAGE, \
|
|
.channel = chan, \
|
|
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
|
|
.indexed = 1, \
|
|
.output = 1 \
|
|
}
|
|
|
|
#define CIO_DAC_EXTENT 32
|
|
|
|
static unsigned int base[max_num_isa_dev(CIO_DAC_EXTENT)];
|
|
static unsigned int num_cio_dac;
|
|
module_param_hw_array(base, uint, ioport, &num_cio_dac, 0);
|
|
MODULE_PARM_DESC(base, "Measurement Computing CIO-DAC base addresses");
|
|
|
|
#define CIO_DAC_BASE 0x00
|
|
#define CIO_DAC_CHANNEL_STRIDE 2
|
|
|
|
static bool cio_dac_precious_reg(struct device *dev, unsigned int reg)
|
|
{
|
|
/*
|
|
* All registers are considered precious; if the XFER jumper is set on
|
|
* the device, then no update occurs until a DAC register is read.
|
|
*/
|
|
return true;
|
|
}
|
|
|
|
static const struct regmap_config cio_dac_regmap_config = {
|
|
.reg_bits = 16,
|
|
.reg_stride = 2,
|
|
.val_bits = 16,
|
|
.io_port = true,
|
|
.max_register = 0x1F,
|
|
.precious_reg = cio_dac_precious_reg,
|
|
};
|
|
|
|
/**
|
|
* struct cio_dac_iio - IIO device private data structure
|
|
* @map: Regmap for the device
|
|
*/
|
|
struct cio_dac_iio {
|
|
struct regmap *map;
|
|
};
|
|
|
|
static int cio_dac_read_raw(struct iio_dev *indio_dev,
|
|
struct iio_chan_spec const *chan, int *val, int *val2, long mask)
|
|
{
|
|
struct cio_dac_iio *const priv = iio_priv(indio_dev);
|
|
const unsigned int offset = chan->channel * CIO_DAC_CHANNEL_STRIDE;
|
|
int err;
|
|
unsigned int dac_val;
|
|
|
|
if (mask != IIO_CHAN_INFO_RAW)
|
|
return -EINVAL;
|
|
|
|
err = regmap_read(priv->map, CIO_DAC_BASE + offset, &dac_val);
|
|
if (err)
|
|
return err;
|
|
|
|
*val = dac_val;
|
|
|
|
return IIO_VAL_INT;
|
|
}
|
|
|
|
static int cio_dac_write_raw(struct iio_dev *indio_dev,
|
|
struct iio_chan_spec const *chan, int val, int val2, long mask)
|
|
{
|
|
struct cio_dac_iio *const priv = iio_priv(indio_dev);
|
|
const unsigned int offset = chan->channel * CIO_DAC_CHANNEL_STRIDE;
|
|
|
|
if (mask != IIO_CHAN_INFO_RAW)
|
|
return -EINVAL;
|
|
|
|
/* DAC can only accept up to a 12-bit value */
|
|
if ((unsigned int)val > 4095)
|
|
return -EINVAL;
|
|
|
|
return regmap_write(priv->map, CIO_DAC_BASE + offset, val);
|
|
}
|
|
|
|
static const struct iio_info cio_dac_info = {
|
|
.read_raw = cio_dac_read_raw,
|
|
.write_raw = cio_dac_write_raw
|
|
};
|
|
|
|
static const struct iio_chan_spec cio_dac_channels[CIO_DAC_NUM_CHAN] = {
|
|
CIO_DAC_CHAN(0), CIO_DAC_CHAN(1), CIO_DAC_CHAN(2), CIO_DAC_CHAN(3),
|
|
CIO_DAC_CHAN(4), CIO_DAC_CHAN(5), CIO_DAC_CHAN(6), CIO_DAC_CHAN(7),
|
|
CIO_DAC_CHAN(8), CIO_DAC_CHAN(9), CIO_DAC_CHAN(10), CIO_DAC_CHAN(11),
|
|
CIO_DAC_CHAN(12), CIO_DAC_CHAN(13), CIO_DAC_CHAN(14), CIO_DAC_CHAN(15)
|
|
};
|
|
|
|
static int cio_dac_probe(struct device *dev, unsigned int id)
|
|
{
|
|
struct iio_dev *indio_dev;
|
|
struct cio_dac_iio *priv;
|
|
void __iomem *regs;
|
|
|
|
indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
|
|
if (!indio_dev)
|
|
return -ENOMEM;
|
|
|
|
if (!devm_request_region(dev, base[id], CIO_DAC_EXTENT,
|
|
dev_name(dev))) {
|
|
dev_err(dev, "Unable to request port addresses (0x%X-0x%X)\n",
|
|
base[id], base[id] + CIO_DAC_EXTENT);
|
|
return -EBUSY;
|
|
}
|
|
|
|
regs = devm_ioport_map(dev, base[id], CIO_DAC_EXTENT);
|
|
if (!regs)
|
|
return -ENOMEM;
|
|
|
|
priv = iio_priv(indio_dev);
|
|
priv->map = devm_regmap_init_mmio(dev, regs, &cio_dac_regmap_config);
|
|
if (IS_ERR(priv->map))
|
|
return dev_err_probe(dev, PTR_ERR(priv->map),
|
|
"Unable to initialize register map\n");
|
|
|
|
indio_dev->info = &cio_dac_info;
|
|
indio_dev->modes = INDIO_DIRECT_MODE;
|
|
indio_dev->channels = cio_dac_channels;
|
|
indio_dev->num_channels = CIO_DAC_NUM_CHAN;
|
|
indio_dev->name = dev_name(dev);
|
|
|
|
return devm_iio_device_register(dev, indio_dev);
|
|
}
|
|
|
|
static struct isa_driver cio_dac_driver = {
|
|
.probe = cio_dac_probe,
|
|
.driver = {
|
|
.name = "cio-dac"
|
|
}
|
|
};
|
|
|
|
module_isa_driver(cio_dac_driver, num_cio_dac);
|
|
|
|
MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
|
|
MODULE_DESCRIPTION("Measurement Computing CIO-DAC IIO driver");
|
|
MODULE_LICENSE("GPL v2");
|