History

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

Pull char / misc / IIO driver updates from Greg KH: "Here is the big set of char, misc, iio, and other smaller driver subsystems for 6.15-rc1. Lots of stuff in here, including: - loads of IIO changes and driver updates - counter driver updates - w1 driver updates - faux conversions for some drivers that were abusing the platform bus interface - coresight driver updates - rust miscdevice binding updates based on real-world-use - other minor driver updates All of these have been in linux-next with no reported issues for quite a while" * tag 'char-misc-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (292 commits) samples: rust_misc_device: fix markup in top-level docs Coresight: Fix a NULL vs IS_ERR() bug in probe misc: lis3lv02d: convert to use faux_device tlclk: convert to use faux_device regulator: dummy: convert to use the faux device interface bus: mhi: host: Fix race between unprepare and queue_buf coresight: configfs: Constify struct config_item_type doc: iio: ad7380: describe offload support iio: ad7380: add support for SPI offload iio: light: Add check for array bounds in veml6075_read_int_time_ms iio: adc: ti-ads7924 Drop unnecessary function parameters staging: iio: ad9834: Use devm_regulator_get_enable() staging: iio: ad9832: Use devm_regulator_get_enable() iio: gyro: bmg160_spi: add of_match_table dt-bindings: iio: adc: Add i.MX94 and i.MX95 support iio: adc: ad7768-1: remove unnecessary locking Documentation: ABI: add wideband filter type to sysfs-bus-iio iio: adc: ad7768-1: set MOSI idle state to prevent accidental reset iio: adc: ad7768-1: Fix conversion result sign iio: adc: ad7124: Benefit of dev = indio_dev->dev.parent in ad7124_parse_channel_config() ...

Linus Torvalds committed 1 year ago

Commit 25601e82 parents 2cd5769 5d1a5c4265 files · +19335 −4179Browse files

Showing the changes to include/uapi/linux (3 of 265 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/counter.h +2 −0
  2. include/uapi/linux/counter/microchip-tcb-capture.h +40 −0
  3. include/uapi/linux/iio/types.h +2 −0
include/uapi/linux/counter.h+2−0
@@ -65,6 +65,8 @@ enum counter_event_type { · 64 unmodified lines
65 COUNTER_EVENT_CHANGE_OF_STATE,65 COUNTER_EVENT_CHANGE_OF_STATE,
66 /* Count value captured */66 /* Count value captured */
67 COUNTER_EVENT_CAPTURE,67 COUNTER_EVENT_CAPTURE,
68 /* Direction change detected */
69 COUNTER_EVENT_DIRECTION_CHANGE,
68};70};
69 71
70/**72/**
include/uapi/linux/counter/microchip-tcb-capture.h+40−0
@@ -0,0 +1,40 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2/*
3 * Channel numbers used by the microchip-tcb-capture driver
4 * Copyright (C) 2025 Bence Csókás
5 */
6#ifndef _UAPI_COUNTER_MCHP_TCB_H_
7#define _UAPI_COUNTER_MCHP_TCB_H_
8
9/*
10 * The driver defines the following components:
11 *
12 * Count 0
13 * \__ Synapse 0 -- Signal 0 (Channel A, i.e. TIOA)
14 * \__ Synapse 1 -- Signal 1 (Channel B, i.e. TIOB)
15 * \__ Extension capture0 (RA register)
16 * \__ Extension capture1 (RB register)
17 *
18 * It also supports the following events:
19 *
20 * Channel 0:
21 * - CV register changed
22 * - CV overflowed
23 * - RA captured
24 * Channel 1:
25 * - RB captured
26 * Channel 2:
27 * - RC compare triggered
28 */
29
30/* Capture extensions */
31#define COUNTER_MCHP_EXCAP_RA 0
32#define COUNTER_MCHP_EXCAP_RB 1
33
34/* Event channels */
35#define COUNTER_MCHP_EVCHN_CV 0
36#define COUNTER_MCHP_EVCHN_RA 0
37#define COUNTER_MCHP_EVCHN_RB 1
38#define COUNTER_MCHP_EVCHN_RC 2
39
40#endif /* _UAPI_COUNTER_MCHP_TCB_H_ */
include/uapi/linux/iio/types.h+2−0
@@ -119,6 +119,7 @@ enum iio_event_type { · 118 unmodified lines
119 IIO_EV_TYPE_CHANGE,119 IIO_EV_TYPE_CHANGE,
120 IIO_EV_TYPE_MAG_REFERENCED,120 IIO_EV_TYPE_MAG_REFERENCED,
121 IIO_EV_TYPE_GESTURE,121 IIO_EV_TYPE_GESTURE,
122 IIO_EV_TYPE_FAULT,
122};123};
123 124
124enum iio_event_direction {125enum iio_event_direction {
@@ -128,6 +129,7 @@ enum iio_event_direction { · 3 unmodified lines
128 IIO_EV_DIR_NONE,129 IIO_EV_DIR_NONE,
129 IIO_EV_DIR_SINGLETAP,130 IIO_EV_DIR_SINGLETAP,
130 IIO_EV_DIR_DOUBLETAP,131 IIO_EV_DIR_DOUBLETAP,
132 IIO_EV_DIR_FAULT_OPENWIRE,
131};133};
132 134
133#endif /* _UAPI_IIO_TYPES_H_ */135#endif /* _UAPI_IIO_TYPES_H_ */