Commit d29600ae authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Allwinner Device Tree Changes for v5.7

A fairly large set of changes for v5.7, including some new devices.

SoC specific changes:

  - SPI on H6 SoC enabled
  - Thermal sensor on R40 SoC enabled
  - Deinterlace core hardware on A64 SoC enabled
  - Redundant assigned-clocks properties removed
    - required clock rates are now enforced by drivers
  - LVDS panel support on A20 SoC enabled
  - PMU compatible fixed for H5 and H6 SoCs
  - Thermal trip points added for A83T and H5 SoCs
  - (Image) Rotation core hardware on A83T and A64 SoCs enabled

Device specific changes:

  - Pine64 PineTab and PinePhone added
  - Various cleanups and improvements for Pine64 PineBook
  - GPIO pin bank regulator supplies added for A64-OlinXino
  - eMMC enabled on Orange Pi 3
  - PocketBook Touch Lux 3 added
  - Linutronix Testbox v2 added
  - Ethernet enabled on Orange Pi One Plus
  - HDMI enabled on H6-based Orange Pi boards

* tag 'sunxi-dt-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (46 commits)
  arm64: dts: allwinner: a64: add node for rotation core
  ARM: dts: sun8i: a83t: Add device node for rotation core
  arm64: dts: allwinner: a64: Fix display clock register range
  ARM: dts: sunxi: Fix DE2 clocks register range
  arm64: dts: allwinner: h6: orangepi: Enable HDMI
  arm64: dts: allwinner: h6: orangepi-one-plus: Enable ethernet
  arm64: dts: allwinner: h6: Move ext. oscillator to board DTs
  arm64: dts: allwinner: Add initial support for Pine64 PinePhone
  dt-bindings: arm: sunxi: Add PinePhone 1.0 and 1.1 bindings
  arm64: dts: sun50i-a64: Add i2c2 pins
  ARM: dts: sunxi: h3/h5: add r_pwm node
  arm64: allwinner: a64: enable LCD-related hardware for Pinebook
  ARM: dts: sun8i-a83t: Add thermal trip points/cooling maps
  ARM: dts: sun8i-h3: Add thermal trip points/cooling maps
  arm64: dts: allwinner: h6: Fix PMU compatible
  arm64: dts: allwinner: h5: Fix PMU compatible
  ARM: dts: sun8i-a83t-tbs-a711: Drop superfluous dr_mode
  arm64: dts: sun50i-h5-orange-pi-pc2: Add CPUX voltage regulator
  ARM: dts: sun5i: Add PocketBook Touch Lux 3 support
  dt-bindings: arm: sunxi: Add PocketBook Touch Lux 3
  ...

Link: https://lore.kernel.org/r/20200313055459.GA19820@wens.csie.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b0f9a311 048cdfce

Documentation/devicetree/bindings/arm/sunxi.yaml

+26 −0
Original line number Diff line number Diff line
@@ -394,6 +394,12 @@ properties: 
          - const: linksprite,pcduino3-nano

          - const: allwinner,sun7i-a20



      - description: Linutronix Testbox v2

        items:

          - const: linutronix,testbox-v2

          - const: lamobo,lamobo-r1

          - const: allwinner,sun7i-a20



      - description: HAOYU Electronics Marsboard A10

        items:

          - const: haoyu,a10-marsboard
@@ -636,6 +642,21 @@ properties: 
          - const: pine64,pinebook

          - const: allwinner,sun50i-a64



      - description: Pine64 PinePhone Developer Batch (1.0)

        items:

          - const: pine64,pinephone-1.0

          - const: allwinner,sun50i-a64



      - description: Pine64 PinePhone Braveheart (1.1)

        items:

          - const: pine64,pinephone-1.1

          - const: allwinner,sun50i-a64



      - description: Pine64 PineTab

        items:

          - const: pine64,pinetab

          - const: allwinner,sun50i-a64



      - description: Pine64 SoPine Baseboard

        items:

          - const: pine64,sopine-baseboard
@@ -647,6 +668,11 @@ properties: 
          - const: pineriver,mini-xplus

          - const: allwinner,sun4i-a10



      - description: PocketBook Touch Lux 3

        items:

          - const: pocketbook,touch-lux-3

          - const: allwinner,sun5i-a13



      - description: Point of View Protab2-IPS9

        items:

          - const: pov,protab2-ips9

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

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

      - allwinner,sun5i-a13-mbus

      - allwinner,sun8i-h3-mbus

      - allwinner,sun50i-a64-mbus



  reg:

    maxItems: 1

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

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ description: |- 


properties:

  compatible:

    const: allwinner,sun8i-h3-deinterlace

    oneOf:

      - const: allwinner,sun8i-h3-deinterlace

      - items:

        - const: allwinner,sun50i-a64-deinterlace

        - const: allwinner,sun8i-h3-deinterlace



  reg:

    maxItems: 1

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

+8 −3
Original line number Diff line number Diff line
@@ -18,9 +18,14 @@ properties: 
  "#size-cells": true



  compatible:

    enum:

      - allwinner,sun6i-a31-spi

      - allwinner,sun8i-h3-spi

    oneOf:

      - const: allwinner,sun6i-a31-spi

      - const: allwinner,sun8i-h3-spi

      - items:

        - enum:

          - allwinner,sun8i-r40-spi

          - allwinner,sun50i-h6-spi

        - const: allwinner,sun8i-h3-spi



  reg:

    maxItems: 1

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \ 
	sun5i-a13-licheepi-one.dtb \

	sun5i-a13-olinuxino.dtb \

	sun5i-a13-olinuxino-micro.dtb \

	sun5i-a13-pocketbook-touch-lux-3.dtb \

	sun5i-a13-q8-tablet.dtb \

	sun5i-a13-utoo-p66.dtb \

	sun5i-gr8-chip-pro.dtb \
@@ -1086,6 +1087,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-i12-tvbox.dtb \

	sun7i-a20-icnova-swac.dtb \

	sun7i-a20-lamobo-r1.dtb \

	sun7i-a20-linutronix-testbox-v2.dtb \

	sun7i-a20-m3.dtb \

	sun7i-a20-mk808c.dtb \

	sun7i-a20-olimex-som-evb.dtb \

CRA Git | Maintained and supported by SUSTech CRA and CCSE