Commit 17cd4d6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

  Once again, Jiri and Ilpo have done a number of core vt and tty/serial
  layer cleanups that were much needed and appreciated. Other than that,
  it's just a bunch of little tty/serial driver updates:

   - qcom-geni-serial driver updates

   - liteuart driver updates

   - hvcs driver cleanups

   - n_gsm updates and additions for new features

   - more 8250 device support added

   - fpga/dfl update and additions

   - imx serial driver updates

   - fsl_lpuart updates

   - other tiny fixes and updates for serial drivers

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

* tag 'tty-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (143 commits)
  tty: n_gsm: add keep alive support
  serial: imx: remove a redundant check
  dt-bindings: serial: snps-dw-apb-uart: add dma & dma-names properties
  soc: qcom: geni-se: Move qcom-geni-se.h to linux/soc/qcom/geni-se.h
  tty: n_gsm: add TIOCMIWAIT support
  tty: n_gsm: add RING/CD control support
  tty: n_gsm: mark unusable ioctl structure fields accordingly
  serial: imx: get rid of registers shadowing
  serial: imx: refine local variables in rxint()
  serial: imx: stop using USR2 in FIFO reading loop
  serial: imx: remove redundant USR2 read from FIFO reading loop
  serial: imx: do not break from FIFO reading loop prematurely
  serial: imx: do not sysrq broken chars
  serial: imx: work-around for hardware RX flood
  serial: imx: factor-out common code to imx_uart_soft_reset()
  serial: 8250_pci1xxxx: Add power management functions to quad-uart driver
  serial: 8250_pci1xxxx: Add RS485 support to quad-uart driver
  serial: 8250_pci1xxxx: Add driver for quad-uart support
  serial: 8250_pci: Add serial8250_pci_setup_port definition in 8250_pcilib.c
  tty: pcn_uart: fix memory leak with using debugfs_lookup()
  ...
parents 72bffe7e 72206cc7

Documentation/admin-guide/kernel-parameters.txt

+7 −5
Original line number Diff line number Diff line
@@ -1172,10 +1172,10 @@ 
			specified, the serial port must already be setup and

			configured.



		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio32,<addr>[,options]

		uart[8250],mmio32be,<addr>[,options]

		uart[8250],io,<addr>[,options[,uartclk]]

		uart[8250],mmio,<addr>[,options[,uartclk]]

		uart[8250],mmio32,<addr>[,options[,uartclk]]

		uart[8250],mmio32be,<addr>[,options[,uartclk]]

		uart[8250],0x<addr>[,options]

			Start an early, polled-mode console on the 8250/16550

			UART at the specified I/O port or MMIO address.
@@ -1184,7 +1184,9 @@ 
			If none of [io|mmio|mmio32|mmio32be], <addr> is assumed

			to be equivalent to 'mmio'. 'options' are specified

			in the same format described for "console=ttyS<n>"; if

			unspecified, the h/w is not initialized.

			unspecified, the h/w is not initialized. 'uartclk' is

			the uart clock frequency; if unspecified, it is set

			to 'BASE_BAUD' * 16.



		pl011,<addr>

		pl011,mmio32,<addr>

Documentation/devicetree/bindings/serial/8250.yaml

+7 −3
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ properties: 
      - const: mrvl,pxa-uart

      - const: nuvoton,wpcm450-uart

      - const: nuvoton,npcm750-uart

      - const: nuvoton,npcm845-uart

      - const: nvidia,tegra20-uart

      - const: nxp,lpc3220-uart

      - items:
@@ -92,6 +91,10 @@ properties: 
          - enum:

              - ns16550 # Deprecated, unless the FIFO really is broken

              - ns16550a

      - items:

          - enum:

              - nuvoton,npcm845-uart

          - const: nuvoton,npcm750-uart

      - items:

          - enum:

              - ralink,mt7620a-uart
@@ -200,12 +203,13 @@ properties: 
    deprecated: true



  aspeed,lpc-io-reg:

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

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

    maxItems: 1

    description: |

      The VUART LPC address.  Only applicable to aspeed,ast2500-vuart.



  aspeed,lpc-interrupts:

    $ref: "/schemas/types.yaml#/definitions/uint32-array"

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

    minItems: 2

    maxItems: 2

    description: |

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

+9 −14
Original line number Diff line number Diff line
@@ -70,11 +70,6 @@ properties: 
  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

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

+9 −6
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ description: | 
  is active since power-on and does not need any clock gating and is usable

  as very early serial console.



allOf:

  - $ref: serial.yaml#



properties:

  compatible:

    oneOf:
@@ -69,7 +72,7 @@ required: 
  - clocks

  - clock-names



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

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

+19 −8
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ title: Cadence UART Controller 
maintainers:

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



allOf:

  - $ref: /schemas/serial.yaml#



properties:

  compatible:

    oneOf:
@@ -46,6 +43,9 @@ properties: 
      port does not use this pin.

    type: boolean



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg
@@ -53,6 +53,17 @@ required: 
  - clocks

  - clock-names



allOf:

  - $ref: serial.yaml#

  - if:

      properties:

        compatible:

          contains:

            const: cdns,uart-r1p8

    then:

      properties:

        power-domains: false



unevaluatedProperties: false



examples:
@@ -61,6 +72,6 @@ examples: 
        compatible = "xlnx,xuartps", "cdns,uart-r1p8";

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

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

      reg = <0xE0000000 0x1000>;

        reg = <0xe0000000 0x1000>;

        interrupts = <0 27 4>;

    };