MLK-23626-1 arm64: dts: imx8mm: let inmate dts do not include .dtsi

Rewrite inmate dts for jailhouse dual linux case.

Signed-off-by: Alice Guo <alice.guo@nxp.com>

1 files changed, 87 insertions, 126 deletions

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk-inmate.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk-inmate.dts
index 1896f9b6d76e..74025416a396 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm-evk-inmate.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mm-evk-inmate.dts
@@ -5,12 +5,58 @@
 
 /dts-v1/;
 
-#include "imx8mm.dtsi"
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 
 / {
 	model = "Freescale i.MX8MM EVK";
 	compatible = "fsl,imx8mm-evk", "fsl,imx8mm";
 	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	aliases {
+		serial3 = &uart4;
+		mmc2 = &usdhc3;
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		A53_2: cpu@2 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			reg = <0x2>;
+			clock-latency = <61036>; /* two CLK32 periods */
+			next-level-cache = <&A53_L2>;
+			enable-method = "psci";
+			#cooling-cells = <2>;
+		};
+
+		A53_3: cpu@3 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			reg = <0x3>;
+			clock-latency = <61036>; /* two CLK32 periods */
+			next-level-cache = <&A53_L2>;
+			enable-method = "psci";
+			#cooling-cells = <2>;
+		};
+
+		A53_L2: l2-cache0 {
+			compatible = "cache";
+		};
+	};
+
+	gic: interrupt-controller@38800000 {
+		compatible = "arm,gic-v3";
+		reg = <0x0 0x38800000 0 0x10000>, /* GIC Dist */
+		      <0x0 0x38880000 0 0xC0000>; /* GICR (RD_base + SGI_base) */
+		#interrupt-cells = <3>;
+		interrupt-controller;
+		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-parent = <&gic>;
+	};
 
 	timer {
 		compatible = "arm,armv8-timer";
@@ -48,8 +94,11 @@
 		clock-output-names = "80m";
 	};
 
-	display-subsystem {
-		/delete-property/ compatible;
+	osc_24m: clock-osc-24m {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <24000000>;
+		clock-output-names = "osc_24m";
 	};
 
 	pci@bb800000 {
@@ -60,135 +109,47 @@
 		#size-cells = <2>;
 		#interrupt-cells = <1>;
 		interrupt-map-mask = <0 0 0 7>;
-		interrupt-map = <0 0 0 1 &gic GIC_SPI 76 IRQ_TYPE_EDGE_RISING>;
+		interrupt-map = <0 0 0 1 &gic GIC_SPI 74 IRQ_TYPE_EDGE_RISING>,
+				<0 0 0 2 &gic GIC_SPI 75 IRQ_TYPE_EDGE_RISING>,
+				<0 0 0 3 &gic GIC_SPI 76 IRQ_TYPE_EDGE_RISING>,
+				<0 0 0 4 &gic GIC_SPI 77 IRQ_TYPE_EDGE_RISING>;
 		reg = <0x0 0xbb800000 0x0 0x100000>;
 		ranges = <0x02000000 0x00 0x10000000 0x0 0x10000000 0x00 0x10000>;
 	};
-};
-
-/delete-node/ &{/memory@40000000};
-/delete-node/ &{/reserved-memory};
-/delete-node/ &{/busfreq};
-/delete-node/ &{/soc@0/ddr-pmu@3d800000};
-
-&hsiomix_pd {
-	status = "disabled";
-};
-
-&pcie_pd {
-	status = "disabled";
-};
-
-&usb_otg1_pd {
-	status = "disabled";
-};
-
-&usb_otg2_pd {
-	status = "disabled";
-};
-
-&gpumix_pd {
-	status = "disabled";
-};
-
-&vpumix_pd {
-	status = "disabled";
-};
-
-&vpu_g1_pd {
-	status = "disabled";
-};
-
-&vpu_g2_pd {
-	status = "disabled";
-};
-
-&vpu_h1_pd {
-	status = "disabled";
-};
-
-&dispmix_pd {
-	status = "disabled";
-};
-
-&mipi_pd {
-	status = "disabled";
-};
 
-&gpio1 {
-	status = "disabled";
-};
-&gpio2 {
-	status = "disabled";
-};
-&gpio3 {
-	status = "disabled";
-};
-&gpio4 {
-	status = "disabled";
-};
-&gpio5 {
-	status = "disabled";
-};
-
-/delete-node/ &tmu;
-/delete-node/ &{/thermal-zones};
-&iomuxc {
-	status = "disabled";
-};
-
-&gpr {
-	/delete-property/ compatible;
-};
-
-/delete-node/ &anatop;
-/delete-node/ &snvs;
-
-&clk {
-	/delete-property/ compatible;
-};
-
-&src {
-	/delete-property/ compatible;
-};
-
-/delete-node/ &system_counter;
-
-/delete-node/ &rpmsg;
-&ocotp {
-	/delete-property/ compatible;
-	status = "disabled";
-};
-
-&dispmix_gpr {
-	/delete-property/ compatible;
-};
-
-&sdma1 {
-	status = "disabled";
-};
-
-&sdma2 {
-	status = "disabled";
-};
-
-&sdma3 {
-	status = "disabled";
+	soc@0 {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0x0 0x0 0x0 0x3e000000>;
+
+		aips3: bus@30800000 {
+			compatible = "fsl,aips-bus", "simple-bus";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x30800000 0x30800000 0x400000>,
+				 <0x8000000 0x8000000 0x10000000>;
+
+			uart4: serial@30a60000 {
+				compatible = "fsl,imx8mm-uart", "fsl,imx6q-uart";
+				reg = <0x30a60000 0x10000>;
+				interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+				status = "disabled";
+			};
+
+			usdhc3: mmc@30b60000 {
+				compatible = "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";
+				reg = <0x30b60000 0x10000>;
+				interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+				clock-names = "ipg", "ahb", "per";
+				fsl,tuning-start-tap = <20>;
+				fsl,tuning-step= <2>;
+				status = "disabled";
+			};
+		};
+	};
 };
 
-/*/delete-node/ &{/imx_ion};*/
-/delete-node/ &pcie0;
-/delete-node/ &crypto;
-/delete-node/ &caam_sm;
-/delete-node/ &caam_snvs;
-/delete-node/ &irq_sec_vio;
-/delete-node/ &dma_apbh;
-/delete-node/ &gpmi;
-
-/delete-node/ &{/cpus/cpu@0};
-/delete-node/ &{/cpus/cpu@1};
-/delete-node/ &{/pmu};
-
 &uart4 {
 	clocks = <&osc_24m>,
 		<&osc_24m>;