Merge pull request #157 in PROCESSOR-SDK/processor-sdk-linux from jake/jailhouse_dts to processor-sdk-linux-4.19.y

* commit '4ee39b1354f632f72b15111a31fc60c0a4cc79fd':
  ARM: dts: ti: Add am57xx-idk jailhouse overlay
  ARM: dts: ti: Add am57xx-evm jailhouse overlay

arch/arm/boot/dts/Makefile

@@ -762,9 +762,11 @@ dtb-merge-$(CONFIG_SOC_DRA7XX) += \
 	am57xx-evm.dtb \
 	am57xx-evm-cam-mt9t111.dtb \
 	am57xx-evm-cam-ov10635.dtb \
+	am57xx-evm-jailhouse.dtb \
 	am57xx-evm-reva3.dtb \
 	am57xx-evm-reva3-cam-mt9t111.dtb \
 	am57xx-evm-reva3-cam-ov10635.dtb \
+	am57xx-evm-reva3-jailhouse.dtb \
 	am571x-idk.dtb \
 	am571x-idk-pps.dtb \
 	am571x-idk-lcd-osd101t2045.dtb \
@@ -772,8 +774,12 @@ dtb-merge-$(CONFIG_SOC_DRA7XX) += \
 	am572x-idk-pps.dtb \
 	am572x-idk-lcd-osd101t2045.dtb \
 	am572x-idk-lcd-osd101t2587.dtb \
+	am572x-idk-jailhouse.dtb \
+	am572x-idk-lcd-osd101t2045-jailhouse.dtb \
+	am572x-idk-lcd-osd101t2587-jailhouse.dtb \
 	am574x-idk-pps.dtb \
 	am574x-idk-lcd-osd101t2587.dtb \
+	am574x-idk-jailhouse.dtb \
 	dra71-evm-nand.dtb \
 	dra71-evm-lcd-auo-g101evn01.0.dtb \
 	dra72-evm-lcd-osd101t2045.dtb \

arch/arm/boot/dts/ti/am57xx-evm-jailhouse.dtso

@@ -0,0 +1,41 @@
+/dts-v1/;
+/plugin/;
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+  fragment@101 {
+	target-path = "/";
+
+	__overlay__ {
+		reserved-memory {
+			jailhouse: jailhouse@ef000000 {
+				reg = <0x0 0xef000000 0x0 0x1000000>;
+				no-map;
+				status = "okay";
+			};
+
+			jh_inmate: jh_inmate@ee000000 {
+				reg = <0x0 0xe0000000 0x0 0xf000000>;
+				no-map;
+				status = "okay";
+			};
+		};
+	};
+  };
+};
+
+&crossbar_mpu {
+	ti,irqs-skip = <10 133 134 135 139 140>;
+};
+
+&timer8 {
+	status = "disabled";
+	ti,no-idle;
+};
+
+&uart9 {
+	status = "disabled";
+	ti,no-idle;
+};

arch/arm/boot/dts/ti/am57xx-evm.its

@@ -71,6 +71,14 @@
 			compression = "none";
 			load = <0x83090000>;
 		};
+		fdt@8 {
+			description = "AM57xx-evm Jailhouse overlay";
+			data = /incbin/("am57xx-evm-jailhouse.dtbo");
+			type = "flat_dt";
+			arch = "arm";
+			compression = "none";
+			load = <0x83110000>;
+		};
 	};
 
 	configurations {
@@ -103,5 +111,9 @@
 			description = "OV10635 camera";
 			fdt = "fdt@5";
 		};
+		jailhouse {
+			description = "Jailhouse";
+			fdt = "fdt@8";
+		};
 	};
 };

arch/arm/boot/dts/ti/am57xx-idk-jailhouse.dtso

@@ -0,0 +1,106 @@
+/dts-v1/;
+/plugin/;
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+  fragment@101 {
+	target-path = "/";
+
+	__overlay__ {
+		reserved-memory {
+			jailhouse: jailhouse@ef000000 {
+				reg = <0x0 0xef000000 0x0 0x1000000>;
+				no-map;
+				status = "okay";
+			};
+
+			jh_inmate: jh_inmate@ee000000 {
+				reg = <0x0 0xe0000000 0x0 0xf000000>;
+				no-map;
+				status = "okay";
+			};
+		};
+	};
+  };
+};
+
+/*
+&pruss1_eth {
+	status = "disabled";
+};
+*/
+
+&pruss2_eth {
+	status = "disabled";
+};
+
+&crossbar_mpu {
+	ti,irqs-skip = <10 44 127 129 133 134 135 136 137 139 140>;
+};
+
+&timer2 {
+	status = "disabled";
+	ti,no-idle;
+};
+
+&timer8 {
+	status = "disabled";
+	ti,no-idle;
+};
+
+&uart9 {
+	status = "disabled";
+	ti,no-idle;
+};
+
+&pruss1 {
+	status = "disabled";
+	ti,no-idle;
+};
+
+&pru1_0 {
+	status = "disabled";
+	ti,no-idle;
+};
+
+&pru1_1 {
+	status = "disabled";
+	ti,no-idle;
+};
+
+&pruss2 {
+	status = "disabled";
+	ti,no-idle;
+};
+
+&pru2_0 {
+	status = "disabled";
+	ti,no-idle;
+};
+
+&pru2_1 {
+	ti,no-idle;
+	status = "disabled";
+};
+
+&pruss1_mdio {
+	ti,no-idle;
+	status = "disabled";
+};
+
+&pruss2_mdio {
+	ti,no-idle;
+	status = "disabled";
+};
+
+&gpio5 {
+	ti,no-idle;
+	status = "disabled";
+};
+
+&gpio3 {
+	ti,no-idle;
+	status = "disabled";
+};

arch/arm/boot/dts/ti/am57xx-idk.its

@@ -111,6 +111,14 @@
 			compression = "none";
 			load = <0x83080000>;
 		};
+		fdt@13 {
+			description = "AM57xx-evm Jailhouse overlay";
+			data = /incbin/("am57xx-idk-jailhouse.dtbo");
+			type = "flat_dt";
+			arch = "arm";
+			compression = "none";
+			load = <0x83110000>;
+		};
 	};
 
 	configurations {
@@ -165,5 +173,9 @@
 			description = "am574x-idk with osd101t2587 LCD";
 			fdt = "fdt@3", "fdt@4", "fdt@6", "fdt@8";
 		};
+		jailhouse {
+			description = "Jailhouse";
+			fdt = "fdt@13";
+		};
 	};
 };