Commit 7efc0eb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char / miscdriver fixes from Greg KH:
 "Here is a small set of char/misc and IIO driver fixes for 6.8-rc5.

  Included in here are:

   - lots of iio driver fixes for reported issues

   - nvmem device naming fixup for reported problem

   - interconnect driver fixes for reported issues

  All of these have been in linux-next for a while with no reported the
  issues (the nvmem patch was included in a different branch in
  linux-next before sent to me for inclusion here)"

* tag 'char-misc-6.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (21 commits)
  nvmem: include bit index in cell sysfs file name
  iio: adc: ad4130: only set GPIO_CTRL if pin is unused
  iio: adc: ad4130: zero-initialize clock init data
  interconnect: qcom: x1e80100: Add missing ACV enable_mask
  interconnect: qcom: sm8650: Use correct ACV enable_mask
  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
  interconnect: qcom: sm8550: Enable sync_state
  ...
parents 4b2981b2 e20f378d

Documentation/ABI/testing/sysfs-nvmem-cells

+8 −8
Original line number Diff line number Diff line
@@ -4,18 +4,18 @@ KernelVersion: 6.5 
Contact:	Miquel Raynal <miquel.raynal@bootlin.com>

Description:

		The "cells" folder contains one file per cell exposed by the

		NVMEM device. The name of the file is: <name>@<where>, with

		<name> being the cell name and <where> its location in the NVMEM

		device, in hexadecimal (without the '0x' prefix, to mimic device

		tree node names). The length of the file is the size of the cell

		(when known). The content of the file is the binary content of

		the cell (may sometimes be ASCII, likely without trailing

		character).

		NVMEM device. The name of the file is: "<name>@<byte>,<bit>",

		with <name> being the cell name and <where> its location in

		the NVMEM device, in hexadecimal bytes and bits (without the

		'0x' prefix, to mimic device tree node names). The length of

		the file is the size of the cell (when known). The content of

		the file is the binary content of the cell (may sometimes be

		ASCII, likely without trailing character).

		Note: This file is only present if CONFIG_NVMEM_SYSFS

		is enabled.



		Example::



		  hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d

		  hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d,0

		  00000000  54 4e 34 38 4d 2d 50 2d  44 4e         |TN48M-P-DN|

		  0000000a

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) {