Pull char/misc driver updates from Greg KH: "Here is the big char/misc driver pull request for 5.4-rc1. As has been happening in previous releases, more and more individual driver subsystem trees are ending up in here. Now if that is good or bad I can't tell, but hopefully it makes your life easier as it's more of an aggregation of trees together to one merge point for you. Anyway, lots of stuff in here: - habanalabs driver updates - thunderbolt driver updates - misc driver updates - coresight and intel_th hwtracing driver updates - fpga driver updates - extcon driver updates - some dma driver updates - char driver updates - android binder driver updates - nvmem driver updates - phy driver updates - parport driver fixes - pcmcia driver fix - uio driver updates - w1 driver updates - configfs fixes - other assorted driver updates All of these have been in linux-next for a long time with no reported issues" * tag 'char-misc-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (200 commits) misc: mic: Use PTR_ERR_OR_ZERO rather than its implementation habanalabs: correctly cast variable to __le32 habanalabs: show correct id in error print habanalabs: stop using the acronym KMD habanalabs: display card name as sensors header habanalabs: add uapi to retrieve aggregate H/W events habanalabs: add uapi to retrieve device utilization habanalabs: Make the Coresight timestamp perpetual habanalabs: explicitly set the queue-id enumerated numbers habanalabs: print to kernel log when reset is finished habanalabs: replace __le32_to_cpu with le32_to_cpu habanalabs: replace __cpu_to_le32/64 with cpu_to_le32/64 habanalabs: Handle HW_IP_INFO if device disabled or in reset habanalabs: Expose devices after initialization is done habanalabs: improve security in Debug IOCTL habanalabs: use default structure for user input in Debug IOCTL habanalabs: Add descriptive name to PSOC app status register habanalabs: Add descriptive names to PSOC scratch-pad registers habanalabs: create two char devices per ASIC habanalabs: change device_setup_cdev() to be more generic ...
Showing the changes to include/uapi/linux (2 of 190 files). Show all
Unified · Split
| @@ -176,4 +176,22 @@ struct dfl_fpga_fme_port_pr { · 175 unmodified lines | |||
| 176 | 176 | ||
| 177 | #define DFL_FPGA_FME_PORT_PR _IO(DFL_FPGA_MAGIC, DFL_FME_BASE + 0) | 177 | #define DFL_FPGA_FME_PORT_PR _IO(DFL_FPGA_MAGIC, DFL_FME_BASE + 0) |
| 178 | 178 | ||
| 179 | /** | ||
| 180 | * DFL_FPGA_FME_PORT_RELEASE - _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 1, | ||
| 181 | * int port_id) | ||
| 182 | * | ||
| 183 | * Driver releases the port per Port ID provided by caller. | ||
| 184 | * Return: 0 on success, -errno on failure. | ||
| 185 | */ | ||
| 186 | #define DFL_FPGA_FME_PORT_RELEASE _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 1, int) | ||
| 187 | |||
| 188 | /** | ||
| 189 | * DFL_FPGA_FME_PORT_ASSIGN - _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 2, | ||
| 190 | * int port_id) | ||
| 191 | * | ||
| 192 | * Driver assigns the port back per Port ID provided by caller. | ||
| 193 | * Return: 0 on success, -errno on failure. | ||
| 194 | */ | ||
| 195 | #define DFL_FPGA_FME_PORT_ASSIGN _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 2, int) | ||
| 196 | |||
| 179 | #endif /* _UAPI_LINUX_FPGA_DFL_H */ | 197 | #endif /* _UAPI_LINUX_FPGA_DFL_H */ |
| @@ -15,6 +15,9 @@ · 14 unmodified lines | |||
| 15 | * Added PPGETMODES/PPGETMODE/PPGETPHASE, Fred Barnes <frmb2@ukc.ac.uk>, 03/01/2001 | 15 | * Added PPGETMODES/PPGETMODE/PPGETPHASE, Fred Barnes <frmb2@ukc.ac.uk>, 03/01/2001 |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef _UAPI_LINUX_PPDEV_H | ||
| 19 | #define _UAPI_LINUX_PPDEV_H | ||
| 20 | |||
| 18 | #define PP_IOCTL 'p' | 21 | #define PP_IOCTL 'p' |
| 19 | 22 | ||
| 20 | /* Set mode for read/write (e.g. IEEE1284_MODE_EPP) */ | 23 | /* Set mode for read/write (e.g. IEEE1284_MODE_EPP) */ |
| @@ -97,4 +100,4 @@ struct ppdev_frob_struct { · 76 unmodified lines | |||
| 97 | /* only masks user-visible flags */ | 100 | /* only masks user-visible flags */ |
| 98 | #define PP_FLAGMASK (PP_FASTWRITE | PP_FASTREAD | PP_W91284PIC) | 101 | #define PP_FLAGMASK (PP_FASTWRITE | PP_FASTREAD | PP_W91284PIC) |
| 99 | 102 | ||
| 100 | 103 | #endif /* _UAPI_LINUX_PPDEV_H */ | |