Commit 7c314bdf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty / serial updates from Greg KH:
 "Here is the "big" set of tty/serial driver patches for 5.15-rc1

  Nothing major in here at all, just some driver updates and more
  cleanups on old tty apis and code that needed it that includes:

   - tty.h cleanup of things that didn't belong in it

   - other tty cleanups by Jiri

   - driver cleanups

   - rs485 support added to amba-pl011 driver

   - dts updates

   - stm32 serial driver updates

   - other minor fixes and driver updates

  All have been in linux-next for a while with no reported problems"

* tag 'tty-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (83 commits)
  tty: serial: uartlite: Use read_poll_timeout for a polling loop
  tty: serial: uartlite: Use constants in early_uartlite_putc
  tty: Fix data race between tiocsti() and flush_to_ldisc()
  serial: vt8500: Use of_device_get_match_data
  serial: tegra: Use of_device_get_match_data
  serial: 8250_ingenic: Use of_device_get_match_data
  tty: serial: linflexuart: Remove redundant check to simplify the code
  tty: serial: fsl_lpuart: do software reset for imx7ulp and imx8qxp
  tty: serial: fsl_lpuart: enable two stop bits for lpuart32
  tty: serial: fsl_lpuart: fix the wrong mapbase value
  mxser: use semi-colons instead of commas
  tty: moxa: use semi-colons instead of commas
  tty: serial: fsl_lpuart: check dma_tx_in_progress in tx dma callback
  tty: replace in_irq() with in_hardirq()
  serial: sh-sci: fix break handling for sysrq
  serial: stm32: use devm_platform_get_and_ioremap_resource()
  serial: stm32: use the defined variable to simplify code
  Revert "arm pl011 serial: support multi-irq request"
  tty: serial: samsung: Add Exynos850 SoC data
  tty: serial: samsung: Fix driver data macros style
  ...
parents ebf435d3 2e5f3a69

Documentation/devicetree/bindings/serial/8250.yaml

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ properties: 
      - const: nuvoton,npcm750-uart

      - const: nvidia,tegra20-uart

      - const: nxp,lpc3220-uart

      - items:

          - enum:

              - exar,xr16l2552

              - exar,xr16l2551

              - exar,xr16l2550

          - const: ns8250

      - items:

          - enum:

              - altr,16550-FIFO32

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

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ properties: 
  power-domains: true

  clock-frequency: true

  current-speed: true

  overrun-throttle-ms: true



required:

  - compatible

Documentation/devicetree/bindings/serial/cdns,uart.txt

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
Binding for Cadence UART Controller



Required properties:

- compatible :

  Use "xlnx,xuartps","cdns,uart-r1p8" for Zynq-7xxx SoC.

  Use "xlnx,zynqmp-uart","cdns,uart-r1p12" for Zynq Ultrascale+ MPSoC.

- reg: Should contain UART controller registers location and length.

- interrupts: Should contain UART controller interrupts.

- clocks: Must contain phandles to the UART clocks

  See ../clocks/clock-bindings.txt for details.

- clock-names: Tuple to identify input clocks, must contain "uart_clk" and "pclk"

  See ../clocks/clock-bindings.txt for details.





Optional properties:

- cts-override : Override the CTS modem status signal. This signal will

  always be reported as active instead of being obtained from the modem status

  register. Define this if your serial port does not use this pin



Example:

	uart@e0000000 {

		compatible = "cdns,uart-r1p8";

		clocks = <&clkc 23>, <&clkc 40>;

		clock-names = "uart_clk", "pclk";

		reg = <0xE0000000 0x1000>;

		interrupts = <0 27 4>;

	};

Documentation/devicetree/bindings/serial/cdns,uart.yaml

0 → 100644
+66 −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/cdns,uart.yaml#

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



title: Cadence UART Controller Device Tree Bindings



maintainers:

  - Michal Simek <michal.simek@xilinx.com>



allOf:

  - $ref: /schemas/serial.yaml#



properties:

  compatible:

    oneOf:

      - description: UART controller for Zynq-7xxx SoC

        items:

          - const: xlnx,xuartps

          - const: cdns,uart-r1p8

      - description: UART controller for Zynq Ultrascale+ MPSoC

        items:

          - const: xlnx,zynqmp-uart

          - const: cdns,uart-r1p12



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 2



  clock-names:

    items:

      - const: uart_clk

      - const: pclk



  cts-override:

    description: |

      Override the CTS modem status signal. This signal will

      always be reported as active instead of being obtained

      from the modem status register. Define this if your serial

      port does not use this pin.

    type: boolean



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



unevaluatedProperties: false



examples:

  - |

    uart0: serial@e0000000 {

      compatible = "xlnx,xuartps", "cdns,uart-r1p8";

      clocks = <&clkc 23>, <&clkc 40>;

      clock-names = "uart_clk", "pclk";

      reg = <0xE0000000 0x1000>;

      interrupts = <0 27 4>;

    };

Documentation/devicetree/bindings/serial/mtk-uart.txt

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Required properties: 
  * "mediatek,mt7622-uart" for MT7622 compatible UARTS

  * "mediatek,mt7623-uart" for MT7623 compatible UARTS

  * "mediatek,mt7629-uart" for MT7629 compatible UARTS

  * "mediatek,mt7986-uart", "mediatek,mt6577-uart" for MT7986 compatible UARTS

  * "mediatek,mt8127-uart" for MT8127 compatible UARTS

  * "mediatek,mt8135-uart" for MT8135 compatible UARTS

  * "mediatek,mt8173-uart" for MT8173 compatible UARTS