History

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 ...

Linus Torvalds committed 2 years ago

Commit 7efc0eb2 parents 4b2981b e20f37823 files · +73 −27Browse files

Showing the changes to include/uapi/linux (1 of 23 files). Show all

Unified · Split

include/uapi/linux/iio/types.h+2−2
@@ -91,8 +91,6 @@ enum iio_modifier { · 90 unmodified lines
9191 IIO_MOD_CO2,
9292 IIO_MOD_VOC,
9393 IIO_MOD_LIGHT_UV,
94− IIO_MOD_LIGHT_UVA,
95− IIO_MOD_LIGHT_UVB,
9694 IIO_MOD_LIGHT_DUV,
9795 IIO_MOD_PM1,
9896 IIO_MOD_PM2P5,
@@ -107,6 +105,8 @@ enum iio_modifier { · 8 unmodified lines
107105 IIO_MOD_PITCH,
108106 IIO_MOD_YAW,
109107 IIO_MOD_ROLL,
108+ IIO_MOD_LIGHT_UVA,
109+ IIO_MOD_LIGHT_UVB,
110110 };
111111
112112 enum iio_event_type {