History

Merge tag 'tty-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty / serial driver updates from Greg KH: "Here is the big set of TTY/Serial driver updates and cleanups for 6.9-rc1. Included in here are: - more tty cleanups from Jiri - loads of 8250 driver cleanups from Andy - max310x driver updates - samsung serial driver updates - uart_prepare_sysrq_char() updates for many drivers - platform driver remove callback void cleanups - stm32 driver updates - other small tty/serial driver updates All of these have been in linux-next for a long time with no reported issues" * tag 'tty-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (199 commits) dt-bindings: serial: stm32: add power-domains property serial: 8250_dw: Replace ACPI device check by a quirk serial: Lock console when calling into driver before registration serial: 8250_uniphier: Switch to use uart_read_port_properties() serial: 8250_tegra: Switch to use uart_read_port_properties() serial: 8250_pxa: Switch to use uart_read_port_properties() serial: 8250_omap: Switch to use uart_read_port_properties() serial: 8250_of: Switch to use uart_read_port_properties() serial: 8250_lpc18xx: Switch to use uart_read_port_properties() serial: 8250_ingenic: Switch to use uart_read_port_properties() serial: 8250_dw: Switch to use uart_read_port_properties() serial: 8250_bcm7271: Switch to use uart_read_port_properties() serial: 8250_bcm2835aux: Switch to use uart_read_port_properties() serial: 8250_aspeed_vuart: Switch to use uart_read_port_properties() serial: port: Introduce a common helper to read properties serial: core: Add UPIO_UNKNOWN constant for unknown port type serial: core: Move struct uart_port::quirks closer to possible values serial: sh-sci: Call sci_serial_{in,out}() directly serial: core: only stop transmit when HW fifo is empty serial: pch: Use uart_prepare_sysrq_char(). ...

Linus Torvalds committed 2 years ago

Commit 3bcb0bf2 parents e09bf86 d6c0d89122 files · +3545 −2524Browse files

Showing the changes to include/uapi/linux (2 of 122 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/fb.h +1 −7
  2. include/uapi/linux/vesa.h +18 −0
include/uapi/linux/fb.h+1−7
@@ -4,6 +4,7 @@ · 3 unmodified lines
4 4
5#include <linux/types.h>5#include <linux/types.h>
6#include <linux/i2c.h>6#include <linux/i2c.h>
7#include <linux/vesa.h>
7 8
8/* Definitions of frame buffers */9/* Definitions of frame buffers */
9 10
@@ -293,13 +294,6 @@ struct fb_con2fbmap { · 283 unmodified lines
293 __u32 framebuffer;294 __u32 framebuffer;
294};295};
295 296
296/* VESA Blanking Levels */
297#define VESA_NO_BLANKING 0
298#define VESA_VSYNC_SUSPEND 1
299#define VESA_HSYNC_SUSPEND 2
300#define VESA_POWERDOWN 3
301
302
303enum {297enum {
304 /* screen: unblanked, hsync: on, vsync: on */298 /* screen: unblanked, hsync: on, vsync: on */
305 FB_BLANK_UNBLANK = VESA_NO_BLANKING,299 FB_BLANK_UNBLANK = VESA_NO_BLANKING,
include/uapi/linux/vesa.h+18−0
@@ -0,0 +1,18 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2#ifndef _UAPI_LINUX_VESA_H
3#define _UAPI_LINUX_VESA_H
4
5/* VESA Blanking Levels */
6enum vesa_blank_mode {
7 VESA_NO_BLANKING = 0,
8#define VESA_NO_BLANKING VESA_NO_BLANKING
9 VESA_VSYNC_SUSPEND = 1,
10#define VESA_VSYNC_SUSPEND VESA_VSYNC_SUSPEND
11 VESA_HSYNC_SUSPEND = 2,
12#define VESA_HSYNC_SUSPEND VESA_HSYNC_SUSPEND
13 VESA_POWERDOWN = VESA_VSYNC_SUSPEND | VESA_HSYNC_SUSPEND,
14#define VESA_POWERDOWN VESA_POWERDOWN
15 VESA_BLANK_MAX = VESA_POWERDOWN,
16};
17
18#endif