Jelajahi Sumber

Merge branch 'platform-ti-linux-4.19.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-4.19.y

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-4.19.y

* 'platform-ti-linux-4.19.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  arm64: dts: ti: k3-j721e-main.dtsi: Add dma-coherent to smmu0
  arm64: dts: k3-j721: Enable the SMMU for guest cells

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
LCPD Auto Merger 6 tahun lalu
induk
melakukan
e56692e9c3

+ 0 - 4
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board-jailhouse.dtso

@@ -39,10 +39,6 @@
 	status = "disabled";
 };
 
-&smmu0 {
-	status = "disabled";
-};
-
 &gpu {
 	status = "disabled";
 };

+ 1 - 0
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi

@@ -97,6 +97,7 @@
 			     <GIC_SPI 768 IRQ_TYPE_EDGE_RISING>;
 		interrupt-names = "eventq", "gerror";
 		#iommu-cells = <1>;
+		dma-coherent;
 	};
 
 	main_gpio_intr: interrupt-controller0 {