Commit 19748e26 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.15-rockchip-dts32-1' of... 

Merge tag 'v4.15-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

Pull "Rockchip dts32 updates for 4.15 part1" from Heiko Stübner:

One new board the Vyasa from Amarula Solutions using a rk3288
and core lvds node for the newly added driver+binding.
Also bindings + nodes for the Mali-Utgard GPUs found on some
Rockchip socs like rk3036 and rk3188. With the recently revived
Lima project they can even render a red triangle to a png file.

* tag 'v4.15-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Enable thermal on rk3288-vyasa board
  ARM: dts: rockchip: fix mali400 ppmmu interrupt names
  ARM: dts: rockchip: Enable mali GPU node on rk3288-vyasa
  ARM: dts: rockchip: enable gpu on rk3188-radxarock
  ARM: dts: rockchip: add gpu nodes on rk3066/rk3188
  ARM: dts: rockchip: add rk322x gpu node
  ARM: dts: rockchip: enable the gpu on rk3036-kylin boards
  ARM: dts: rockchip: add rk3036 gpu node
  dt-bindings: gpu: mali-utgard: add optional power-domain reference
  dt-bindings: gpu: mali-utgard: add optional supply regulator
  dt-bindings: gpu: mali-utgard: Add Rockchip Utgard Malis
  ARM: dts: rockchip: enable vops and hdmi output on rk3288-vyasa
  ARM: dts: rockchip: Add rk3288 vyasa board
  dt-bindings: Add vendor prefix for Amarula Solutions
  ARM: dts: rockchip: add LVDS node for rk3288
parents 7d738dbb 345b40f1

Documentation/devicetree/bindings/arm/rockchip.txt

+4 −0
Original line number Diff line number Diff line 
Rockchip platforms device tree bindings

---------------------------------------

- Amarula Vyasa RK3288 board

    Required root node properties:

      - compatible = "amarula,vyasa-rk3288", "rockchip,rk3288";



- Asus Tinker board

    Required root node properties:

      - compatible = "asus,rk3288-tinker", "rockchip,rk3288";

Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt

+16 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ Required properties: 
      + allwinner,sun50i-h5-mali

      + amlogic,meson-gxbb-mali

      + amlogic,meson-gxl-mali

      + rockchip,rk3036-mali

      + rockchip,rk3066-mali

      + rockchip,rk3188-mali

      + rockchip,rk3228-mali

      + stericsson,db8500-mali



  - reg: Physical base address and length of the GPU registers
@@ -40,10 +44,18 @@ Optional properties: 
    Memory region to allocate from, as defined in

    Documentation/devicetree/bindi/reserved-memory/reserved-memory.txt



  - mali-supply:

    Phandle to regulator for the Mali device, as defined in

    Documentation/devicetree/bindings/regulator/regulator.txt for details.



  - operating-points-v2:

    Operating Points for the GPU, as defined in

    Documentation/devicetree/bindings/opp/opp.txt



  - power-domains:

    A power domain consumer specifier as defined in

    Documentation/devicetree/bindings/power/power_domain.txt



Vendor-specific bindings

------------------------
@@ -63,6 +75,10 @@ to specify one more vendor-specific compatible, among: 
    Required properties:

      * resets: phandle to the reset line for the GPU



  - Rockchip variants:

    Required properties:

      * resets: phandle to the reset line for the GPU



  - stericsson,db8500-mali

    Required properties:

      * interrupt-names and interrupts:

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ al Annapurna Labs 
allwinner	Allwinner Technology Co., Ltd.

alphascale	AlphaScale Integrated Circuits Systems, Inc.

altr	Altera Corp.

amarula	Amarula Solutions

amazon	Amazon.com, Inc.

amcc	Applied Micro Circuits Corporation (APM, formally AMCC)

amd	Advanced Micro Devices (AMD), Inc.

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -771,7 +771,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 
	rk3288-veyron-mickey.dtb \

	rk3288-veyron-minnie.dtb \

	rk3288-veyron-pinky.dtb \

	rk3288-veyron-speedy.dtb

	rk3288-veyron-speedy.dtb \

	rk3288-vyasa.dtb

dtb-$(CONFIG_ARCH_S3C24XX) += \

	s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_S3C64XX) += \

arch/arm/boot/dts/rk3036-kylin.dts

+5 −0
Original line number Diff line number Diff line
@@ -135,6 +135,11 @@ 
	status = "okay";

};



&gpu {

	mali-supply = <&vdd_gpu>;

	status = "okay";

};



&hdmi {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE