Commit 157f8098 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty / serial updates from Greg KH:
 "Here is the "large" set of tty and serial patches for 5.11-rc1.

  Nothing major at all, some cleanups and some driver removals, always a
  nice sign:

   - build warning cleanups

   - vt locking and logic unwinding and cleanups

   - tiny serial driver fixes and updates

   - removal of the synclink serial driver as it's no longer needed

   - removal of dead termiox code

  All of this has been in linux-next for a while with no reported issues"

* tag 'tty-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (89 commits)
  serial: 8250_pci: Drop bogus __refdata annotation
  tty: serial: meson: enable console as module
  serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access
  serial: imx: Move imx_uart_probe_dt() content into probe()
  serial: imx: Remove unneeded of_device_get_match_data() NULL check
  tty: Fix whitespace inconsistencies in vt_io_ioctl
  serial_core: Check for port state when tty is in error state
  dt-bindings: serial: Update DT binding docs to support SiFive FU740 SoC
  tty: use const parameters in port-flag accessors
  tty: use assign_bit() in port-flag accessors
  earlycon: drop semicolon from earlycon macro
  tty: Remove dead termiox code
  tty/serial/imx: Enable TXEN bit in imx_poll_init().
  tty : serial: jsm: Fixed file by adding spacing
  tty: serial: uartlite: Support probe deferral
  earlycon: simplify earlycon-table implementation
  tty: serial: bcm63xx: lower driver dependencies
  serial: mxs-auart: Remove unneeded platform_device_id
  serial: 8250-mtk: Fix reference leak in mtk8250_probe
  serial: imx: Remove unused .id_table support
  ...
parents 0cee54c8 c3ae3dc8

Documentation/devicetree/bindings/serial/omap_serial.txt

+1 −0
Original line number Diff line number Diff line 
OMAP UART controller



Required properties:

- compatible : should be "ti,am64-uart", "ti,am654-uart" for AM64 controllers

- compatible : should be "ti,j721e-uart", "ti,am654-uart" for J721E controllers

- compatible : should be "ti,am654-uart" for AM654 controllers

- compatible : should be "ti,omap2-uart" for OMAP2 controllers

Documentation/devicetree/bindings/serial/renesas,scif.yaml

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ properties: 
              - renesas,scif-r8a77980     # R-Car V3H

              - renesas,scif-r8a77990     # R-Car E3

              - renesas,scif-r8a77995     # R-Car D3

              - renesas,scif-r8a779a0     # R-Car V3U

          - const: renesas,rcar-gen3-scif # R-Car Gen3 and RZ/G2

          - const: renesas,scif           # generic SCIF compatible UART

Documentation/devicetree/bindings/serial/sifive-serial.yaml

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ allOf: 
properties:

  compatible:

    items:

      - const: sifive,fu540-c000-uart

      - enum:

          - sifive,fu540-c000-uart

          - sifive,fu740-c000-uart

      - const: sifive,uart0



    description:

arch/powerpc/configs/ppc6xx_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -598,8 +598,6 @@ CONFIG_GAMEPORT_FM801=m 
CONFIG_SERIAL_NONSTANDARD=y

CONFIG_ROCKETPORT=m

CONFIG_CYCLADES=m

CONFIG_SYNCLINK=m

CONFIG_SYNCLINKMP=m

CONFIG_SYNCLINK_GT=m

CONFIG_NOZOMI=m

CONFIG_N_HDLC=m

drivers/of/fdt.c

+2 −5
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ int __init early_init_dt_scan_chosen_stdout(void) 
	int offset;

	const char *p, *q, *options = NULL;

	int l;

	const struct earlycon_id **p_match;

	const struct earlycon_id *match;

	const void *fdt = initial_boot_params;



	offset = fdt_path_offset(fdt, "/chosen");
@@ -933,10 +933,7 @@ int __init early_init_dt_scan_chosen_stdout(void) 
		return 0;

	}



	for (p_match = __earlycon_table; p_match < __earlycon_table_end;

	     p_match++) {

		const struct earlycon_id *match = *p_match;



	for (match = __earlycon_table; match < __earlycon_table_end; match++) {

		if (!match->compatible[0])

			continue;

CRA Git | Maintained and supported by SUSTech CRA and CCSE