History

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

Pull char/misc updates from Greg KH: "Here is the big set of char/misc and other small driver subsystem changes for 6.7-rc1. Included in here are: - IIO subsystem driver updates and additions (largest part of this pull request) - FPGA subsystem driver updates - Counter subsystem driver updates - ICC subsystem driver updates - extcon subsystem driver updates - mei driver updates and additions - nvmem subsystem driver updates and additions - comedi subsystem dependency fixes - parport driver fixups - cdx subsystem driver and core updates - splice support for /dev/zero and /dev/full - other smaller driver cleanups All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (326 commits) cdx: add sysfs for subsystem, class and revision cdx: add sysfs for bus reset cdx: add support for bus enable and disable cdx: Register cdx bus as a device on cdx subsystem cdx: Create symbol namespaces for cdx subsystem cdx: Introduce lock to protect controller ops cdx: Remove cdx controller list from cdx bus system dts: ti: k3-am625-beagleplay: Add beaglecc1352 greybus: Add BeaglePlay Linux Driver dt-bindings: net: Add ti,cc1352p7 dt-bindings: eeprom: at24: allow NVMEM cells based on old syntax dt-bindings: nvmem: SID: allow NVMEM cells based on old syntax Revert "nvmem: add new config option" MAINTAINERS: coresight: Add missing Coresight files misc: pci_endpoint_test: Add deviceID for J721S2 PCIe EP device support firmware: xilinx: Move EXPORT_SYMBOL_GPL next to zynqmp_pm_feature definition uacce: make uacce_class constant ocxl: make ocxl_class constant cxl: make cxl_class constant misc: phantom: make phantom_class constant ...

Linus Torvalds committed 3 years ago

Commit d99b91a2 parents e392ea4 fa10f41363 files · +13492 −3648Browse files

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

Unified · Split

3 files
  1. include/uapi/linux/counter.h +1 −1
  2. include/uapi/linux/iio/types.h +4 −0
  3. include/uapi/linux/mei.h +7 −7
include/uapi/linux/counter.h+1−1
@@ -38,7 +38,7 @@ enum counter_scope { · 37 unmodified lines
3838 *
3939 * For example, if the Count 2 ceiling extension of Counter device 4 is desired,
4040 * set type equal to COUNTER_COMPONENT_EXTENSION, scope equal to
41− * COUNTER_COUNT_SCOPE, parent equal to 2, and id equal to the value provided by
41+ * COUNTER_SCOPE_COUNT, parent equal to 2, and id equal to the value provided by
4242 * the respective /sys/bus/counter/devices/counter4/count2/ceiling_component_id
4343 * sysfs attribute.
4444 */
include/uapi/linux/iio/types.h+4−0
@@ -47,6 +47,10 @@ enum iio_chan_type { · 46 unmodified lines
4747 IIO_POSITIONRELATIVE,
4848 IIO_PHASE,
4949 IIO_MASSCONCENTRATION,
50+ IIO_DELTA_ANGL,
51+ IIO_DELTA_VELOCITY,
52+ IIO_COLORTEMP,
53+ IIO_CHROMATICITY,
5054 };
5155
5256 enum iio_modifier {
include/uapi/linux/mei.h+7−7
@@ -14,8 +14,8 @@ · 13 unmodified lines
1414 * FW Client (given by UUID). This opens a communication channel
1515 * between a host client and a FW client. From this point every read and write
1616 * will communicate with the associated FW client.
17− * Only in close() (file_operation release()) the communication between
18− * the clients is disconnected
17+ * Only in close() (file_operation release()) is the communication between
18+ * the clients disconnected.
1919 *
2020 * The IOCTL argument is a struct with a union that contains
2121 * the input parameter and the output parameter for this IOCTL.
@@ -51,7 +51,7 @@ struct mei_connect_client_data { · 29 unmodified lines
5151 * DOC: set and unset event notification for a connected client
5252 *
5353 * The IOCTL argument is 1 for enabling event notification and 0 for
54− * disabling the service
54+ * disabling the service.
5555 * Return: -EOPNOTSUPP if the devices doesn't support the feature
5656 */
5757 #define IOCTL_MEI_NOTIFY_SET _IOW('H', 0x02, __u32)
@@ -59,8 +59,8 @@ struct mei_connect_client_data { · 1 unmodified line
5959 /**
6060 * DOC: retrieve notification
6161 *
62− * The IOCTL output argument is 1 if an event was is pending and 0 otherwise
63− * the ioctl has to be called in order to acknowledge pending event
62+ * The IOCTL output argument is 1 if an event was pending and 0 otherwise.
63+ * The ioctl has to be called in order to acknowledge pending event.
6464 *
6565 * Return: -EOPNOTSUPP if the devices doesn't support the feature
6666 */
@@ -98,14 +98,14 @@ struct mei_connect_client_data_vtag { · 31 unmodified lines
9898 * FW Client (given by UUID), and virtual tag (vtag).
9999 * The IOCTL opens a communication channel between a host client and
100100 * a FW client on a tagged channel. From this point on, every read
101− * and write will communicate with the associated FW client with
101+ * and write will communicate with the associated FW client
102102 * on the tagged channel.
103103 * Upone close() the communication is terminated.
104104 *
105105 * The IOCTL argument is a struct with a union that contains
106106 * the input parameter and the output parameter for this IOCTL.
107107 *
108− * The input parameter is UUID of the FW Client, a vtag [0,255]
108+ * The input parameter is UUID of the FW Client, a vtag [0,255].
109109 * The output parameter is the properties of the FW client
110110 * (FW protocool version and max message size).
111111 *