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

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

Pull tty / serial driver updates from Greg KH:
 "Here is a small set of tty and serial driver updates for 6.13-rc1.
  Nothing major at all this time, only some small changes:

   - few device tree binding updates

   - 8250_exar serial driver updates

   - imx serial driver updates

   - sprd_serial driver updates

   - other tiny serial driver updates, full details in the shortlog

  All of these have been in linux-next for a while with one reported
  issue, but that commit has now been reverted"

* tag 'tty-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (37 commits)
  Revert "serial: sh-sci: Clean sci_ports[0] after at earlycon exit"
  serial: amba-pl011: fix build regression
  dt-bindings: serial: Add a new compatible string for ums9632
  serial: sprd: Add support for sc9632
  tty/serial/altera_uart: unwrap error log string
  tty/serial/altera_jtaguart: unwrap error log string
  serial: amba-pl011: Fix RX stall when DMA is used
  tty: ldsic: fix tty_ldisc_autoload sysctl's proc_handler
  serial: 8250_fintek: Add support for F81216E
  serial: sh-sci: Clean sci_ports[0] after at earlycon exit
  tty: atmel_serial: Fix typo retreives to retrieves
  tty: atmel_serial: Use devm_platform_ioremap_resource()
  serial: 8250: omap: Move pm_runtime_get_sync
  tty: serial: samsung: Add Exynos8895 compatible
  dt-bindings: serial: samsung: Add samsung,exynos8895-uart compatible
  serial: 8250_dw: Add Sophgo SG2044 quirk
  dt-bindings: serial: snps-dw-apb-uart: Add Sophgo SG2044 uarts
  dt-bindings: serial: snps,dw-apb-uart: merge duplicate compatible entry.
  altera_jtaguart: Use dev_err() to report error attaching IRQ
  altera_uart: Use dev_err() to report error attaching IRQ handler
  ...
parents 2ba9f676 71863246

Documentation/devicetree/bindings/serial/rs485.yaml

+9 −10
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ properties: 
  rs485-rts-delay:

    description: prop-encoded-array <a b>

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

    items:

    items:

      - description: Delay between rts signal and beginning of data sent in

          milliseconds. It corresponds to the delay before sending data.

Documentation/devicetree/bindings/serial/samsung_uart.yaml

+12 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ properties: 
          - samsung,exynos4210-uart

          - samsung,exynos5433-uart

          - samsung,exynos850-uart

          - samsung,exynos8895-uart

      - items:

          - enum:

              - samsung,exynos7-uart
@@ -160,18 +161,27 @@ allOf: 
          contains:

            enum:

              - google,gs101-uart

              - samsung,exynos8895-uart

    then:

      required:

        - samsung,uart-fifosize

      properties:

        reg-io-width: false



        clocks:

          maxItems: 2



        clock-names:

          maxItems: 2



  - if:

      properties:

        compatible:

          contains:

            enum:

              - google,gs101-uart

    then:

      properties:

        reg-io-width: false



unevaluatedProperties: false



examples:

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

+5 −8
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ properties: 
          - const: renesas,rzn1-uart

      - items:

          - enum:

              - brcm,bcm11351-dw-apb-uart

              - brcm,bcm21664-dw-apb-uart

              - rockchip,px30-uart

              - rockchip,rk1808-uart

              - rockchip,rk3036-uart
@@ -48,18 +50,13 @@ properties: 
              - rockchip,rk3328-uart

              - rockchip,rk3368-uart

              - rockchip,rk3399-uart

              - rockchip,rk3528-uart

              - rockchip,rk3568-uart

              - rockchip,rk3576-uart

              - rockchip,rk3588-uart

              - rockchip,rv1108-uart

              - rockchip,rv1126-uart

          - const: snps,dw-apb-uart

      - items:

          - enum:

              - brcm,bcm11351-dw-apb-uart

              - brcm,bcm21664-dw-apb-uart

          - const: snps,dw-apb-uart

      - items:

          - enum:

              - sophgo,sg2044-uart

              - starfive,jh7100-hsuart

              - starfive,jh7100-uart

              - starfive,jh7110-uart

Documentation/devicetree/bindings/serial/sprd-uart.yaml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
    oneOf:

      - items:

          - enum:

              - sprd,sc9632-uart

              - sprd,sc9860-uart

              - sprd,sc9863a-uart

              - sprd,ums512-uart

drivers/mailbox/omap-mailbox.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/slab.h>

#include <linux/kfifo.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>