Commit 2494ad15 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-dt-for-5.10-1' of... 

Merge tag 'sunxi-dt-for-5.10-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt

Our usual bunch of patches to support the Allwinner SoCs, this time
adding:
  - Allwinner A100 initial support
  - Mali, DMA, cedrus and IR Support for the R40
  - Crypto support for the v3s
  - New board: Allwinner A100 Perf1

* tag 'sunxi-dt-for-5.10-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (24 commits)
  ARM: dts: sun8i: v3s: Enable crypto engine
  dt-bindings: crypto: Add compatible for V3s
  dt-bindings: crypto: Specify that allwinner, sun8i-a33-crypto needs reset
  arm64: dts: allwinner: a64: Update the audio codec compatible
  arm64: dts: allwinner: a64: Update codec widget names
  ARM: dts: sun8i: a33: Update codec widget names
  ARM: dts: sun8i: r40: Add video engine node
  ARM: dts: sun8i: r40: Add node for system controller
  dt-bindings: sram: allwinner, sun4i-a10-system-control: Add R40 compatibles
  ARM: dts: sun8i: r40: bananapi-m2-ultra: Enable IR
  ARM: dts: sun8i: r40: Add IR nodes
  dt-bindings: media: allwinner, sun4i-a10-ir: Add R40 compatible
  ARM: dts: sun8i: r40: Add DMA node
  dt-bindings: dma: allwinner,sun50i-a64-dma: Add R40 compatible
  arm64: allwinner: A100: add support for Allwinner Perf1 board
  dt-bindings: arm: sunxi: Add Allwinner A100 Perf1 Board bindings
  arm64: allwinner: A100: add the basical Allwinner A100 DTSI file
  dt-bindings: irq: sun7i-nmi: Add binding for A100's NMI controller
  dt-bindings: irq: sun7i-nmi: fix dt-binding for a80 nmi
  ARM: dts: sun4i: Enable HDMI support on the Mele A1000
  ...

Link: https://lore.kernel.org/r/ac39ee89-ea3a-4971-8cd7-8c4b2ecef39d.lettre@localhost


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d9dd2c60 96820e35

Documentation/devicetree/bindings/arm/sunxi.yaml

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ properties: 
  compatible:

    oneOf:



      - description: Allwinner A100 Perf1 Board

        items:

          - const: allwinner,a100-perf1

          - const: allwinner,sun50i-a100



      - description: Allwinner A23 Evaluation Board

        items:

          - const: allwinner,sun8i-a23-evb

Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml

+5 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ properties: 
      - items:

          - const: allwinner,sun7i-a20-crypto

          - const: allwinner,sun4i-a10-crypto

      - const: allwinner,sun8i-a33-crypto

      - items:

          - const: allwinner,sun8i-v3s-crypto

          - const: allwinner,sun8i-a33-crypto



  reg:
@@ -59,7 +61,9 @@ if: 
  properties:

    compatible:

      contains:

        const: allwinner,sun6i-a31-crypto

        enum:

          - allwinner,sun6i-a31-crypto

          - allwinner,sun8i-a33-crypto



then:

  required:

Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml

+6 −3
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ properties: 
    description: The cell is the request line number.



  compatible:

    enum:

      - allwinner,sun50i-a64-dma

      - allwinner,sun50i-h6-dma

    oneOf:

      - const: allwinner,sun50i-a64-dma

      - const: allwinner,sun50i-h6-dma

      - items:

          - const: allwinner,sun8i-r40-dma

          - const: allwinner,sun50i-a64-dma



  reg:

    maxItems: 1

Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
              - allwinner,sun4i-a10-mali

              - allwinner,sun7i-a20-mali

              - allwinner,sun8i-h3-mali

              - allwinner,sun8i-r40-mali

              - allwinner,sun50i-a64-mali

              - rockchip,rk3036-mali

              - rockchip,rk3066-mali
@@ -129,6 +130,7 @@ allOf: 
            enum:

              - allwinner,sun4i-a10-mali

              - allwinner,sun7i-a20-mali

              - allwinner,sun8i-r40-mali

              - allwinner,sun50i-a64-mali

              - allwinner,sun50i-h5-mali

              - amlogic,meson8-mali

Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml

+4 −1
Original line number Diff line number Diff line
@@ -29,10 +29,13 @@ properties: 
      - items:

          - const: allwinner,sun8i-a83t-r-intc

          - const: allwinner,sun6i-a31-r-intc

      - const: allwinner,sun9i-a80-sc-nmi

      - const: allwinner,sun9i-a80-nmi

      - items:

          - const: allwinner,sun50i-a64-r-intc

          - const: allwinner,sun6i-a31-r-intc

      - items:

          - const: allwinner,sun50i-a100-nmi

          - const: allwinner,sun9i-a80-nmi

      - items:

          - const: allwinner,sun50i-h6-r-intc

          - const: allwinner,sun6i-a31-r-intc

CRA Git | Maintained and supported by SUSTech CRA and CCSE