From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Aug 2018 21:02:22 +0000 (-0700)
Subject: Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.19~314
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f34a64aeac4d87e8ed8275d9f1230e18a50079c;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull ARM device-tree updates from Olof Johansson:
 "Business as usual -- the bulk of our changes are to devicetree files
  with new hardware support, new SoCs and platforms, and new board
  types.

  New SoCs/platforms:
   - Raspberry Pi Compute Module (CM1) and IO board
   - i.MX6SSL from NXP
   - Renesas RZ/N1D SoC (R9A06G032), Dual Cortex-A7 with Ethernet, CAN
     and PLC interfaces
   - TI AM654 SoC, Quad Cortex-A53, safety subsystem with Cortex-R5
     controllers, communication and PRU subsystem and lots of other
     interfaces (PCIe, USB3, etc).

  New boards and systems:
   - Several Atmel at91-based boards from Laird
   - Marvell Armada388-based Helios4 board from SolidRun
   - Samsung Aires-based phones (s5pv210)
   - Allwinner A64-based Pinebook laptop

  In addition to the above, there's the usual amount of new devices
  described on existing platforms, fixes and tweaks and new minor
  variants of boards/platforms"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (478 commits)
  arm64: dts: sdm845: Add tsens nodes
  arm64: dts: msm8996: thermal: Initialise via DT and add second controller
  arm64: dts: sprd: Add one suspend timer
  arm64: dts: sprd: Add SC27XX ADC device
  arm64: dts: sprd: Add SC27XX eFuse device
  arm64: dts: sprd: Add SC27XX vibrator device
  arm64: dts: sprd: Add SC27XX breathing light controller device
  arm64: dts: meson-axg: add spdif-dit codec
  arm64: dts: meson-axg: add lineout codec
  arm64: dts: meson-axg: add linein codec
  arm64: dts: meson-axg: add tdm interfaces
  arm64: dts: meson-axg: add tdmout formatters
  arm64: dts: meson-axg: add tdmin formatters
  arm64: dts: meson-axg: add spdifout
  arm64: dts: rockchip: add led support for Firefly-RK3399
  arm64: dts: rockchip: remove deprecated Type-C PHY properties on rk3399
  arm64: dts: rockchip: add power button support for Firefly-RK3399
  ARM: dts: aspeed: Add coprocessor interrupt controller
  arm64: dts: meson-axg: add audio arb reset controller
  arm64: dts: meson-axg: add usb power regulator
  ...
---

2f34a64aeac4d87e8ed8275d9f1230e18a50079c
diff --cc arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 851190a,fa79a5d..f432b0a
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@@ -1000,36 -1009,12 +1009,30 @@@
  			reset-gpios = <&gpio11 1 0 >;
  		};
  
 +		/* UFS */
 +		ufs: ufs@ff3b0000 {
 +			compatible = "hisilicon,hi3660-ufs", "jedec,ufs-1.1";
 +			/* 0: HCI standard */
 +			/* 1: UFS SYS CTRL */
 +			reg = <0x0 0xff3b0000 0x0 0x1000>,
 +				<0x0 0xff3b1000 0x0 0x1000>;
 +			interrupt-parent = <&gic>;
 +			interrupts = <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>;
 +			clocks = <&crg_ctrl HI3660_CLK_GATE_UFSIO_REF>,
 +				<&crg_ctrl HI3660_CLK_GATE_UFSPHY_CFG>;
 +			clock-names = "ref_clk", "phy_clk";
 +			freq-table-hz = <0 0>, <0 0>;
 +			/* offset: 0x84; bit: 12 */
 +			resets = <&crg_rst 0x84 12>;
 +			reset-names = "rst";
 +		};
 +
  		/* SD */
  		dwmmc1: dwmmc1@ff37f000 {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			cd-inverted;
  			compatible = "hisilicon,hi3660-dw-mshc";
- 			bus-width = <0x4>;
- 			disable-wp;
- 			cap-sd-highspeed;
- 			supports-highspeed;
- 			card-detect-delay = <200>;
  			reg = <0x0 0xff37f000 0x0 0x1000>;
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
  			interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&crg_ctrl HI3660_CLK_GATE_SD>,
  				<&crg_ctrl HI3660_HCLK_GATE_SD>;