From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 May 2019 15:38:17 +0000 (-0700)
Subject: Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.2-rc1~45
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e8a1d70117116c8d96c266f0b99e931717670eaf;p=linux-2.6-block.git

Merge tag 'armsoc-dt' of git://git./linux/kernel/git/soc/soc

Pull ARM Device-tree updates from Olof Johansson:
 "Besides new bindings and additional descriptions of hardware blocks
  for various SoCs and boards, the main new contents here is:

  SoCs:
   - Intel Agilex (SoCFPGA)
   - NXP i.MX8MM (Quad Cortex-A53 with media/graphics focus)

  New boards:
   - Allwinner:
      + RerVision H3-DVK (H3)
      + Oceanic 5205 5inMFD (H6)
      + Beelink GS2 (H6)
      + Orange Pi 3 (H6)
   - Rockchip:
      + Orange Pi RK3399
      + Nanopi NEO4
      + Veyron-Mighty Chromebook variant
   - Amlogic:
      + SEI Robotics SEI510
   - ST Micro:
      + stm32mp157a discovery1
      + stm32mp157c discovery2
   - NXP:
      + Eckelmann ci4x10 (i.MX6DL)
      + i.MX8MM EVK (i.MX8MM)
      + ZII i.MX7 RPU2 (i.MX7)
      + ZII SPB4 (VF610)
      + Zii Ultra (i.MX8M)
      + TQ TQMa7S (i.MX7Solo)
      + TQ TQMa7D (i.MX7Dual)
      + Kobo Aura (i.MX50)
      + Menlosystems M53 (i.MX53)j
   - Nvidia:
      + Jetson Nano (Tegra T210)"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (593 commits)
  arm64: dts: bitmain: Add UART pinctrl support for Sophon Edge
  arm64: dts: bitmain: Add pinctrl support for BM1880 SoC
  arm64: dts: bitmain: Add GPIO Line names for Sophon Edge board
  arm64: dts: bitmain: Add GPIO support for BM1880 SoC
  ARM: dts: gemini: Indent DIR-685 partition table
  dt-bindings: hwmon (pwm-fan) Remove dead "cooling-*-state" properties
  ARM: dts: qcom-apq8064: Set 'cxo_board' as ref clock of the DSI PHY
  arm64: dts: msm8998: thermal: Restrict thermal zone name length to under 20
  arm64: dts: msm8998: thermal: Fix number of supported sensors
  arm64: dts: msm8998-mtp: thermal: Remove skin and battery thermal zones
  arm64: dts: exynos: Move fixed-clocks out of soc
  arm64: dts: exynos: Move pmu and timer nodes out of soc
  ARM: dts: s5pv210: Fix camera clock provider on Goni board
  ARM: dts: exynos: Properly override node to use MDMA0 on Universal C210
  ARM: dts: exynos: Move fixed-clocks out of soc on Exynos3250
  ARM: dts: exynos: Remove unneeded address/size cells from fixed-clock on Exynos3250
  ARM: dts: exynos: Move pmu and timer nodes out of soc
  arm64: dts: rockchip: fix IO domain voltage setting of APIO5 on rockpro64
  arm64: dts: db820c: Add sound card support
  arm64: dts: apq8096-db820c: Add HDMI display support
  ...
---

e8a1d70117116c8d96c266f0b99e931717670eaf
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index e0e216002efd,24a9290b8116..e9034a6c003a
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -55,7 -54,7 +55,8 @@@ avic	Shanghai AVIC Optoelectronics Co.
  avnet	Avnet, Inc.
  axentia	Axentia Technologies AB
  axis	Axis Communications AB
 +azoteq	Azoteq (Pty) Ltd
+ azw     Shenzhen AZW Technology Co., Ltd.
  bananapi BIPAI KEJI LIMITED
  bhf	Beckhoff Automation GmbH & Co. KG
  bitmain	Bitmain Technologies
@@@ -212,7 -211,7 +213,8 @@@ kiebackpeter    Kieback & Peter Gmb
  kinetic Kinetic Technologies
  kingdisplay	King & Display Technology Co., Ltd.
  kingnovel	Kingnovel Technology Co., Ltd.
 +kionix	Kionix, Inc.
+ kobo	Rakuten Kobo Inc.
  koe	Kaohsiung Opto-Electronics Inc.
  kosagi	Sutajio Ko-Usagi PTE Ltd.
  kyo	Kyocera Corporation
diff --cc arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
index 844eac939a97,1e479d06e67e..e030627159c6
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
@@@ -157,8 -157,12 +157,13 @@@
  	status = "okay";
  };
  
+ &gpu {
+ 	mali-supply = <&vdd_gpu>;
+ 	status = "okay";
+ };
+ 
  &hdmi {
 +	ddc-i2c-bus = <&i2c3>;
  	pinctrl-names = "default";
  	pinctrl-0 = <&hdmi_cec>;
  	status = "okay";