Commit b0545d11 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Our usual bunch of patches to improve the Allwinner SoCs support,
mainly:
  - I2S Support for the V3
  - Audio Codec Support for the V3s
  - DMA support for the V3s
  - PWM support for the V3s
  - Support for Bluetooth Audio on the pinephone
  - Add A10-like timers to the A64 and R40
  - New boards: Forlinx OKA40i-C, Forlinx OKA40i-C, NanoPi R1S H5

* tag 'sunxi-dt-for-5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (29 commits)
  ARM: dts: sun8i: v3s: enable emac for zero Dock
  arm64: dts: allwinner: pinephone: Set audio card name
  ARM: dts: sun8i: r40: Add timer node
  ARM: dts: sun8i: V3: add I2S interface to V3 dts
  dt-bindings: sound: sun4i-i2s: add Allwinner V3 I2S compatible
  ARM: dts: sun8i: V3: add codec analog frontend to V3 dts
  ASoC: dt-bindings: sun8i-a23-codec-analog: add compatible for Allwinner V3
  ARM: dts: sun8i: v3s: add analog codec and frontend to v3s dts
  ARM: dts: sun8i: v3s: add DMA properties to peripherals supporting DMA
  ARM: dts: sun8i: v3s: add DMA controller to v3s dts
  ARM: dts: sun8i: v3s: add pwm controller to v3s dts
  dt-bindings: pwm: allwinner: add v3s pwm compatible
  arm64: dts: allwinner: h5: Add NanoPi R1S H5 support
  dt-bindings: arm: Add NanoPi R1S H5
  arm64: dts: allwinner: pinephone: Add support for Bluetooth audio
  arm64: dts: allwinner: a64: Allow multiple DAI links
  arm64: dts: allwinner: a64: Add pinmux nodes for AIF2/AIF3
  arm64: dts: allwinner: a64: Allow using multiple codec DAIs
  ARM: dts: sun8i-a33: Allow using multiple codec DAIs
  ASoC: dt-bindings: sun8i-codec: Increase #sound-dai-cells
  ...

Link: https://lore.kernel.org/r/96cc77ec-139d-4685-8a66-a60964cf39fd.lettre@localhost


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9495e151 d42b3e04

Documentation/devicetree/bindings/arm/sunxi.yaml

+11 −0
Original line number Diff line number Diff line
@@ -224,6 +224,12 @@ properties: 
          - const: empire-electronix,m712

          - const: allwinner,sun5i-a13



      - description: Forlinx OKA40i-C Development board

        items:

          - const: forlinx,oka40i-c

          - const: forlinx,feta40i-c

          - const: allwinner,sun8i-r40



      - description: FriendlyARM NanoPi A64

        items:

          - const: friendlyarm,nanopi-a64
@@ -269,6 +275,11 @@ properties: 
          - const: friendlyarm,nanopi-r1

          - const: allwinner,sun8i-h3



      - description: FriendlyARM NanoPi R1S H5

        items:

          - const: friendlyarm,nanopi-r1s-h5

          - const: allwinner,sun50i-h5



      - description: FriendlyARM ZeroPi

        items:

          - const: friendlyarm,zeropi

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

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ properties: 
      - items:

          - const: allwinner,sun8i-a83t-pwm

          - const: allwinner,sun8i-h3-pwm

      - items:

          - const: allwinner,sun8i-v3s-pwm

          - const: allwinner,sun7i-a20-pwm

      - items:

          - const: allwinner,sun50i-a64-pwm

          - const: allwinner,sun5i-a13-pwm

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ properties: 
      - const: allwinner,sun6i-a31-i2s

      - const: allwinner,sun8i-a83t-i2s

      - const: allwinner,sun8i-h3-i2s

      - items:

          - const: allwinner,sun8i-v3-i2s

          - const: allwinner,sun8i-h3-i2s

      - const: allwinner,sun50i-a64-codec-i2s

      - items:

          - const: allwinner,sun50i-a64-i2s

Documentation/devicetree/bindings/sound/allwinner,sun8i-a23-codec-analog.yaml

+6 −3
Original line number Diff line number Diff line
@@ -12,12 +12,15 @@ maintainers: 


properties:

  compatible:

    enum:

    oneOf:

      # FIXME: This is documented in the PRCM binding, but needs to be

      # migrated here at some point

      # - allwinner,sun8i-a23-codec-analog

      - allwinner,sun8i-h3-codec-analog

      - allwinner,sun8i-v3s-codec-analog

      - const: allwinner,sun8i-h3-codec-analog

      - items:

          - const: allwinner,sun8i-v3-codec-analog

          - const: allwinner,sun8i-h3-codec-analog

      - const: allwinner,sun8i-v3s-codec-analog



  reg:

    maxItems: 1

Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml

+6 −2
Original line number Diff line number Diff line
@@ -12,7 +12,11 @@ maintainers: 


properties:

  "#sound-dai-cells":

    const: 0

    minimum: 0

    maximum: 1

    description:

      A value of 0 is deprecated. When used, it only allows access to

      the ADC/DAC and AIF1 (the CPU DAI), not the other two AIFs/DAIs.



  compatible:

    oneOf:
@@ -50,7 +54,7 @@ additionalProperties: false 
examples:

  - |

    audio-codec@1c22e00 {

      #sound-dai-cells = <0>;

      #sound-dai-cells = <1>;

      compatible = "allwinner,sun8i-a33-codec";

      reg = <0x01c22e00 0x400>;

      interrupts = <0 29 4>;