From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Jul 2019 00:19:24 +0000 (-0700)
Subject: Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.3-rc1~19
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=af6af87d7e4ff67324425daa699b9cda32e3161d

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

Pull ARM Devicetree updates from Olof Johansson:
 "We continue to see a lot of new material. I've highlighted some of it
  below, but there's been more beyond that as well.

  One of the sweeping changes is that many boards have seen their ARM
  Mali GPU devices added to device trees, since the DRM drivers have now
  been merged.

  So, with the caveat that I have surely missed several great
  contributions, here's a collection of the material this time around:

  New SoCs:

   - Mediatek mt8183 (4x Cortex-A73 + 4x Cortex-A53)

   - TI J721E (2x Cortex-A72 + 3x Cortex-R5F + 3 DSPs + MMA)

   - Amlogic G12B (4x Cortex-A73 + 2x Cortex-A53)

  New Boards / platforms:

   - Aspeed BMC support for a number of new server platforms

   - Kontron SMARC SoM (several i.MX6 versions)

   - Novtech's Meerkat96 (i.MX7)

   - ST Micro Avenger96 board

   - Hardkernel ODROID-N2 (Amlogic G12B)

   - Purism Librem5 devkit (i.MX8MQ)

   - Google Cheza (Qualcomm SDM845)

   - Qualcomm Dragonboard 845c (Qualcomm SDM845)

   - Hugsun X99 TV Box (Rockchip RK3399)

   - Khadas Edge/Edge-V/Captain (Rockchip RK3399)

  Updated / expanded boards and platforms:

   - Renesas r7s9210 has a lot of new peripherals added

   - Fixes and polish for Rockchip-based Chromebooks

   - Amlogic G12A has a lot of peripherals added

   - Nvidia Jetson Nano sees various fixes and improvements, and is now
     at feature parity with TX1"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (586 commits)
  ARM: dts: gemini: Set DIR-685 SPI CS as active low
  ARM: dts: exynos: Adjust buck[78] regulators to supported values on Arndale Octa
  ARM: dts: exynos: Adjust buck[78] regulators to supported values on Odroid XU3 family
  ARM: dts: exynos: Move Mali400 GPU node to "/soc"
  ARM: dts: exynos: Fix imprecise abort on Mali GPU probe on Exynos4210
  arm64: dts: qcom: qcs404: Add missing space for cooling-cells property
  arm64: dts: rockchip: Fix USB3 Type-C on rk3399-sapphire
  arm64: dts: rockchip: Update DWC3 modules on RK3399 SoCs
  arm64: dts: rockchip: enable rk3328 watchdog clock
  ARM: dts: rockchip: add display nodes for rk322x
  ARM: dts: rockchip: fix vop iommu-cells on rk322x
  arm64: dts: rockchip: Add support for Hugsun X99 TV Box
  arm64: dts: rockchip: Define values for the IPA governor for rock960
  arm64: dts: rockchip: Fix multiple thermal zones conflict in rk3399.dtsi
  arm64: dts: rockchip: add core dtsi file for RK3399Pro SoCs
  arm64: dts: rockchip: improve rk3328-roc-cc rgmii performance.
  Revert "ARM: dts: rockchip: set PWM delay backlight settings for Minnie"
  ARM: dts: rockchip: Configure BT_DEV_WAKE in on rk3288-veyron
  arm64: dts: qcom: sdm845-cheza: add initial cheza dt
  ARM: dts: msm8974-FP2: Add vibration motor
  ...
---

af6af87d7e4ff67324425daa699b9cda32e3161d
diff --cc Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
index e5ad3b2afe17,c000d224b4e0..9b298edec5b2
--- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
@@@ -15,8 -15,8 +15,9 @@@ Required properties
      + "arm,mali-t860"
      + "arm,mali-t880"
    * which must be preceded by one of the following vendor specifics:
 +    + "allwinner,sun50i-h6-mali"
      + "amlogic,meson-gxm-mali"
+     + "samsung,exynos5433-mali"
      + "rockchip,rk3288-mali"
      + "rockchip,rk3399-mali"
  
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index eade302345a3,d866253b0314..6992bbbbffab
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -395,16 -371,16 +395,20 @@@ patternProperties
      description: Holt Integrated Circuits, Inc.
    "^honeywell,.*":
      description: Honeywell
+   "^hoperun,.*":
+     description: Jiangsu HopeRun Software Co., Ltd.
    "^hp,.*":
      description: Hewlett Packard
 +  "^hsg,.*":
 +    description: HannStar Display Co.
    "^holtek,.*":
      description: Holtek Semiconductor, Inc.
+   "^hugsun,.*":
+     description: Shenzhen Hugsun Technology Co. Ltd.
    "^hwacom,.*":
      description: HwaCom Systems Inc.
 +  "^hyundai,.*":
 +    description: Hyundai Technology
    "^i2se,.*":
      description: I2SE GmbH
    "^ibm,.*":
diff --cc arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 22a1c74dddf3,8d03b9c950e1..7975519b4f56
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@@ -431,12 -536,23 +536,29 @@@
  				compatible = "fsl,enetc";
  				reg = <0x000100 0 0 0 0>;
  			};
 +			ethernet@0,4 {
 +				compatible = "fsl,enetc-ptp";
 +				reg = <0x000400 0 0 0 0>;
 +				clocks = <&clockgen 4 0>;
 +				little-endian;
 +			};
  		};
  	};
+ 
+ 	malidp0: display@f080000 {
+ 		compatible = "arm,mali-dp500";
+ 		reg = <0x0 0xf080000 0x0 0x10000>;
+ 		interrupts = <0 222 IRQ_TYPE_LEVEL_HIGH>,
+ 			     <0 223 IRQ_TYPE_LEVEL_HIGH>;
+ 		interrupt-names = "DE", "SE";
+ 		clocks = <&dpclk>, <&aclk>, <&aclk>, <&pclk>;
+ 		clock-names = "pxlclk", "mclk", "aclk", "pclk";
+ 		arm,malidp-output-port-lines = /bits/ 8 <8 8 8>;
+ 
+ 		port {
+ 			dp0_out: endpoint {
+ 
+ 			};
+ 		};
+ 	};
  };