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

Merge tag 'tty-5.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 set of tty and serial driver patches for 5.14-rc1.

  A bit more than normal, but nothing major, lots of cleanups.
  Highlights are:

   - lots of tty api cleanups and mxser driver cleanups from Jiri

   - build warning fixes

   - various serial driver updates

   - coding style cleanups

   - various tty driver minor fixes and updates

   - removal of broken and disable r3964 line discipline (finally!)

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

* tag 'tty-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (227 commits)
  serial: mvebu-uart: remove unused member nb from struct mvebu_uart
  arm64: dts: marvell: armada-37xx: Fix reg for standard variant of UART
  dt-bindings: mvebu-uart: fix documentation
  serial: mvebu-uart: correctly calculate minimal possible baudrate
  serial: mvebu-uart: do not allow changing baudrate when uartclk is not available
  serial: mvebu-uart: fix calculation of clock divisor
  tty: make linux/tty_flip.h self-contained
  serial: Prefer unsigned int to bare use of unsigned
  serial: 8250: 8250_omap: Fix possible interrupt storm on K3 SoCs
  serial: qcom_geni_serial: use DT aliases according to DT bindings
  Revert "tty: serial: Add UART driver for Cortina-Access platform"
  tty: serial: Add UART driver for Cortina-Access platform
  MAINTAINERS: add me back as mxser maintainer
  mxser: Documentation, fix typos
  mxser: Documentation, make the docs up-to-date
  mxser: Documentation, remove traces of callout device
  mxser: introduce mxser_16550A_or_MUST helper
  mxser: rename flags to old_speed in mxser_set_serial_info
  mxser: use port variable in mxser_set_serial_info
  mxser: access info->MCR under info->slock
  ...
parents a16d8644 15279ebe

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1122,6 +1122,11 @@ 
			the driver will use only 32-bit accessors to read/write

			the device registers.



		liteuart,<addr>

			Start an early console on a litex serial port at the

			specified address. The serial port must already be

			setup and configured. Options are not yet supported.



		meson,<addr>

			Start an early, polled-mode console on a meson serial

			port at the specified address. The serial port must

Documentation/devicetree/bindings/serial/8250.yaml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ maintainers: 
  - devicetree@vger.kernel.org



allOf:

  - $ref: /schemas/serial.yaml#

  - $ref: serial.yaml#

  - if:

      anyOf:

        - required:

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

0 → 100644
+118 −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/8250_omap.yaml#

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



title: Bindings for 8250 compliant UARTs on TI's OMAP2+ and K3 SoCs



maintainers:

  - Vignesh Raghavendra <vigneshr@ti.com>



allOf:

  - $ref: /schemas/serial/serial.yaml#

  - $ref: /schemas/serial/rs485.yaml#



properties:

  compatible:

    oneOf:

      - enum:

          - ti,am3352-uart

          - ti,am4372-uart

          - ti,am654-uart

          - ti,dra742-uart

          - ti,omap2-uart

          - ti,omap3-uart

          - ti,omap4-uart

      - items:

          - enum:

              - ti,am64-uart

              - ti,j721e-uart

          - const: ti,am654-uart



  ti,hwmods:

    description:

      Must be "uart<n>", n being the instance number (1-based)

      This property is applicable only on legacy platforms mainly omap2/3

      and ti81xx and should not be used on other platforms.

    $ref: /schemas/types.yaml#/definitions/string

    deprecated: true



  dmas:

    minItems: 1

    maxItems: 2



  dma-names:

    items:

      - const: tx

      - const: rx



  reg:

    maxItems: 1



  interrupts:

    minItems: 1

    maxItems: 2

    description:

      First entry is module IRQ required for normal IO operation.

      Second entry is optional and corresponds to system wakeup IRQ

      where supported.



  clocks:

    maxItems: 1



  clock-names:

    const: fclk



  rts-gpios: true

  cts-gpios: true

  dtr-gpios: true

  dsr-gpios: true

  rng-gpios: true

  dcd-gpios: true

  rs485-rts-delay: true

  rs485-rts-active-low: true

  rs485-rx-during-tx: true

  rs485-rts-active-high: true

  linux,rs485-enabled-at-boot-time: true

  rts-gpio: true

  power-domains: true

  clock-frequency: true

  current-speed: true



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



if:

  properties:

    compatible:

      oneOf:

        - const: ti,omap2-uart

        - const: ti,omap3-uart

        - const: ti,omap4-uart



then:

  properties:

    ti,hwmods:

      items:

        - pattern: "^uart([1-9])$"



else:

  properties:

    ti,hwmods: false



examples:

  - |

          serial@49042000 {

            compatible = "ti,omap3-uart";

            reg = <0x49042000 0x400>;

            interrupts = <80>;

            dmas = <&sdma 81 &sdma 82>;

            dma-names = "tx", "rx";

            ti,hwmods = "uart4";

            clock-frequency = <48000000>;

          };

Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ properties: 
      - const: pclk

      - const: baud



  fifo-size:

    description: The fifo size supported by the UART channel.

    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [64, 128]



required:

  - compatible

  - reg

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ maintainers: 
  - Al Cooper <alcooperx@gmail.com>



allOf:

  - $ref: /schemas/serial.yaml#

  - $ref: serial.yaml#



description: |+

  The Broadcom UART is based on the basic 8250 UART but with