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
...
This commit is contained in:
@@ -38,7 +38,7 @@ enum counter_scope {
|
||||
*
|
||||
* For example, if the Count 2 ceiling extension of Counter device 4 is desired,
|
||||
* set type equal to COUNTER_COMPONENT_EXTENSION, scope equal to
|
||||
* COUNTER_COUNT_SCOPE, parent equal to 2, and id equal to the value provided by
|
||||
* COUNTER_SCOPE_COUNT, parent equal to 2, and id equal to the value provided by
|
||||
* the respective /sys/bus/counter/devices/counter4/count2/ceiling_component_id
|
||||
* sysfs attribute.
|
||||
*/
|
||||
|
||||
@@ -47,6 +47,10 @@ enum iio_chan_type {
|
||||
IIO_POSITIONRELATIVE,
|
||||
IIO_PHASE,
|
||||
IIO_MASSCONCENTRATION,
|
||||
IIO_DELTA_ANGL,
|
||||
IIO_DELTA_VELOCITY,
|
||||
IIO_COLORTEMP,
|
||||
IIO_CHROMATICITY,
|
||||
};
|
||||
|
||||
enum iio_modifier {
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
* FW Client (given by UUID). This opens a communication channel
|
||||
* between a host client and a FW client. From this point every read and write
|
||||
* will communicate with the associated FW client.
|
||||
* Only in close() (file_operation release()) the communication between
|
||||
* the clients is disconnected
|
||||
* Only in close() (file_operation release()) is the communication between
|
||||
* the clients disconnected.
|
||||
*
|
||||
* The IOCTL argument is a struct with a union that contains
|
||||
* the input parameter and the output parameter for this IOCTL.
|
||||
@@ -51,7 +51,7 @@ struct mei_connect_client_data {
|
||||
* DOC: set and unset event notification for a connected client
|
||||
*
|
||||
* The IOCTL argument is 1 for enabling event notification and 0 for
|
||||
* disabling the service
|
||||
* disabling the service.
|
||||
* Return: -EOPNOTSUPP if the devices doesn't support the feature
|
||||
*/
|
||||
#define IOCTL_MEI_NOTIFY_SET _IOW('H', 0x02, __u32)
|
||||
@@ -59,8 +59,8 @@ struct mei_connect_client_data {
|
||||
/**
|
||||
* DOC: retrieve notification
|
||||
*
|
||||
* The IOCTL output argument is 1 if an event was is pending and 0 otherwise
|
||||
* the ioctl has to be called in order to acknowledge pending event
|
||||
* The IOCTL output argument is 1 if an event was pending and 0 otherwise.
|
||||
* The ioctl has to be called in order to acknowledge pending event.
|
||||
*
|
||||
* Return: -EOPNOTSUPP if the devices doesn't support the feature
|
||||
*/
|
||||
@@ -98,14 +98,14 @@ struct mei_connect_client_data_vtag {
|
||||
* FW Client (given by UUID), and virtual tag (vtag).
|
||||
* The IOCTL opens a communication channel between a host client and
|
||||
* a FW client on a tagged channel. From this point on, every read
|
||||
* and write will communicate with the associated FW client with
|
||||
* and write will communicate with the associated FW client
|
||||
* on the tagged channel.
|
||||
* Upone close() the communication is terminated.
|
||||
*
|
||||
* The IOCTL argument is a struct with a union that contains
|
||||
* the input parameter and the output parameter for this IOCTL.
|
||||
*
|
||||
* The input parameter is UUID of the FW Client, a vtag [0,255]
|
||||
* The input parameter is UUID of the FW Client, a vtag [0,255].
|
||||
* The output parameter is the properties of the FW client
|
||||
* (FW protocool version and max message size).
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user