Commit 3ad79457 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty / serial driver updates from Greg KH:
 "Here is the small amount of tty and serial driver updates for 7.0-rc1.
  Nothing major in here at all, just some driver updates and minor
  tweaks and cleanups including:

   - sh-sci serial driver updates

   - 8250 driver updates

   - attempt to make the tty ports have their own workqueue, but was
     reverted after testing found it to have problems on some platforms.

     This will probably come back for 7.1 after it has been reworked and
     resubmitted

   - other tiny tty driver changes

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

* tag 'tty-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (49 commits)
  Revert "tty: tty_port: add workqueue to flip TTY buffer"
  tty: tty_port: add workqueue to flip TTY buffer
  serial: 8250_pci: Remove custom deprecated baud setting routine
  serial: 8250_omap: Remove custom deprecated baud setting routine
  dt-bindings: serial: renesas,scif: Document RZ/G3L SoC
  serial: 8250: omap: set out-of-band wakeup if wakeup pinctrl exists
  tty: hvc-iucv: Remove KMSG_COMPONENT macro
  dt-bindings: serial: google,goldfish-tty: Convert to DT schema
  dt-bindings: serial: sh-sci: Fold single-entry compatibles into enum
  serial: 8250: 8250_omap.c: Clear DMA RX running status only after DMA termination is done
  serial: 8250: 8250_omap.c: Add support for handling UART error conditions
  serial: SH_SCI: improve "DMA support" prompt
  serial: Kconfig: fix ordering of entries for menu display
  serial: 8250: fix ordering of entries for menu display
  serial: imx: change SERIAL_IMX_CONSOLE to bool
  8250_men_mcb: drop unneeded MODULE_ALIAS
  serial: men_z135_uart: drop unneeded MODULE_ALIAS
  dt-bindings: serial: renesas,rsci: Document RZ/V2H(P) and RZ/V2N SoCs
  serial: rsci: Convert to FIELD_MODIFY()
  dt-bindings: serial: 8250: add SpacemiT K3 UART compatible
  ...
parents a5f22b9b 0a15f43b

Documentation/devicetree/bindings/goldfish/tty.txt

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
Android Goldfish TTY



Android goldfish tty device generated by android emulator.



Required properties:



- compatible : should contain "google,goldfish-tty" to match emulator

- reg        : <registers mapping>

- interrupts : <interrupt mapping>



Example:



	goldfish_tty@1f004000 {

		compatible = "google,goldfish-tty";

		reg = <0x1f004000 0x1000>;

		interrupts = <0xc>;

	};

Documentation/devicetree/bindings/serial/8250.yaml

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

              - mrvl,mmp-uart

              - spacemit,k1-uart

              - spacemit,k3-uart

          - const: intel,xscale-uart

      - items:

          - enum:

Documentation/devicetree/bindings/serial/google,goldfish-tty.yaml

0 → 100644
+41 −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/google,goldfish-tty.yaml#

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



title: Google Goldfish TTY



maintainers:

  - Kuan-Wei Chiu <visitorckw@gmail.com>



allOf:

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



description:

  Android goldfish TTY device generated by Android emulator.



properties:

  compatible:

    const: google,goldfish-tty



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



unevaluatedProperties: false



examples:

  - |

    serial@1f004000 {

        compatible = "google,goldfish-tty";

        reg = <0x1f004000 0x1000>;

        interrupts = <12>;

    };

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

+93 −10
Original line number Diff line number Diff line
@@ -10,47 +10,79 @@ maintainers: 
  - Geert Uytterhoeven <geert+renesas@glider.be>

  - Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>



allOf:

  - $ref: serial.yaml#



