소스 검색

Merge branch 'topic/4.19/dra7-late-attach' of git://git.ti.com/rpmsg/remoteproc into rpmsg-ti-linux-4.19.y

Add required DT support for early-booted IPU on am57x and dra7xx
platforms and revert previous hack for using CMA pools.

* 'topic/4.19/dra7-late-attach' of git://git.ti.com/rpmsg/remoteproc:
  Revert "HACK: ARM: dts: dra7-ipu-common: Revert to CMA pools for IPU early boots"
  ARM: dts: am571x-idk: Provide support for early-booted IPU1 & IPU2
  ARM: dts: am572x-idk-common: Provide support for early-booted IPU1 & IPU2
  ARM: dts: beagle-x15-common: Provide support for early-booted IPU1 & IPU2
  ARM: dts: dra71-evm: Provide support for early-booted IPU1 & IPU2
  ARM: dts: dra72-evms: Provide support for early-booted IPU1 & IPU2
  ARM: dts: dra76-evm: Provide support for early-booted IPU1 & IPU2
  ARM: dts: dra7-evm: Provide support for early-booted IPU1 & IPU2

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Dave Gerlach 6 년 전
부모
커밋
8e28d78d76

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

@@ -140,3 +140,5 @@
 	pinctrl-1 = <&mmc2_pins_hs>;
 	pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>;
 };
+
+#include "dra7-ipu-common-early-boot.dtsi"

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

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

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

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

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

@@ -584,3 +584,5 @@
 	status = "okay";
 	memory-region = <&dsp2_memory_region>;
 };
+
+#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

@@ -315,3 +315,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

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