From: Olof Johansson <olof@lixom.net>
Date: Tue, 25 Jun 2019 11:52:55 +0000 (-0700)
Subject: Merge tag 'imx-dt64-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v5.3-rc1~19^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37937ee73ba4d24850df666261f5243d611d1cc5;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'imx-dt64-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt

i.MX arm64 device tree changes for 5.3:
 - Add i.MX8MQ based Librem5 devkit support.
 - Add SNVS power key support for i.MX8MQ and i.MX8MM.
 - Add GPIO alias for imx8mq and i.MX8QXP.
 - A series from Daniel Baluta to add SAI devices and enable audio
   support for imx8mm-evk board.
 - Add DDR performance monitor unit support for i.MX8QXP.
 - Add irqsteer interrupt controller device for i.MX8MQ SoC.
 - Add CPU speed grading and all OPPs for i.MX8MM and i.MX8MQ.
 - Add OCOTP device node for i.MX8QXP.
 - Various device addition for LS1028A: SATA, qDMA, USB, Mali DP500 and
   temperature sensor.
 - Random minor coding style improvements.

* tag 'imx-dt64-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (32 commits)
  arm64: dts: librem5: enable the SNVS power key
  arm64: dts: librem5: Limit the USB to 5V
  arm64: dts: imx8qxp: added ddr performance monitor nodes
  arm64: dts: imx8qxp: sort LSIO subsystem devices
  arm64: dts: imx8qxp: sort alias alphabetically
  arm64: dts: imx8qxp: Add lsio_mu13 node
  arm64: dts: imx8mm-evk: Enable audio codec wm8524
  arm64: dts: fsl: librem5: Add a device tree for the Librem5 devkit
  arm64: dts: fsl: ls1028a: Add qDMA node
  arm64: dts: imx8mm: Enable SNVS power key according to board design
  arm64: dts: imx8mq-evk: Enable SNVS power key
  arm64: dts: ls1028a: add crypto node
  arm64: dts: ls1028a: Add temperature sensor node
  arm64: dts: imx8mm: Move gic node into soc node
  arm64: dts: imx8mm: Move usbphy out of soc node
  arm64: dts: imx8mm: Pass the 'ranges' property
  arm64: dts: imx8mm: Pass a unit name for the 'soc' node
  arm64: dts: fsl: imx8mq: add the snvs power key node
  arm64: dts: ls1028a: fix watchdog device node
  arm64: dts: ls1028a: Enable sata.
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
---

37937ee73ba4d24850df666261f5243d611d1cc5
diff --cc arch/arm64/boot/dts/freescale/imx8mq.dtsi
index 72ee598856788,85008dc6e6633..d09b808eff87f
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@@ -433,10 -463,16 +463,18 @@@
  					offset = <0x34>;
  					interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
  						<GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
 +					clocks = <&clk IMX8MQ_CLK_SNVS_ROOT>;
 +					clock-names = "snvs-rtc";
  				};
  
+ 				snvs_pwrkey: snvs-powerkey {
+ 					compatible = "fsl,sec-v4.0-pwrkey";
+ 					regmap = <&snvs>;
+ 					interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+ 					linux,keycode = <KEY_POWER>;
+ 					wakeup-source;
+ 					status = "disabled";
+ 				};
  			};
  
  			clk: clock-controller@30380000 {