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

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

Pull tty / serial updates from Greg KH:
 "Here is a small set of tty and serial driver updates for 6.11-rc1. Not
  much happened this cycle, unlike the previous kernel release which had
  lots of "excitement" in this part of the kernel. Included in here are
  the following changes:

   - dt binding updates for new platforms

   - 8250 driver updates

   - various small serial driver fixes and updates

   - printk/console naming and matching attempt #2 (was reverted for
     6.10-final, should be good to go this time around, acked by the
     relevant maintainers).

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

* tag 'tty-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (22 commits)
  Documentation: kernel-parameters: Add DEVNAME:0.0 format for serial ports
  serial: core: Add serial_base_match_and_update_preferred_console()
  printk: Add match_devname_and_update_preferred_console()
  serial: sc16is7xx: hardware reset chip if reset-gpios is defined in DT
  dt-bindings: serial: sc16is7xx: add reset-gpios
  dt-bindings: serial: vt8500-uart: convert to json-schema
  serial: 8250_platform: Explicitly show we initialise ISA ports only once
  tty: add missing MODULE_DESCRIPTION() macros
  dt-bindings: serial: mediatek,uart: add MT7988
  serial: sh-sci: Add support for RZ/V2H(P) SoC
  dt-bindings: serial: Add documentation for Renesas RZ/V2H(P) (R9A09G057) SCIF support
  dt-bindings: serial: renesas,scif: Make 'interrupt-names' property as required
  dt-bindings: serial: renesas,scif: Validate 'interrupts' and 'interrupt-names'
  dt-bindings: serial: renesas,scif: Move ref for serial.yaml at the end
  riscv: dts: starfive: jh7110: Add the core reset and jh7110 compatible for uarts
  serial: 8250_dw: Use reset array API to get resets
  dt-bindings: serial: snps-dw-apb-uart: Add one more reset signal for StarFive JH7110 SoC
  serial: 8250: Extract platform driver
  serial: 8250: Extract RSA bits
  serial: imx: stop casting struct uart_port to struct imx_port
  ...
parents d7e78951 17199dfc

Documentation/admin-guide/kernel-parameters.txt

+19 −0
Original line number Diff line number Diff line
@@ -792,6 +792,25 @@ 
			Documentation/networking/netconsole.rst for an

			alternative.



		<DEVNAME>:<n>.<n>[,options]

			Use the specified serial port on the serial core bus.

			The addressing uses DEVNAME of the physical serial port

			device, followed by the serial core controller instance,

			and the serial port instance. The options are the same

			as documented for the ttyS addressing above.



			The mapping of the serial ports to the tty instances

			can be viewed with:



			$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*

			/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0



			In the above example, the console can be addressed with

			console=00:04:0.0. Note that a console addressed this

			way will only get added when the related device driver

			is ready. The use of an earlycon parameter in addition to

			the console may be desired for console output early on.



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

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ properties: 
              - mediatek,mt7623-uart

              - mediatek,mt7629-uart

              - mediatek,mt7986-uart

              - mediatek,mt7988-uart

              - mediatek,mt8127-uart

              - mediatek,mt8135-uart

              - mediatek,mt8173-uart

Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ properties: 
  clocks:

    maxItems: 1



  reset-gpios:

    maxItems: 1



  clock-frequency:

    description:

      When there is no clock provider visible to the platform, this
@@ -91,6 +94,7 @@ unevaluatedProperties: false 
examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/gpio/gpio.h>

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;
@@ -120,6 +124,7 @@ examples: 
            compatible = "nxp,sc16is752";

            reg = <0x54>;

            clocks = <&clk20m>;

            reset-gpios = <&gpio5 13 GPIO_ACTIVE_LOW>;

            interrupt-parent = <&gpio3>;

            interrupts = <7 IRQ_TYPE_EDGE_FALLING>;

            nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */

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

+103 −33
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ title: Renesas Serial Communication Interface with FIFO (SCIF) 
maintainers:

  - Geert Uytterhoeven <geert+renesas@glider.be>



