From 718cd8e0483af6f1cc0eb16718680c281d9f65b4 Mon Sep 17 00:00:00 2001
From: Peng Fan <peng.fan@nxp.com>
Date: Mon, 24 Feb 2020 15:33:40 +0800
Subject: [PATCH] MLK-23373-2 ARM64: dts: imx8mp-evk-root: fix jailhouse root
 dts

Fix jailhouse root dts to make it boot again.

Remove gpc
Disable cpuidle
Fix pinctrl
Add IMX8MP_CLK_HSIO_ROOT follow imx8mp-evk.dts

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
---
 .../boot/dts/freescale/imx8mp-evk-root.dts    | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-root.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-root.dts
index 1b68bb20e360..898dc706cf74 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-root.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk-root.dts
@@ -6,6 +6,8 @@
 #include "imx8mp-evk.dts"
 
 / {
+	interrupt-parent = <&gic>;
+
 	resmem: reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;
@@ -13,23 +15,22 @@
 	};
 };
 
-/*
 &cpu_pd_wait {
 	/delete-property/ compatible;
 };
-*/
+
+/delete-node/ &gpc;
 
 &clk {
 	init-on-array = <IMX8MP_CLK_USDHC3_ROOT
 			 IMX8MP_CLK_NAND_USDHC_BUS
+			 IMX8MP_CLK_HSIO_ROOT
 			 IMX8MP_CLK_UART4_ROOT>;
 };
 
-/*
 &{/busfreq} {
 	status = "disabled";
 };
-*/
 
 &{/reserved-memory} {
 	jh_reserved: jh@fdc00000 {
@@ -64,13 +65,11 @@
 };
 
 &iomuxc {
-	imx8mp-evk {
-		pinctrl_uart4: uart4grp {
-			fsl,pins = <
-				MX8MP_IOMUXC_UART4_RXD__UART4_DCE_RX	0x49
-				MX8MP_IOMUXC_UART4_TXD__UART4_DCE_TX	0x49
-			>;
-		};
+	pinctrl_uart4: uart4grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_UART4_RXD__UART4_DCE_RX	0x49
+			MX8MP_IOMUXC_UART4_TXD__UART4_DCE_TX	0x49
+		>;
 	};
 };
 
-- 
2.17.1