From a3aa3b114beceba05310147685fb68fcaa8bef9b Mon Sep 17 00:00:00 2001
From: Robby Cai <robby.cai@nxp.com>
Date: Wed, 13 Jan 2021 10:54:39 +0800
Subject: [PATCH] MLK-23600-5 Fix the way VIV_VIDIOC_QUERY_EXTMEM used reserved
 memory

use memory-region to get reserved memory

Signed-off-by: Robby Cai <robby.cai@nxp.com>
Reviewed-by: Guoniu.zhou <guoniu.zhou@nxp.com>
(cherry picked from commit 5a28380ef4f4afffdabcfacd062706487cc150f8)
(cherry picked from commit b8f879b7d746025299e8e635754768d00ff7a573)
---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index 1ed8c7eac8c59..ed916f335b10f 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -196,6 +196,16 @@ dsp_reserved: dsp@92400000 {
 			no-map;
 			reg = <0 0x92400000 0 0x2000000>;
 		};
+
+		isp0_reserved: isp0@B0000000 {
+			no-map;
+			reg = <0 0xB0000000 0 0x10000000>;
+		};
+
+		isp1_reserved: isp1@B0000000 {
+			no-map;
+			reg = <0 0xB0000000 0 0x10000000>;
+		};
 	};
 
 	osc_32k: clock-osc-32k {
@@ -1545,6 +1555,7 @@ isp_0: isp@32e10000 {
 					power-domains = <&ispdwp_pd>;
 					id = <0>;
 					gpr = <&media_blk_ctrl>;
+					memory-region = <&isp0_reserved>;
 					status = "disabled";
 				};
 
@@ -1562,6 +1573,7 @@ isp_1: isp@32e20000 {
 					power-domains = <&ispdwp_pd>;
 					id = <1>;
 					gpr = <&media_blk_ctrl>;
+					memory-region = <&isp1_reserved>;
 					status = "disabled";
 				};
 
-- 
GitLab