Unverified Commit 8f8a7775 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-5.20-2' of... 

Merge tag 'sunxi-dt-for-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt

- added H616 EMAC compatible
- make pinctrl interrupts optionals in DT binding
- initial H616 DTSI
- added OrangePi Zero 2 board
- added X96 Mate TV box
- add VCC PI supply in pinctrl DT binding

* tag 'sunxi-dt-for-5.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: h616: Add X96 Mate TV box support
  arm64: dts: allwinner: h616: Add OrangePi Zero 2 board support
  dt-bindings: arm: sunxi: Add two H616 board compatible strings
  dt-bindings: pinctrl: sunxi: allow vcc-pi-supply
  arm64: dts: allwinner: Add Allwinner H616 .dtsi file
  dt-bindings: pinctrl: sunxi: Make interrupts optional
  dt-bindings: arm: sunxi: Add H616 EMAC0 compatible

Link: https://lore.kernel.org/r/YsnF9cm/qniIOklj@kista.localdomain


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a5959198 2c1e6299

Documentation/devicetree/bindings/arm/sunxi.yaml

+10 −0
Original line number Diff line number Diff line
@@ -863,6 +863,11 @@ properties: 
          - const: yones-toptech,bs1078-v2

          - const: allwinner,sun6i-a31s



      - description: X96 Mate TV box

        items:

          - const: hechuang,x96-mate

          - const: allwinner,sun50i-h616



      - description: Xunlong OrangePi

        items:

          - const: xunlong,orangepi
@@ -963,4 +968,9 @@ properties: 
          - const: xunlong,orangepi-zero-plus2-h3

          - const: allwinner,sun8i-h3



      - description: Xunlong OrangePi Zero 2

        items:

          - const: xunlong,orangepi-zero2

          - const: allwinner,sun50i-h616



additionalProperties: true

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ properties: 
          - enum:

              - allwinner,sun20i-d1-emac

              - allwinner,sun50i-h6-emac

              - allwinner,sun50i-h616-emac0

          - const: allwinner,sun50i-a64-emac



  reg:

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

+14 −4
Original line number Diff line number Diff line
@@ -127,20 +127,17 @@ patternProperties: 


    additionalProperties: false



  "^vcc-p[a-hlm]-supply$":

  "^vcc-p[a-ilm]-supply$":

    description:

      Power supplies for pin banks.



required:

  - "#gpio-cells"

  - "#interrupt-cells"

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names

  - gpio-controller

  - interrupt-controller



allOf:

  # FIXME: We should have the pin bank supplies here, but not a lot of
@@ -148,6 +145,19 @@ allOf: 
  # warnings.



  - $ref: "pinctrl.yaml#"

  - if:

      not:

        properties:

          compatible:

            enum:

              - allwinner,sun50i-h616-r-pinctrl



    then:

      required:

        - "#interrupt-cells"

        - interrupts

        - interrupt-controller



  - if:

      properties:

        compatible:

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -510,6 +510,8 @@ patternProperties: 
    description: Haoyu Microelectronic Co. Ltd.

  "^hardkernel,.*":

    description: Hardkernel Co., Ltd

  "^hechuang,.*":

    description: Shenzhen Hechuang Intelligent Co.

  "^hideep,.*":

    description: HiDeep Inc.

  "^himax,.*":

arch/arm64/boot/dts/allwinner/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -38,3 +38,5 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb 
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-model-b.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6-mini.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb