From a46317b63e2b3edc612ac485a96de5d3b22585e5 Mon Sep 17 00:00:00 2001
From: Jianxiong Pan <jianxiong.pan@amlogic.com>
Date: Tue, 19 Feb 2019 13:01:57 +0800
Subject: [PATCH] dts: g12b: copy g12b dts [1/1]

PD#SWPL-5020

Problem:
copy g12b dts.

Solution:
copy.

Verify:
local.

Change-Id: Ibd6423bd0cc99e98bf1d6359068f9f0719ad177f
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
Signed-off-by: Hong Guo <hong.guo@amlogic.com>

Conflicts:
	MAINTAINERS
	arch/arm/boot/dts/amlogic/g12b_a311d_skt.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
	arch/arm/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
	arch/arm/boot/dts/amlogic/g12b_pxp.dts
	arch/arm/boot/dts/amlogic/g12b_pxp_a.dts
	arch/arm/boot/dts/amlogic/mesong12b_a.dtsi
	arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest.dts
	arch/arm64/boot/dts/amlogic/g12b_a311d_w400_buildroot_vccktest_a.dts
	arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot.dts
	arch/arm64/boot/dts/amlogic/g12b_a311x_w411_buildroot_a.dts
	arch/arm64/boot/dts/amlogic/g12b_pxp.dts
	arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts
	arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi
---
 arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
index 17376a8b4014..d6044c90d6b5 100644
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_skt_a.dts
@@ -59,8 +59,7 @@
 			reg = <0x07400000 0x00100000>;
 			record-size = <0x8000>;
 			console-size = <0x8000>;
-			ftrace-size = <0x0>;
-			pmsg-size = <0x8000>;
+			ftrace-size = <0x20000>;
 		};
 
 		secmon_reserved:linux,secmon {