From 9ec44b106ce51e8cf932d1c00cff0dc6f720c749 Mon Sep 17 00:00:00 2001
From: "junwei.ma" <junwei.ma@amlogic.com>
Date: Tue, 14 Jul 2020 19:39:00 +0800
Subject: [PATCH] isp: add android-p 8M camera support [1/1]

PD#SWPL-28591

Problem:
8M camera crash after capture

Solution:
encrease the cma size in dts

Verify:
local

Change-Id: Ia67489ca03f64cb532e42a8b9c9b4ae90deae019
Signed-off-by: junwei.ma <junwei.ma@amlogic.com>
---
 arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts     | 10 +++++++---
 arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts   | 10 +++++++---
 arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts   | 10 +++++++---
 arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts |  7 ++++++-
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
index 1e097555b8c6..e7102147969f 100644
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -162,15 +162,14 @@
 			compatible = "shared-dma-pool";
 			reusable;
 			status = "okay";
-			size = <0x06800000>;
+			size = <0x8000000>;
 			alignment = <0x400000>;
 		};
 		adapt_cma_reserved:linux,adapt_cma {
 			compatible = "shared-dma-pool";
 			reusable;
 			status = "okay";
-			size = <0x01800000>;
-			alignment = <0x400000>;
+			size = <0x1800000>;
 		};
 	};
 
@@ -844,11 +843,16 @@
 
 &isp {
 	status = "okay";
+	temper-line-offset = <0x1E00>;
+	temper-buf-size = <32>;
+	temper-frame-num = <1>;
+	temper-frame-size = <0x1FA4000>;
 	memory-region = <&isp_cma_reserved>;
 };
 
 &adapter {
 	status = "okay";
+	mem_alloc = <24>;
 	memory-region = <&adapt_cma_reserved>;
 };
 
diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
index 6ccd9a30888c..92fa8d31d61a 100644
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -162,15 +162,14 @@
 			compatible = "shared-dma-pool";
 			reusable;
 			status = "okay";
-			size = <0x6800000>;
+			size = <0x8000000>;
 			alignment = <0x400000>;
 		};
 		adapt_cma_reserved:linux,adapt_cma {
 			compatible = "shared-dma-pool";
 			reusable;
 			status = "okay";
-			size = <0x01800000>;
-			alignment = <0x400000>;
+			size = <0x1800000>;
 		};
 	};
 
@@ -818,11 +817,16 @@
 
 &isp {
 	status = "okay";
+	temper-line-offset = <0x1E00>;
+	temper-buf-size = <32>;
+	temper-frame-num = <1>;
+	temper-frame-size = <0x1FA4000>;
 	memory-region = <&isp_cma_reserved>;
 };
 
 &adapter {
 	status = "okay";
+	mem_alloc = <24>;
 	memory-region = <&adapt_cma_reserved>;
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
index 31f2e7e1d684..65a6868e9f4c 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -164,15 +164,14 @@
 			compatible = "shared-dma-pool";
 			reusable;
 			status = "okay";
-			size = <0x06800000>;
+			size = <0x8000000>;
 			alignment = <0x400000>;
 		};
 		adapt_cma_reserved:linux,adapt_cma {
 			compatible = "shared-dma-pool";
 			reusable;
 			status = "okay";
-			size = <0x01800000>;
-			alignment = <0x400000>;
+			size = <0x1800000>;
 		};
 	};
 	galcore {
@@ -845,11 +844,16 @@
 
 &isp {
 	status = "okay";
+	temper-line-offset = <0x1E00>;
+	temper-buf-size = <32>;
+	temper-frame-num = <1>;
+	temper-frame-size = <0x1FA4000>;
 	memory-region = <&isp_cma_reserved>;
 };
 
 &adapter {
 	status = "okay";
+	mem_alloc = <24>;
 	memory-region = <&adapt_cma_reserved>;
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
index cd529964e5bf..fd3f3499ada1 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -164,7 +164,7 @@
 			compatible = "shared-dma-pool";
 			reusable;
 			status = "okay";
-			size = <0x6800000>;
+			size = <0x06800000>;
 			alignment = <0x400000>;
 		};
 		adapt_cma_reserved:linux,adapt_cma {
@@ -819,11 +819,16 @@
 
 &isp {
 	status = "okay";
+	temper-line-offset = <0x1E00>;
+	temper-buf-size = <32>;
+	temper-frame-num = <1>;
+	temper-frame-size = <0x1FA4000>;
 	memory-region = <&isp_cma_reserved>;
 };
 
 &adapter {
 	status = "okay";
+	mem_alloc = <24>;
 	memory-region = <&adapt_cma_reserved>;
 };