diff options
author | Maxime Ripard <mripard@kernel.org> | 2024-02-26 15:23:00 +0100 |
---|---|---|
committer | Maxime Ripard <mripard@kernel.org> | 2024-02-26 15:23:00 +0100 |
commit | 2f910859724b53f1cd3579246e3d9bebb16d78b8 (patch) | |
tree | 75cd2329b7e737865bf28ea734a2e0649c02a5bf /include/uapi/linux/serial.h | |
parent | 86bf8cfda6d2a6720fa2e6e676c98f0882c9d3d7 (diff) | |
parent | 72fa02fdf83306c52bc1eede28359e3fa32a151a (diff) |
Merge drm/drm-fixes into drm-misc-fixes
Sima needs a more recent release to apply a patch.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'include/uapi/linux/serial.h')
-rw-r--r-- | include/uapi/linux/serial.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h index 9086367db043..de9b4733607e 100644 --- a/include/uapi/linux/serial.h +++ b/include/uapi/linux/serial.h @@ -145,12 +145,13 @@ struct serial_rs485 { #define SER_RS485_ENABLED _BITUL(0) #define SER_RS485_RTS_ON_SEND _BITUL(1) #define SER_RS485_RTS_AFTER_SEND _BITUL(2) -#define SER_RS485_RX_DURING_TX _BITUL(3) -#define SER_RS485_TERMINATE_BUS _BITUL(4) -#define SER_RS485_ADDRB _BITUL(5) -#define SER_RS485_ADDR_RECV _BITUL(6) -#define SER_RS485_ADDR_DEST _BITUL(7) -#define SER_RS485_MODE_RS422 _BITUL(8) +/* Placeholder for bit 3: SER_RS485_RTS_BEFORE_SEND, which isn't used anymore */ +#define SER_RS485_RX_DURING_TX _BITUL(4) +#define SER_RS485_TERMINATE_BUS _BITUL(5) +#define SER_RS485_ADDRB _BITUL(6) +#define SER_RS485_ADDR_RECV _BITUL(7) +#define SER_RS485_ADDR_DEST _BITUL(8) +#define SER_RS485_MODE_RS422 _BITUL(9) __u32 delay_rts_before_send; __u32 delay_rts_after_send; |