Commit 6761f0ac authored Mar 14, 2018 by Greg Kroah-Hartman

Merge tag 'iio-for-4.17b' of...

Merge tag 'iio-for-4.17b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

Second set of new device support, features and cleanup for IIO in the 4.17 cycle

The uptick in staging cleanup is partly due to GSoC Applications
process being underway and one of Daniel's tasks being to try
cleaning up an IIO driver to move out of staging.
Naturally there is some normal staging cleanup progress in here
as well.

New device support
* Microchip mcp4018
- New driver supproting MCP4017, MCP4018 and MCP4019 digital pots.
* On Semiconductor lv0104cs
- New driver to support this ambient light sensor.

Cleanup
* axp20x_adc
- remove a !! in favour of clear ternary operator.
* ad2s1210 (staging cleanup)
- Reorganise to avoid ending a line with [
- Remove some unnecessary defines.
- Remove unsed variable.
* ad5380
- Replace magic 0 with IIO_CHAN_INFO_RAW
* ad5764
- Replace magic 0 with IIO_CHA_INFO_RAW
* ad7150 (staging cleanup)
- Align arguements with parenthesis.
* ad7152 (staging cleanup)
- Align arguements.
* ad7746 (staging cleanup)
- Align arguements.
* ad7816
- Remove pointless void pointer cast.
* ade7753
- Replace IIO_DEV_ATTR_CH_OFF with equivalent to avoid confusing
checkpatch (this macro didn't really help anyway). Also drop the
macro from the meter.h header.
* ade7754 (staging cleanup)
- Add names to funciton definition arguements.
- Align arguements with open parenthesis where possible.
* ade7758 (staging cleanup)
- Remove __func__ from dev_dbg statements as provided by dynamic
debug anyway.
- Align arguements with open parenthesis where possible.
* ade7759 (staging cleanup)
- Replace IIO_DEV_ATTR_CH_OFF with equiavalent to avoid confusing
checkpatch.
* adis16201 (staging cleanup)
- Headers in alphabetical order.
- Blank lines before returns.
* adis16209 (staging cleanup)
- Headers in alphabetical order
- Change some definition names to make them more meaningful (2 rounds
of this).
- Add explicit _REG prefix to register names to make them
obviously different from fields within those registers.
- Remove some superflous comments and group definitions better.
- Use a switch statement to make it semantically obvious that we
only have two options (rather than an unlimited 'else').
- Use sign_extent32 instead of open coding.
* adt7316 (staging cleanup)
- Move an export next to symbol.
* bmc150
- drop redundant __func__ in dynamic debug.
* ccs811
- Rename varaible to better reflect what it does.
* cros_ec
- Reduce sampling frequency before suspending to avoid preventing
suspend.
* dummy
- Correct whitespace in Kconfig.
- Add extra description in Kconfig.
* ds1803
- Remove a VLA which we always know is 2 long.
* hid-sensor-accel
- Replace magic number 0 by IIO_CHAN_INFO_RAW.
* hid-sensor-gyro
- Replace magic number 0 by IIO_CHAN_INFO_RAW.
* hid-sensor-light
- Replace magic number 0 by IIO_CHAN_INFO_RAW.
* hid-sensor-magn
- Replace magic number 0 by IIO_CHAN_INFO_RAW.
* lm3533
- Replace magic number 0 by IIO_CHAN_INFO_RAW
* mlx90632
- Squash a smatch warning - no runtime effect.
* stm32_dfsdm:
- Cleanup the dt bindings.
* sx9500
- Add GPIO ACPI mapping table to behave correctly when firmware
doesn't provide the mapping.
* tsl2x7x (staging cleanup)
- Fix the proximity sensor functionality.
- Remove platform data provided power functions. There are much
better ways to do this these days.
- Introduce some common functions to avoid various repititions.
- Stop using mutex_trylock when mutex_lock and wait a bit is fine.
- Improve error handling in various places.
- Drop some 'Camel case' (which wasn't actually strickly camel case
but was a bit odd.
- Drop some _available sysfs attributes for things that don't exist
(for particular supported parts).

parents fdff8622 9aa5134a

Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt

+6 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,10 @@ Optional properties:
		to "clock" property. Frequency must be a multiple of the rcc
		clock frequency. If not, SPI CLKOUT frequency will not be
		accurate.
		- pinctrl-names: Set to "default".
		- pinctrl-0: List of phandles pointing to pin configuration
		nodes to set pins in mode of operation for dfsdm
		on external pin.

		Contents of a STM32 DFSDM child nodes:
		--------------------------------------
		@@ -68,8 +72,8 @@ Optional properties:
		- st,adc-channel-types: Single-ended channel input type.
		- "SPI_R": SPI with data on rising edge (default)
		- "SPI_F": SPI with data on falling edge
		- "MANCH_R": manchester codec, rising edge = logic 0
		- "MANCH_F": manchester codec, falling edge = logic 1
		- "MANCH_R": manchester codec, rising edge = logic 0, falling edge = logic 1
		- "MANCH_F": manchester codec, rising edge = logic 1, falling edge = logic 0
		- st,adc-channel-clk-src: Conversion clock source.
		- "CLKIN": external SPI clock (CLKIN x)
		- "CLKOUT": internal SPI clock (CLKOUT) (default)

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -8585,11 +8585,12 @@ W: https://linuxtv.org
		S: Maintained
		F: drivers/media/radio/radio-maxiradio*

		MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER
		MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
		M: Peter Rosin <peda@axentia.se>
		L: linux-iio@vger.kernel.org
		S: Maintained
		F: Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
		F: drivers/iio/potentiometer/mcp4018.c
		F: drivers/iio/potentiometer/mcp4531.c

		MEASUREMENT COMPUTING CIO-DAC IIO DRIVER

drivers/iio/accel/bmc150-accel-core.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -336,8 +336,7 @@ static int bmc150_accel_update_slope(struct bmc150_accel_data *data)
		return ret;
		}

		dev_dbg(dev, "%s: %x %x\n", __func__, data->slope_thres,
		data->slope_dur);
		dev_dbg(dev, "%x %x\n", data->slope_thres, data->slope_dur);

		return ret;
		}
		@@ -1716,7 +1715,6 @@ static int bmc150_accel_runtime_suspend(struct device *dev)
		struct bmc150_accel_data *data = iio_priv(indio_dev);
		int ret;

		dev_dbg(dev, __func__);
		ret = bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_SUSPEND, 0);
		if (ret < 0)
		return -EAGAIN;
		@@ -1731,8 +1729,6 @@ static int bmc150_accel_runtime_resume(struct device *dev)
		int ret;
		int sleep_val;

		dev_dbg(dev, __func__);

		ret = bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_NORMAL, 0);
		if (ret < 0)
		return ret;

