Unverified Commit 859dd6d3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- whitespace fixes
- replaced RTC indexes with constants
- gpio-key nodes aligned with dtschema
- fixed LED node for Orange Pi Win
- added OPP table for R40 CPU and thermal points
- updated I2C controller compatibles
- added compatibles for MBUS, D1 DE2 clocks, D1 USB
- enable internal HMIC bias on Pinephone

* tag 'sunxi-dt-for-5.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: pinephone: Enable internal HMIC bias
  dt-bindings: arm: sunxi: Add several MBUS compatibles
  dt-bindings: arm: sunxi: Default to the full MBUS binding
  dt-bindings: usb: generic-ohci: Add Allwinner D1 compatible
  dt-bindings: usb: generic-ehci: Add Allwinner D1 compatible
  dt-bindings: usb: sunxi-musb: Add Allwinner D1 compatible
  arm64: dts: allwinner: a100: Update I2C controller fallback
  dt-bindings: i2c: mv64xxx: Add variants with offload support
  ARM: dts: sun8i-r40: Add thermal trip points/cooling maps
  ARM: dts: sun8i-r40: add opp table for cpu
  ARM: dts: sun8i-r40: Add "cpu-supply" node for sun8i-r40 based board
  arm64: dts: allwinner: a64: orangepi-win: Fix LED node name
  dt-bindings: clock: Add compatible for D1 DE2 clocks
  ARM: dts: allwinner: align gpio-key node names with dtschema
  arm64: dts: allwinner: align gpio-key node names with dtschema
  arm64: dts: allwinner: Use constants for RTC clock indexes
  ARM: dts: sunxi: Use constants for RTC clock indexes
  ARM: dts: sun5i: adjust whitespace around '='

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5a75c295 aab941b8

Documentation/devicetree/bindings/arm/sunxi/allwinner,sun4i-a10-mbus.yaml

+17 −7
Original line number Diff line number Diff line
@@ -29,10 +29,20 @@ properties: 
  compatible:

    enum:

      - allwinner,sun5i-a13-mbus

      - allwinner,sun8i-a33-mbus

      - allwinner,sun8i-a50-mbus

      - allwinner,sun8i-a83t-mbus

      - allwinner,sun8i-h3-mbus

      - allwinner,sun8i-r40-mbus

      - allwinner,sun8i-v3s-mbus

      - allwinner,sun8i-v536-mbus

      - allwinner,sun20i-d1-mbus

      - allwinner,sun50i-a64-mbus

      - allwinner,sun50i-a100-mbus

      - allwinner,sun50i-h5-mbus

      - allwinner,sun50i-h6-mbus

      - allwinner,sun50i-h616-mbus

      - allwinner,sun50i-r329-mbus



  reg:

    minItems: 1
@@ -81,13 +91,13 @@ required: 
  - dma-ranges



if:

  not:

    properties:

      compatible:

        contains:

          enum:

          - allwinner,sun8i-h3-mbus

          - allwinner,sun50i-a64-mbus

          - allwinner,sun50i-h5-mbus

            - allwinner,sun5i-a13-mbus

            - allwinner,sun8i-r40-mbus



then:

  properties:

Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml

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

          - const: allwinner,sun8i-r40-de2-clk

          - const: allwinner,sun8i-h3-de2-clk

      - items:

          - const: allwinner,sun20i-d1-de2-clk

          - const: allwinner,sun50i-h5-de2-clk



  reg:

    maxItems: 1

Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml

+9 −1
Original line number Diff line number Diff line
@@ -21,10 +21,18 @@ properties: 
          - enum:

              - allwinner,sun8i-a23-i2c

              - allwinner,sun8i-a83t-i2c

              - allwinner,sun8i-v536-i2c

              - allwinner,sun50i-a64-i2c

              - allwinner,sun50i-a100-i2c

              - allwinner,sun50i-h6-i2c

          - const: allwinner,sun6i-a31-i2c

      - description: Allwinner SoCs with offload support

        items:

          - enum:

              - allwinner,sun20i-d1-i2c

              - allwinner,sun50i-a100-i2c

              - allwinner,sun50i-h616-i2c

              - allwinner,sun50i-r329-i2c

          - const: allwinner,sun8i-v536-i2c

          - const: allwinner,sun6i-a31-i2c

      - const: marvell,mv64xxx-i2c

      - const: marvell,mv78230-i2c

Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
      - items:

          - enum:

              - allwinner,sun8i-a83t-musb

              - allwinner,sun20i-d1-musb

              - allwinner,sun50i-h6-musb

          - const: allwinner,sun8i-a33-musb

      - items:

Documentation/devicetree/bindings/usb/generic-ehci.yaml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ properties: 
              - allwinner,sun8i-h3-ehci

              - allwinner,sun8i-r40-ehci

              - allwinner,sun9i-a80-ehci

              - allwinner,sun20i-d1-ehci

              - aspeed,ast2400-ehci

              - aspeed,ast2500-ehci

              - aspeed,ast2600-ehci