From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 May 2017 17:07:33 +0000 (-0700)
Subject: Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: MMI-PSA29.97-13-9~5637
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c6778ff813d2ca3e3c8733c87dc8b6831a64578b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull ARM 64-bit DT updates from Olof Johansson:
 "Device-tree updates for arm64 platforms. Just as with 32-bit, a bunch
  of smaller changes, but also some new platforms that are worth
  mentioning:

   - Rockchip RK3399 platforms for Chromebooks, including Samsung
     Chromebook Plus (Kevin)

   - Orange Pi PC2 (Allwinner H5)

   - Freescale LS2088A and LS1088A SoCs

   - Expanded support for Nvidia Tegra186 (and Jetson TX2)"

* tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (180 commits)
  arm64: dts: Add basic DT to support Spreadtrum's SP9860G
  arm64: dts: exynos: Use - instead of @ for DT OPP entries
  arm64: dts: exynos: Add support for s6e3hf2 panel device on TM2e board
  arm64: dts: juno: add information about L1 and L2 caches
  arm64: dts: juno: fix few unit address format warnings
  arm64: marvell: dts: enable the crypto engine on the Armada 8040 DB
  arm64: marvell: dts: enable the crypto engine on the Armada 7040 DB
  arm64: marvell: dts: add crypto engine description for 7k/8k
  arm64: dts: marvell: add sdhci support for Armada 7K/8K
  arm64: dts: marvell: add eMMC support for Armada 37xx
  arm64: dts: hisi: add pinctrl dtsi file for HiKey960 development board
  arm64: dts: hisi: add drive strength levels of the pins for Hi3660 SoC
  arm64: dts: hisi: enable the NIC and SAS for the hip07-d05 board
  arm64: dts: hisi: add SAS nodes for the hip07 SoC
  arm64: dts: hisi: add RoCE nodes for the hip07 SoC
  arm64: dts: hisi: add network related nodes for the hip07 SoC
  arm64: dts: hisi: add mbigen nodes for the hip07 SoC
  arm64: dts: rockchip: fix the memory size of PX5 Evaluation board
  arm64: dts: hisilicon: add dts files for hi3798cv200-poplar board
  dt-bindings: arm: hisilicon: add bindings for hi3798cv200 SoC and Poplar board
  ...
---

c6778ff813d2ca3e3c8733c87dc8b6831a64578b
diff --cc arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index a375cb21cc8b,4afe1c46ec11..86105a69690a
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@@ -525,7 -621,14 +621,19 @@@
  	compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
  };
  
 +&hwrng {
 +	clocks = <&clkc CLKID_RNG0>;
 +	clock-names = "core";
 +};
++
+ &hdmi_tx {
+ 	compatible = "amlogic,meson-gxbb-dw-hdmi", "amlogic,meson-gx-dw-hdmi";
+ 	resets = <&reset RESET_HDMITX_CAPB3>,
+ 		 <&reset RESET_HDMI_SYSTEM_RESET>,
+ 		 <&reset RESET_HDMI_TX>;
+ 	reset-names = "hdmitx_apb", "hdmitx", "hdmitx_phy";
+ 	clocks = <&clkc CLKID_HDMI_PCLK>,
+ 		 <&clkc CLKID_CLK81>,
+ 		 <&clkc CLKID_GCLK_VENCI_INT0>;
+ 	clock-names = "isfr", "iahb", "venci";
+ };
diff --cc include/dt-bindings/clock/gxbb-clkc.h
index 63f4c2c44a1f,cce6cb5418f1..3190e30b9398
--- a/include/dt-bindings/clock/gxbb-clkc.h
+++ b/include/dt-bindings/clock/gxbb-clkc.h
@@@ -10,13 -10,17 +10,18 @@@
  #define CLKID_FCLK_DIV2		4
  #define CLKID_FCLK_DIV3		5
  #define CLKID_FCLK_DIV4		6
+ #define CLKID_GP0_PLL		9
  #define CLKID_CLK81		12
  #define CLKID_MPLL2		15
 -#define CLKID_SPI		34
  #define CLKID_I2C		22
  #define CLKID_SAR_ADC		23
 +#define CLKID_RNG0		25
 +#define CLKID_SPI		34
  #define CLKID_ETH		36
+ #define CLKID_AIU_GLUE		38
+ #define CLKID_I2S_OUT		40
+ #define CLKID_MIXER_IFACE	44
+ #define CLKID_AIU		47
  #define CLKID_USB0		50
  #define CLKID_USB1		51
  #define CLKID_USB		55