allOf:

  - $ref: serial.yaml#



properties:

  compatible:

    oneOf:
@@ -83,6 +80,8 @@ properties: 
              - renesas,scif-r9a08g045      # RZ/G3S

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



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



  reg:

    maxItems: 1
@@ -90,11 +89,6 @@ properties: 
    oneOf:

      - items:

          - description: A combined interrupt

      - items:

          - description: Error interrupt

          - description: Receive buffer full interrupt

          - description: Transmit buffer empty interrupt

          - description: Break interrupt

      - items:

          - description: Error interrupt

          - description: Receive buffer full interrupt
@@ -102,21 +96,23 @@ properties: 
          - description: Break interrupt

          - description: Data Ready interrupt

          - description: Transmit End interrupt

          - description: Transmit End/Data Ready interrupt

          - description: Receive buffer full interrupt (EDGE trigger)

          - description: Transmit buffer empty interrupt (EDGE trigger)

        minItems: 4



  interrupt-names:

    oneOf:

      - items:

          - const: eri

          - const: rxi

          - const: txi

          - const: bri

      - items:

    minItems: 4

    items:

      - const: eri

      - const: rxi

      - const: txi

      - const: bri

      - const: dri

      - const: tei

      - const: tei-dri

      - const: rxi-edge

      - const: txi-edge



  clocks:

    minItems: 1
@@ -161,7 +157,10 @@ required: 
  - clock-names

  - power-domains



if:

allOf:

  - $ref: serial.yaml#



  - if:

      properties:

        compatible:

          contains:
@@ -170,10 +169,81 @@ if: 
              - renesas,rcar-gen3-scif

              - renesas,rcar-gen4-scif

              - renesas,scif-r9a07g044

              - renesas,scif-r9a09g057

    then:

      required:

        - resets



  - if:

      properties:

        compatible:

          contains:

            enum:

              - renesas,rcar-gen1-scif

              - renesas,rcar-gen2-scif

              - renesas,rcar-gen3-scif

              - renesas,rcar-gen4-scif

    then:

      properties:

        interrupts:

          maxItems: 1



        interrupt-names: false

    else:

      required:

        - interrupt-names



  - if:

      properties:

        compatible:

          contains:

            enum:

              - renesas,scif-r7s72100

    then:

      properties:

        interrupts:

          minItems: 4

          maxItems: 4



        interrupt-names:

          maxItems: 4



  - if:

      properties:

        compatible:

          contains:

            enum:

              - renesas,scif-r7s9210

              - renesas,scif-r9a07g044

    then:

      properties:

        interrupts:

          minItems: 6

          maxItems: 6



        interrupt-names:

          minItems: 6

          maxItems: 6



  - if:

      properties:

        compatible:

          contains:

            const: renesas,scif-r9a09g057

    then:

      properties:

        clocks:

          maxItems: 1



        clock-names:

          maxItems: 1



        interrupts:

          minItems: 9



        interrupt-names:

          minItems: 9



unevaluatedProperties: false



examples:

Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml

+17 −1
Original line number Diff line number Diff line
@@ -13,6 +13,20 @@ allOf: 
  - $ref: serial.yaml#

  - $ref: rs485.yaml#



  - if:

      properties:

        compatible:

          contains:

            const: starfive,jh7110-uart

    then:

      properties:

        resets:

          minItems: 2

    else:

      properties:

        resets:

          maxItems: 1



properties:

  compatible:

    oneOf:
@@ -48,6 +62,7 @@ properties: 
          - enum:

              - starfive,jh7100-hsuart

              - starfive,jh7100-uart

              - starfive,jh7110-uart

          - const: snps,dw-apb-uart

      - const: snps,dw-apb-uart
@@ -82,7 +97,8 @@ properties: 
    type: boolean



  resets:

    maxItems: 1

    minItems: 1

    maxItems: 2



  reg-shift: true