Commit 23d62fb5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-6.8a' of... 

Merge tag 'iio-fixes-for-6.8a' of http://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus

Jonathan writes:

IIO: 1st set of fixes for the 6.8 cycle

Usual mixed bag of issues introduced this cycle and fixes for long term
issues that have been identified recently + one case where I messed up
a merge resolution and dropped the build file changes.

Most important is the userspace ABI fix for the iio_modifier enum
where we accidentally added new entries in the middle rather than at
the end.

IIO Core
 - Close a memory leak in an error path.
 - Move LIGHT_UVA and LIGHT_UVB definitions to end of the iio_modifier
   enum to avoid breaking older userspace. (not yet in a released kernel
   thankfully).

adi,adis
 - Fix a DMA buffer alignment issue that was missing in series that fixed
   these across IIO.

adi,ad-sigma-delta
 - Fix a DMA buffer alignment issue that was missing in series that fixed
   these across IIO.

adi,ad4130
 - Zero init remaining fields of clock init data.
 - Only set GPIO control bits on pins that aren't in use for anything else.

adi,ad5933
 - Fix an old bug due to type mismatch. This is a rare device so good to
   get some new test coverage.

adi,ad7091r
 - Use right variable for an error return code.

bosch,bma400
 - Add missing CONFIG_REGMAP_I2C dependency.

bosch,bmp280:
 - Add missing bmp085 ID to the SPI table to avoid mismatch with the
   of_device_id table.

hid-sensors:
 - Avoid returning an error for timestamp read back that succeeds.

pni,rm3100
 - Check value read from RM31000_REG_TMRC register is valid before using
   it. Hardening  to avoid a real world issue seen on some faulty hardware.

st,st-sensors
 - Fix a DMA buffer alignment issue that was missing in series that fixed
   these across IIO.

ti,hdc3020
 - Add missing Kconfig and Makefile entrees accidentally dropped when patches
   were applied.
 - Fix wrong temperature offset (negated)

* tag 'iio-fixes-for-6.8a' of http://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
  iio: adc: ad4130: only set GPIO_CTRL if pin is unused
  iio: adc: ad4130: zero-initialize clock init data
  iio: accel: bma400: Fix a compilation problem
  iio: commom: st_sensors: ensure proper DMA alignment
  iio: hid-sensor-als: Return 0 for HID_USAGE_SENSOR_TIME_TIMESTAMP
  iio: move LIGHT_UVA and LIGHT_UVB to the end of iio_modifier
  staging: iio: ad5933: fix type mismatch regression
  iio: humidity: hdc3020: fix temperature offset
  iio: adc: ad7091r8: Fix error code in ad7091r8_gpio_setup()
  iio: adc: ad_sigma_delta: ensure proper DMA alignment
  iio: imu: adis: ensure proper DMA alignment
  iio: humidity: hdc3020: Add Makefile, Kconfig and MAINTAINERS entry
  iio: imu: bno055: serdev requires REGMAP
  iio: magnetometer: rm3100: add boundary check for the value read from RM3100_REG_TMRC
  iio: pressure: bmp280: Add missing bmp085 to SPI id table
  iio: core: fix memleak in iio_device_register_sysfs
parents 51c16100 78367c32

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -22010,6 +22010,14 @@ F: Documentation/devicetree/bindings/media/i2c/ti,ds90* 
F:	drivers/media/i2c/ds90*

F:	include/media/i2c/ds90*









TI HDC302X HUMIDITY DRIVER









M:	Javier Carrasco <javier.carrasco.cruz@gmail.com>









M:	Li peiyu <579lpy@gmail.com>









L:	linux-iio@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/iio/humidity/ti,hdc3020.yaml









F:	drivers/iio/humidity/hdc3020.c

















TI ICSSG ETHERNET DRIVER (ICSSG)









R:	MD Danish Anwar <danishanwar@ti.com>









R:	Roger Quadros <rogerq@kernel.org>

























drivers/iio/accel/Kconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -219,10 +219,12 @@ config BMA400

















config BMA400_I2C









	tristate









	select REGMAP_I2C









	depends on BMA400



















config BMA400_SPI









	tristate









	select REGMAP_SPI









	depends on BMA400



















config BMC150_ACCEL
































drivers/iio/adc/ad4130.c



+8
−4






























Original line number
Diff line number
Diff line







@@ -1821,7 +1821,7 @@ static int ad4130_setup_int_clk(struct ad4130_state *st)







{









	struct device *dev = &st->spi->dev;









	struct device_node *of_node = dev_of_node(dev);









	struct clk_init_data init;









	struct clk_init_data init = {};









	const char *clk_name;









	int ret;


















@@ -1891,10 +1891,14 @@ static int ad4130_setup(struct iio_dev *indio_dev)







		return ret;



















	/*









	 * Configure all GPIOs for output. If configured, the interrupt function









	 * of P2 takes priority over the GPIO out function.









	 * Configure unused GPIOs for output. If configured, the interrupt









	 * function of P2 takes priority over the GPIO out function.









	 */









	val =  AD4130_IO_CONTROL_GPIO_CTRL_MASK;









	val = 0;









	for (i = 0; i < AD4130_MAX_GPIOS; i++)









		if (st->pins_fn[i + AD4130_AIN2_P1] == AD4130_PIN_FN_NONE)









			val |= FIELD_PREP(AD4130_IO_CONTROL_GPIO_CTRL_MASK, BIT(i));



















	val |= FIELD_PREP(AD4130_IO_CONTROL_INT_PIN_SEL_MASK, st->int_pin_sel);



















	ret = regmap_write(st->regmap, AD4130_IO_CONTROL_REG, val);
































drivers/iio/adc/ad7091r8.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -195,7 +195,7 @@ static int ad7091r8_gpio_setup(struct ad7091r_state *st)







	st->reset_gpio = devm_gpiod_get_optional(st->dev, "reset",









						 GPIOD_OUT_HIGH);









	if (IS_ERR(st->reset_gpio))









		return dev_err_probe(st->dev, PTR_ERR(st->convst_gpio),









		return dev_err_probe(st->dev, PTR_ERR(st->reset_gpio),









				     "Error on requesting reset GPIO\n");



















	if (st->reset_gpio) {
































drivers/iio/humidity/Kconfig



+12
−0






























Original line number
Diff line number
Diff line







@@ -48,6 +48,18 @@ config HDC2010







	  To compile this driver as a module, choose M here: the module









	  will be called hdc2010.



















config HDC3020









	tristate "TI HDC3020 relative humidity and temperature sensor"









	depends on I2C









	select CRC8









	help









	  Say yes here to build support for the Texas Instruments









	  HDC3020, HDC3021 and HDC3022 relative humidity and temperature









	  sensors.



















	  To compile this driver as a module, choose M here: the module









	  will be called hdc3020.



















config HID_SENSOR_HUMIDITY









	tristate "HID Environmental humidity sensor"









	depends on HID_SENSOR_HUB