Эх сурвалжийг харах

Merge branch 'rpmsg-ti-linux-4.19.y' of git://git.ti.com/rpmsg/rpmsg into rpmsg-ti-linux-4.19.y-intg

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Dave Gerlach 6 жил өмнө
parent
commit
5ce929207d

+ 2 - 0
arch/arm/boot/dts/am571x-idk.dts

@@ -151,3 +151,5 @@
 	reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>;
 	reset-delay-us = <2>;   /* PHY datasheet states 1uS min */
 };
+
+#include "dra7-ipu-common-early-boot.dtsi"

+ 2 - 0
arch/arm/boot/dts/am572x-idk-common.dtsi

@@ -140,3 +140,5 @@
 &vip2 {
 	status = "okay";
 };
+
+#include "dra7-ipu-common-early-boot.dtsi"

+ 2 - 0
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi

@@ -668,3 +668,5 @@
 	status = "okay";
 	memory-region = <&dsp2_memory_region>;
 };
+
+#include "dra7-ipu-common-early-boot.dtsi"

+ 2 - 0
arch/arm/boot/dts/dra7-evm.dts

@@ -727,3 +727,5 @@
 &bb2d {
 	status = "okay";
 };
+
+#include "dra7-ipu-common-early-boot.dtsi"

+ 10 - 0
arch/arm/boot/dts/dra7-ipu-common-early-boot.dtsi

@@ -38,6 +38,11 @@
 	ti,no-reset-on-init;
 };
 
+&ipu2_memory_region {
+	/delete-property/ reusable;
+	no-map;
+};
+
 &ipu2 {
 	ti,no-idle-on-init;
 	ti,no-reset-on-init;
@@ -64,6 +69,11 @@
 	ti,no-reset-on-init;
 };
 
+&ipu1_memory_region {
+	/delete-property/ reusable;
+	no-map;
+};
+
 &ipu1 {
 	ti,no-idle-on-init;
 	ti,no-reset-on-init;

+ 2 - 0
arch/arm/boot/dts/dra71-evm.dts

@@ -323,3 +323,5 @@
 	status = "okay";
 	memory-region = <&dsp1_memory_region>;
 };
+
+#include "dra7-ipu-common-early-boot.dtsi"

+ 2 - 0
arch/arm/boot/dts/dra72-evm-revc.dts

@@ -163,3 +163,5 @@
 	status = "okay";
 	memory-region = <&dsp1_memory_region>;
 };
+
+#include "dra7-ipu-common-early-boot.dtsi"

+ 2 - 0
arch/arm/boot/dts/dra72-evm.dts

@@ -122,3 +122,5 @@
 	status = "okay";
 	memory-region = <&dsp1_memory_region>;
 };
+
+#include "dra7-ipu-common-early-boot.dtsi"

+ 2 - 0
arch/arm/boot/dts/dra76-evm.dts

@@ -612,3 +612,5 @@
 &gpu {
 	memory-region = <&gpu_memory_region>;
 };
+
+#include "dra7-ipu-common-early-boot.dtsi"