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

Merge tag 'tty-5.16-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 and serial driver updates for 5.16-rc1.

  Nothing major in here at all, just lots of tiny serial and tty driver
  updates for various reported things, and some good cleanups. These
  include:

   - more good tty api cleanups from Jiri

   - stm32 serial driver updates

   - softlockup fix for non-preempt systems under high serial load

   - rpmsg serial driver update

   - 8250 drivers updates and fixes

   - n_gsm line discipline fixes and updates as people are finally
     starting to use it.

  All of these have been in linux-next for a while now with no reported
  issues"

* tag 'tty-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (86 commits)
  tty: Fix extra "not" in TTY_DRIVER_REAL_RAW description
  serial: cpm_uart: Protect udbg definitions by CONFIG_SERIAL_CPM_CONSOLE
  tty: rpmsg: Define tty name via constant string literal
  tty: rpmsg: Add pr_fmt() to prefix messages
  tty: rpmsg: Use dev_err_probe() in ->probe()
  tty: rpmsg: Unify variable used to keep an error code
  tty: rpmsg: Assign returned id to a local variable
  serial: stm32: push DMA RX data before suspending
  serial: stm32: terminate / restart DMA transfer at suspend / resume
  serial: stm32: rework RX dma initialization and release
  serial: 8250_pci: Remove empty stub pci_quatech_exit()
  serial: 8250_pci: Replace custom pci_match_id() implementation
  serial: xilinx_uartps: Fix race condition causing stuck TX
  serial: sunzilog: Mark sunzilog_putchar() __maybe_unused
  Revert "tty: hvc: pass DMA capable memory to put_chars()"
  Revert "virtio-console: remove unnecessary kmemdup()"
  serial: 8250_pci: Replace dev_*() by pci_*() macros
  serial: 8250_pci: Get rid of redundant 'else' keyword
  serial: 8250_pci: Refactor the loop in pci_ite887x_init()
  tty: add rpmsg driver
  ...
parents 95faf6ba cc8d7b4a

Documentation/devicetree/bindings/serial/8250_omap.yaml

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ required: 
  - reg

  - interrupts



additionalProperties: false

unevaluatedProperties: false



if:

  properties:

Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
* BCM63xx UART



Required properties:



- compatible: "brcm,bcm6345-uart"



- reg: The base address of the UART register bank.



- interrupts: A single interrupt specifier.



- clocks: Clock driving the hardware; used to figure out the baud rate

  divisor.





Optional properties:



- clock-names: Should be "refclk".



Example:



	uart0: serial@14e00520 {

		compatible = "brcm,bcm6345-uart";

		reg = <0x14e00520 0x18>;

		interrupt-parent = <&periph_intc>;

		interrupts = <2>;

		clocks = <&periph_clk>;

		clock-names = "refclk";

	};



	clocks {

		periph_clk: periph_clk@0 {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <54000000>;

		};

	};

Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.yaml

0 → 100644
+47 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/serial/brcm,bcm6345-uart.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: BCM63xx UART



maintainers:

  - Rafał Miłecki <rafal@milecki.pl>



allOf:

  - $ref: serial.yaml#



properties:

  compatible:

    const: brcm,bcm6345-uart



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    const: refclk



unevaluatedProperties: false



required:

  - reg

  - interrupts

  - clocks



examples:

  - |

    serial@14e00520 {

        compatible = "brcm,bcm6345-uart";

        reg = <0x14e00520 0x18>;

        interrupt-parent = <&periph_intc>;

        interrupts = <2>;

        clocks = <&periph_clk>;

        clock-names = "refclk";

    };

Documentation/devicetree/bindings/serial/samsung_uart.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
          - samsung,s3c6400-uart

          - samsung,s5pv210-uart

          - samsung,exynos4210-uart

          - samsung,exynos850-uart



  reg:

    maxItems: 1

Documentation/devicetree/bindings/serial/sprd-uart.yaml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
          - enum:

              - sprd,sc9860-uart

              - sprd,sc9863a-uart

              - sprd,ums512-uart

          - const: sprd,sc9836-uart

      - const: sprd,sc9836-uart