Commit 8e1e4955 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

  Lots of cleanups in here this cycle, and some driver updates. Short
  summary is:

   - Jiri's continued work to make the tty code and apis be a bit more
     sane with regards to modern kernel coding style and types

   - cpm_uart driver updates

   - n_gsm updates and fixes

   - meson driver updates

   - sc16is7xx driver updates

   - 8250 driver updates for different hardware types

   - qcom-geni driver fixes

   - tegra serial driver change

   - stm32 driver updates

   - synclink_gt driver cleanups

   - tty structure size reduction

  All of these have been in linux-next this week with no reported
  issues. The last bit of cleanups from Jiri and the tty structure size
  reduction came in last week, a bit late but as they were just style
  changes and size reductions, I figured they should get into this merge
  cycle so that others can work on top of them with no merge conflicts"

* tag 'tty-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (199 commits)
  tty: shrink the size of struct tty_struct by 40 bytes
  tty: n_tty: deduplicate copy code in n_tty_receive_buf_real_raw()
  tty: n_tty: extract ECHO_OP processing to a separate function
  tty: n_tty: unify counts to size_t
  tty: n_tty: use u8 for chars and flags
  tty: n_tty: simplify chars_in_buffer()
  tty: n_tty: remove unsigned char casts from character constants
  tty: n_tty: move newline handling to a separate function
  tty: n_tty: move canon handling to a separate function
  tty: n_tty: use MASK() for masking out size bits
  tty: n_tty: make n_tty_data::num_overrun unsigned
  tty: n_tty: use time_is_before_jiffies() in n_tty_receive_overrun()
  tty: n_tty: use 'num' for writes' counts
  tty: n_tty: use output character directly
  tty: n_tty: make flow of n_tty_receive_buf_common() a bool
  Revert "tty: serial: meson: Add a earlycon for the T7 SoC"
  Documentation: devices.txt: Fix minors for ttyCPM*
  Documentation: devices.txt: Remove ttySIOC*
  Documentation: devices.txt: Remove ttyIOC*
  serial: 8250_bcm7271: improve bcm7271 8250 port
  ...
parents e9259926 ebf05c7d

Documentation/admin-guide/devices.txt

+2 −14
Original line number Diff line number Diff line
@@ -2691,18 +2691,9 @@ 
		 45 = /dev/ttyMM1		Marvell MPSC - port 1 (obsolete unused)

		 46 = /dev/ttyCPM0		PPC CPM (SCC or SMC) - port 0

		    ...

		 49 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 3

		 50 = /dev/ttyIOC0		Altix serial card

		    ...

		 81 = /dev/ttyIOC31		Altix serial card

		 51 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 5

		 82 = /dev/ttyVR0		NEC VR4100 series SIU

		 83 = /dev/ttyVR1		NEC VR4100 series DSIU

		 84 = /dev/ttyIOC84		Altix ioc4 serial card

		    ...

		 115 = /dev/ttyIOC115		Altix ioc4 serial card

		 116 = /dev/ttySIOC0		Altix ioc3 serial card

		    ...

		 147 = /dev/ttySIOC31		Altix ioc3 serial card

		 148 = /dev/ttyPSC0		PPC PSC - port 0

		    ...

		 153 = /dev/ttyPSC5		PPC PSC - port 5
@@ -2761,10 +2752,7 @@ 
		 43 = /dev/ttycusmx2		Callout device for ttySMX2

		 46 = /dev/cucpm0		Callout device for ttyCPM0

		    ...

		 49 = /dev/cucpm5		Callout device for ttyCPM5

		 50 = /dev/cuioc40		Callout device for ttyIOC40

		    ...

		 81 = /dev/cuioc431		Callout device for ttyIOC431

		 51 = /dev/cucpm5		Callout device for ttyCPM5

		 82 = /dev/cuvr0		Callout device for ttyVR0

		 83 = /dev/cuvr1		Callout device for ttyVR1

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

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
              - amlogic,meson8b-uart

              - amlogic,meson-gx-uart

              - amlogic,meson-s4-uart

              - amlogic,meson-a1-uart

          - const: amlogic,meson-ao-uart

      - description: Always-on power domain UART controller on G12A SoCs

        items:
@@ -46,10 +47,15 @@ properties: 
          - amlogic,meson8b-uart

          - amlogic,meson-gx-uart

          - amlogic,meson-s4-uart

          - amlogic,meson-a1-uart

      - description: Everything-Else power domain UART controller on G12A SoCs

        items:

          - const: amlogic,meson-g12a-uart

          - const: amlogic,meson-gx-uart

      - description: UART controller on S4 compatible SoCs

        items:

          - const: amlogic,t7-uart

          - const: amlogic,meson-s4-uart



  reg:

    maxItems: 1

Documentation/devicetree/bindings/serial/fsl-lpuart.yaml

+5 −1
Original line number Diff line number Diff line
@@ -25,9 +25,13 @@ properties: 
          - fsl,imxrt1050-lpuart

      - items:

          - enum:

              - fsl,imx93-lpuart

              - fsl,imx8ulp-lpuart

          - const: fsl,imx7ulp-lpuart

      - items:

          - enum:

              - fsl,imx93-lpuart

          - const: fsl,imx8ulp-lpuart

          - const: fsl,imx7ulp-lpuart

      - items:

          - enum:

              - fsl,imx8qm-lpuart

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

+46 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ Optional properties: 
    1 = active low.

- irda-mode-ports: An array that lists the indices of the port that

		   should operate in IrDA mode.

- nxp,modem-control-line-ports: An array that lists the indices of the port that

				should have shared GPIO lines configured as

				modem control lines.



Example:

        sc16is750: sc16is750@51 {
@@ -35,6 +38,26 @@ Example: 
                #gpio-cells = <2>;

        };



	sc16is752: sc16is752@53 {

		compatible = "nxp,sc16is752";

		reg = <0x53>;

		clocks = <&clk20m>;

		interrupt-parent = <&gpio3>;

		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;

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

		gpio-controller; /* Port 0 as GPIOs */

		#gpio-cells = <2>;

	};



	sc16is752: sc16is752@54 {

		compatible = "nxp,sc16is752";

		reg = <0x54>;

		clocks = <&clk20m>;

		interrupt-parent = <&gpio3>;

		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;

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

	};



* spi as bus



Required properties:
@@ -59,6 +82,9 @@ Optional properties: 
    1 = active low.

- irda-mode-ports: An array that lists the indices of the port that

		   should operate in IrDA mode.

- nxp,modem-control-line-ports: An array that lists the indices of the port that

				should have shared GPIO lines configured as

				modem control lines.



Example:

	sc16is750: sc16is750@0 {
@@ -70,3 +96,23 @@ Example: 
		gpio-controller;

		#gpio-cells = <2>;

	};



	sc16is752: sc16is752@1 {

		compatible = "nxp,sc16is752";

		reg = <1>;

		clocks = <&clk20m>;

		interrupt-parent = <&gpio3>;

		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;

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

		gpio-controller; /* Port 0 as GPIOs */

		#gpio-cells = <2>;

	};



	sc16is752: sc16is752@2 {

		compatible = "nxp,sc16is752";

		reg = <2>;

		clocks = <&clk20m>;

		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/snps-dw-apb-uart.yaml

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ properties: 
required:

  - compatible

  - reg

  - interrupts



unevaluatedProperties: false