Commit 29a6387c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-5.12' of... 

Merge tag 'sunxi-dt-for-5.12' of git://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:
  - DT fixes spotted through the schemas
  - Mali Support for the A10s/A13/GR8/R8
  - MMC improvements for the A64 and H6
  - New board: SL631 Action Camera, PineTab Early Adopter

* tag 'sunxi-dt-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (47 commits)
  ARM: dts: sunxi: Rename nmi_intc to r_intc
  ARM: dts: sun8i: h2-plus: bananapi-m2-zero: Increase BT UART speed
  ARM: dts: sunxi: bananapi-m2-plus: Increase BT UART speed
  arm64: dts: allwinner: pine-h64: Fix typos in BT GPIOs
  arm64: dts: allwinner: pinetab: Fix the panel compatible
  arm64: dts: allwinner: pinephone: Remove useless light sensor supplies
  arm64: dts: allwinner: h6: Use - instead of @ for DT OPP entries
  ARM: dts: sun8i-a33: sina33: Add missing panel power supply
  ARM: dts: sun8i-a83t: Remove empty CSI port
  ARM: dts: sun8i-s3: pinecube: Fix CSI DTC warnings
  ARM: dts: sun8i-s3: impetus: Fix the USB PHY ID detect GPIO properties
  ARM: dts: sun8i: nanopi-r1: Fix GPIO regulator state array
  ARM: dts: sun6i: primo81: Remove useless io-channel-cells
  ARM: dts: sunxi: Fix CPU thermal zone node name
  ARM: dts: sunxi: Add missing backlight supply
  ARM: dts: sunxi: Fix the LED node names
  dt-bindings: rtc: sun6i-a31-rtc: Loosen the requirements on the clocks
  dt-bindings: iio: adc: Add AXP803 compatible
  dt-bindings: sunxi: Fix the pinecube compatible
  ARM: dts: sun8i-v3s: Add CSI0 MCLK pin definition
  ...

Link: https://lore.kernel.org/r/48511540-fdd6-4fbe-8037-ec9fa8436147.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c2f76057 2977fcb7

Documentation/devicetree/bindings/arm/sunxi.yaml

+17 −2
Original line number Diff line number Diff line
@@ -657,7 +657,8 @@ properties: 
      - description: Pine64 PineCube

        items:

          - const: pine64,pinecube

          - const: allwinner,sun8i-s3

          - const: sochip,s3

          - const: allwinner,sun8i-v3



      - description: Pine64 PineH64 model A

        items:
@@ -683,23 +684,31 @@ properties: 
      - description: Pine64 PinePhone Developer Batch (1.0)

        items:

          - const: pine64,pinephone-1.0

          - const: pine64,pinephone

          - const: allwinner,sun50i-a64



      - description: Pine64 PinePhone Braveheart (1.1)

        items:

          - const: pine64,pinephone-1.1

          - const: pine64,pinephone

          - const: allwinner,sun50i-a64



      - description: Pine64 PinePhone (1.2)

        items:

          - const: pine64,pinephone-1.2

          - const: pine64,pinephone

          - const: allwinner,sun50i-a64



      - description: Pine64 PineTab

      - description: Pine64 PineTab, Development Sample

        items:

          - const: pine64,pinetab

          - const: allwinner,sun50i-a64



      - description: Pine64 PineTab, Early Adopter's batch (and maybe later ones)

        items:

          - const: pine64,pinetab-early-adopter

          - const: allwinner,sun50i-a64



      - description: Pine64 SoPine Baseboard

        items:

          - const: pine64,sopine-baseboard
@@ -777,6 +786,12 @@ properties: 
          - const: sinlinx,sina33

          - const: allwinner,sun8i-a33



      - description: SL631 Action Camera with IMX179

        items:

          - const: allwinner,sl631-imx179

          - const: allwinner,sl631

          - const: allwinner,sun8i-v3



      - description: Tanix TX6

        items:

          - const: oranth,tanix-tx6

Documentation/devicetree/bindings/iio/adc/x-powers,axp209-adc.yaml

+8 −4
Original line number Diff line number Diff line
@@ -46,10 +46,14 @@ description: | 


properties:

  compatible:

    enum:

      - x-powers,axp209-adc

      - x-powers,axp221-adc

      - x-powers,axp813-adc

    oneOf:

      - const: x-powers,axp209-adc

      - const: x-powers,axp221-adc

      - const: x-powers,axp813-adc



      - items:

          - const: x-powers,axp803-adc

          - const: x-powers,axp813-adc



  "#io-channel-cells":

    const: 1

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

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

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

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

      - items:

          - const: allwinner,sun8i-v3s-nmi

          - const: allwinner,sun9i-a80-nmi

      - const: allwinner,sun9i-a80-nmi

      - items:

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

Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ properties: 
  compatible:

    oneOf:

      - const: allwinner,sun8i-h3-deinterlace

      - items:

          - const: allwinner,sun8i-r40-deinterlace

          - const: allwinner,sun8i-h3-deinterlace

      - items:

          - const: allwinner,sun50i-a64-deinterlace

          - const: allwinner,sun8i-h3-deinterlace

Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ required: 
  - compatible

  - reg

  - interrupts

  - clocks

  - clock-output-names



additionalProperties: false