Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e63a94f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 1a3b85ea 3840ed95

Documentation/devicetree/bindings/serial/8250.txt

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ Required properties: 
	  tegra132, or tegra210.

	- "nxp,lpc3220-uart"

	- "ralink,rt2880-uart"

	- For MediaTek BTIF, must contain '"mediatek,<chip>-btif",

	  "mediatek,mtk-btif"' where <chip> is mt7622, mt7623.

	- "altr,16550-FIFO32"

	- "altr,16550-FIFO64"

	- "altr,16550-FIFO128"

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

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ Required properties: 
    - "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.

    - "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF compatible UART.

    - "renesas,hscif-r8a7796" for R8A7796 (R-Car M3-W) HSCIF compatible UART.

    - "renesas,scif-r8a77995" for R8A77995 (R-Car D3) SCIF compatible UART.

    - "renesas,hscif-r8a77995" for R8A77995 (R-Car D3) HSCIF compatible UART.

    - "renesas,scifa-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFA compatible UART.

    - "renesas,scifb-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFB compatible UART.

    - "renesas,rcar-gen1-scif" for R-Car Gen1 SCIF compatible UART,

Documentation/devicetree/bindings/serial/rs485.txt

+2 −3
Original line number Diff line number Diff line
@@ -5,14 +5,13 @@ the built-in half-duplex mode. 
The properties described hereafter shall be given to a half-duplex capable

UART node.



Required properties:

Optional properties:

- rs485-rts-delay: prop-encoded-array <a b> where:

  * a is the delay between rts signal and beginning of data sent in milliseconds.

      it corresponds to the delay before sending data.

  * b is the delay between end of data sent and rts signal in milliseconds

      it corresponds to the delay after sending data and actual release of the line.



Optional properties:

  If this property is not specified, <0 0> is assumed.

- linux,rs485-enabled-at-boot-time: empty property telling to enable the rs485

  feature at boot time. It can be disabled later with proper ioctl.

- rs485-rx-during-tx: empty property that enables the receiving of data even

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

+12 −5
Original line number Diff line number Diff line 
* STMicroelectronics STM32 USART



Required properties:

- compatible: Can be either "st,stm32-usart", "st,stm32-uart",

"st,stm32f7-usart" or "st,stm32f7-uart" depending on whether

the device supports synchronous mode and is compatible with

stm32(f4) or stm32f7.

- compatible: can be either:

  - "st,stm32-usart",

  - "st,stm32-uart",

  - "st,stm32f7-usart",

  - "st,stm32f7-uart",

  - "st,stm32h7-usart"

  - "st,stm32h7-uart".

  depending on whether the device supports synchronous mode

  and is compatible with stm32(f4), stm32f7 or stm32h7.

- reg: The address and length of the peripheral registers space

- interrupts: The interrupt line of the USART instance

- interrupts:

  - The interrupt line for the USART instance,

  - An optional wake-up interrupt.

- clocks: The input clock of the USART instance



Optional properties:

drivers/mcb/mcb-core.c

+19 −1
Original line number Diff line number Diff line
@@ -417,6 +417,22 @@ void mcb_bus_add_devices(const struct mcb_bus *bus) 
}

EXPORT_SYMBOL_GPL(mcb_bus_add_devices);



/**

 * mcb_get_resource() - get a resource for a mcb device

 * @dev: the mcb device

 * @type: the type of resource

 */

struct resource *mcb_get_resource(struct mcb_device *dev, unsigned int type)

{

	if (type == IORESOURCE_MEM)

		return &dev->mem;

	else if (type == IORESOURCE_IRQ)

		return &dev->irq;

	else

		return NULL;

}

EXPORT_SYMBOL_GPL(mcb_get_resource);



/**

 * mcb_request_mem() - Request memory

 * @dev: The @mcb_device the memory is for
@@ -460,7 +476,9 @@ EXPORT_SYMBOL_GPL(mcb_release_mem); 


static int __mcb_get_irq(struct mcb_device *dev)

{

	struct resource *irq = &dev->irq;

	struct resource *irq;



	irq = mcb_get_resource(dev, IORESOURCE_IRQ);



	return irq->start;

}