properties:

  compatible:

    oneOf:

      - enum:

          - renesas,r9a09g047-rsci # RZ/G3E

          - renesas,r9a09g077-rsci # RZ/T2H



      - items:

          - const: renesas,r9a09g087-rsci # RZ/N2H

          - const: renesas,r9a09g077-rsci # RZ/T2H

          - enum:

              - renesas,r9a09g056-rsci # RZ/V2N

              - renesas,r9a09g057-rsci # RZ/V2H(P)

          - const: renesas,r9a09g047-rsci



      - items:

          - const: renesas,r9a09g087-rsci # RZ/N2H

          - const: renesas,r9a09g077-rsci # RZ/T2H



  reg:

    maxItems: 1



  interrupts:

    minItems: 4

    items:

      - description: Error interrupt

      - description: Receive buffer full interrupt

      - description: Transmit buffer empty interrupt

      - description: Transmit end interrupt

      - description: Active edge detection interrupt

      - description: Break field detection interrupt



  interrupt-names:

    minItems: 4

    items:

      - const: eri

      - const: rxi

      - const: txi

      - const: tei

      - const: aed

      - const: bfd



  clocks:

    minItems: 2

    maxItems: 3

    maxItems: 6



  clock-names:

    minItems: 2

    items:

    oneOf:

      - items:

          - const: operation

          - const: bus

          - const: sck # optional external clock input



        minItems: 2



      - items:

          - const: pclk

          - const: tclk

          - const: tclk_div4

          - const: tclk_div16

          - const: tclk_div64

          - const: sck # optional external clock input



        minItems: 5



  resets:

    items:

      - description: Input for resetting the APB clock

      - description: Input for resetting TCLK



  reset-names:

    items:

      - const: presetn

      - const: tresetn



  power-domains:

    maxItems: 1
@@ -62,6 +94,57 @@ required: 
  - clock-names

  - power-domains



allOf:

  - $ref: serial.yaml#



  - if:

      properties:

        compatible:

          contains:

            const: renesas,r9a09g077-rsci

    then:

      properties:

        interrupts:

          maxItems: 4



        interrupt-names:

          maxItems: 4



        clocks:

          minItems: 2

          maxItems: 3



        clock-names:

          minItems: 2

          maxItems: 3



        resets: false



  - if:

      properties:

        compatible:

          contains:

            const: renesas,r9a09g047-rsci

    then:

      properties:

        interrupts:

          minItems: 6



        interrupt-names:

          minItems: 6



        clocks:

          minItems: 5

          maxItems: 6



        clock-names:

          minItems: 5

          maxItems: 6



      required:

        - resets

        - reset-names



unevaluatedProperties: false



examples:

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

+6 −10
Original line number Diff line number Diff line
@@ -12,14 +12,15 @@ maintainers: 
properties:

  compatible:

    oneOf:

      - items:

      - enum:

              - renesas,scif-r7s72100     # RZ/A1H

          - const: renesas,scif           # generic SCIF compatible UART

          - renesas,scif-r7s9210          # RZ/A2

          - renesas,scif-r9a07g044        # RZ/G2{L,LC}

          - renesas,scif-r9a09g057        # RZ/V2H(P)



      - items:

          - enum:

              - renesas,scif-r7s9210      # RZ/A2

              - renesas,scif-r7s72100     # RZ/A1H

          - const: renesas,scif           # generic SCIF compatible UART



      - items:

          - enum:
@@ -76,19 +77,14 @@ properties: 
          - const: renesas,rcar-gen5-scif # R-Car Gen5

          - const: renesas,scif           # generic SCIF compatible UART



      - items:

          - enum:

              - renesas,scif-r9a07g044      # RZ/G2{L,LC}



      - items:

          - enum:

              - renesas,scif-r9a07g043      # RZ/G2UL and RZ/Five

              - renesas,scif-r9a07g054      # RZ/V2L

              - renesas,scif-r9a08g045      # RZ/G3S

              - renesas,scif-r9a08g046      # RZ/G3L

          - const: renesas,scif-r9a07g044   # RZ/G2{L,LC} fallback



      - const: renesas,scif-r9a09g057       # RZ/V2H(P)



      - items:

          - enum:

              - renesas,scif-r9a09g047      # RZ/G3E