Skip to content

Commit e63a94f

Browse files
torvaldstorvalds
committed
Merge tag 'tty-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial updates from Greg KH: "Here is the big tty/serial driver update for 4.14-rc1. Well, not all that big, just a number of small serial driver fixes, and a new serial driver. Also in here are some much needed goldfish tty driver (emulator) fixes to try to get that codebase under control. All of these have been in linux-next for a while with no reported issues" * tag 'tty-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (94 commits) tty: goldfish: Implement support for kernel 'earlycon' parameter tty: goldfish: Use streaming DMA for r/w operations on Ranchu platforms tty: goldfish: Refactor constants to better reflect their nature serial: 8250_port: Remove useless NULL checks earlycon: initialise baud field of earlycon device structure tty: hvcs: make ktermios const pty: show associative slave of ptmx in fdinfo tty: n_gsm: Add compat_ioctl tty: hvcs: constify vio_device_id tty: hvc_vio: constify vio_device_id tty: mips_ejtag_fdc: constify mips_cdmm_device_id Introduce 8250_men_mcb mcb: introduce mcb_get_resource() serial: imx: Avoid post-PIO cleanup if TX DMA is started tty: serial: imx: disable irq after suspend serial: 8250_uniphier: add suspend/resume support serial: 8250_uniphier: use CHAR register for canary to detect power-off serial: 8250_uniphier: fix serial port index in private data serial: 8250: of: Add new port type for MediaTek BTIF controller on MT7622/23 SoC dt-bindings: serial: 8250: Add MediaTek BTIF controller bindings ...
2 parents 1a3b85e + 3840ed9 commit e63a94f

74 files changed

Lines changed: 1630 additions & 308 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/serial/8250.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Required properties:
1414
tegra132, or tegra210.
1515
- "nxp,lpc3220-uart"
1616
- "ralink,rt2880-uart"
17+
- For MediaTek BTIF, must contain '"mediatek,<chip>-btif",
18+
"mediatek,mtk-btif"' where <chip> is mt7622, mt7623.
1719
- "altr,16550-FIFO32"
1820
- "altr,16550-FIFO64"
1921
- "altr,16550-FIFO128"

‎Documentation/devicetree/bindings/serial/renesas,sci-serial.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Required properties:
4141
- "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.
4242
- "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF compatible UART.
4343
- "renesas,hscif-r8a7796" for R8A7796 (R-Car M3-W) HSCIF compatible UART.
44+
- "renesas,scif-r8a77995" for R8A77995 (R-Car D3) SCIF compatible UART.
45+
- "renesas,hscif-r8a77995" for R8A77995 (R-Car D3) HSCIF compatible UART.
4446
- "renesas,scifa-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFA compatible UART.
4547
- "renesas,scifb-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFB compatible UART.
4648
- "renesas,rcar-gen1-scif" for R-Car Gen1 SCIF compatible UART,

‎Documentation/devicetree/bindings/serial/rs485.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ the built-in half-duplex mode.
55
The properties described hereafter shall be given to a half-duplex capable
66
UART node.
77

8-
Required properties:
8+
Optional properties:
99
- rs485-rts-delay: prop-encoded-array <a b> where:
1010
* a is the delay between rts signal and beginning of data sent in milliseconds.
1111
it corresponds to the delay before sending data.
1212
* b is the delay between end of data sent and rts signal in milliseconds
1313
it corresponds to the delay after sending data and actual release of the line.
14-
15-
Optional properties:
14+
If this property is not specified, <0 0> is assumed.
1615
- linux,rs485-enabled-at-boot-time: empty property telling to enable the rs485
1716
feature at boot time. It can be disabled later with proper ioctl.
1817
- rs485-rx-during-tx: empty property that enables the receiving of data even

‎Documentation/devicetree/bindings/serial/st,stm32-usart.txt‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
* STMicroelectronics STM32 USART
22

33
Required properties:
4-
- compatible: Can be either "st,stm32-usart", "st,stm32-uart",
5-
"st,stm32f7-usart" or "st,stm32f7-uart" depending on whether
6-
the device supports synchronous mode and is compatible with
7-
stm32(f4) or stm32f7.
4+
- compatible: can be either:
5+
- "st,stm32-usart",
6+
- "st,stm32-uart",
7+
- "st,stm32f7-usart",
8+
- "st,stm32f7-uart",
9+
- "st,stm32h7-usart"
10+
- "st,stm32h7-uart".
11+
depending on whether the device supports synchronous mode
12+
and is compatible with stm32(f4), stm32f7 or stm32h7.
813
- reg: The address and length of the peripheral registers space
9-
- interrupts: The interrupt line of the USART instance
14+
- interrupts:
15+
- The interrupt line for the USART instance,
16+
- An optional wake-up interrupt.
1017
- clocks: The input clock of the USART instance
1118

1219
Optional properties:

‎drivers/mcb/mcb-core.c‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,22 @@ void mcb_bus_add_devices(const struct mcb_bus *bus)
417417
}
418418
EXPORT_SYMBOL_GPL(mcb_bus_add_devices);
419419

420+
/**
421+
* mcb_get_resource() - get a resource for a mcb device
422+
* @dev: the mcb device
423+
* @type: the type of resource
424+
*/
425+
struct resource *mcb_get_resource(struct mcb_device *dev, unsigned int type)
426+
{
427+
if (type == IORESOURCE_MEM)
428+
return &dev->mem;
429+
else if (type == IORESOURCE_IRQ)
430+
return &dev->irq;
431+
else
432+
return NULL;
433+
}
434+
EXPORT_SYMBOL_GPL(mcb_get_resource);
435+
420436
/**
421437
* mcb_request_mem() - Request memory
422438
* @dev: The @mcb_device the memory is for
@@ -460,7 +476,9 @@ EXPORT_SYMBOL_GPL(mcb_release_mem);
460476

461477
static int __mcb_get_irq(struct mcb_device *dev)
462478
{
463-
struct resource *irq = &dev->irq;
479+
struct resource *irq;
480+
481+
irq = mcb_get_resource(dev, IORESOURCE_IRQ);
464482

465483
return irq->start;
466484
}

‎drivers/tty/Kconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,9 @@ config PPC_EARLY_DEBUG_EHV_BC_HANDLE
392392
config GOLDFISH_TTY
393393
tristate "Goldfish TTY Driver"
394394
depends on GOLDFISH
395+
select SERIAL_CORE
396+
select SERIAL_CORE_CONSOLE
397+
select SERIAL_EARLYCON
395398
help
396399
Console and system TTY driver for the Goldfish virtual platform.
397400

‎drivers/tty/ehv_bytechan.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static int find_console_handle(void)
122122

123123
stdout_irq = irq_of_parse_and_map(np, 0);
124124
if (stdout_irq == NO_IRQ) {
125-
pr_err("ehv-bc: no 'interrupts' property in %s node\n", np->full_name);
125+
pr_err("ehv-bc: no 'interrupts' property in %pOF node\n", np);
126126
return 0;
127127
}
128128

0 commit comments

Comments
 (0)