drivers/iio/accel/hid-sensor-accel-3d.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
		*val = 0;
		*val2 = 0;
		switch (mask) {
		case 0:
		case IIO_CHAN_INFO_RAW:
		hid_sensor_power_state(&accel_state->common_attributes, true);
		report_id = accel_state->accel[chan->scan_index].report_id;
		address = accel_3d_addresses[chan->scan_index];

drivers/iio/adc/axp20x_adc.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -445,7 +445,7 @@ static int axp20x_adc_offset_voltage(struct iio_dev *indio_dev, int channel,
		return -EINVAL;
		}

		val = !!(val) * 700000;
		val = val ? 700000 : 0;

		return IIO_VAL_INT;
		}
		@@ -542,15 +542,17 @@ static int axp20x_write_raw(struct iio_dev *indio_dev,
		if (val != 0 && val != 700000)
		return -EINVAL;

		val = val ? 1 : 0;

		switch (chan->channel) {
		case AXP20X_GPIO0_V:
		reg = AXP20X_GPIO10_IN_RANGE_GPIO0;
		regval = AXP20X_GPIO10_IN_RANGE_GPIO0_VAL(!!val);
		regval = AXP20X_GPIO10_IN_RANGE_GPIO0_VAL(val);
		break;

		case AXP20X_GPIO1_V:
		reg = AXP20X_GPIO10_IN_RANGE_GPIO1;
		regval = AXP20X_GPIO10_IN_RANGE_GPIO1_VAL(!!val);
		regval = AXP20X_GPIO10_IN_RANGE_GPIO1_VAL(val);
		break;

		default:

Admin message