From 701354450a3e391b416f08707bc82ace01cb5628 Mon Sep 17 00:00:00 2001 From: Luan Yuan Date: Mon, 22 Apr 2019 10:54:15 +0800 Subject: [PATCH] dts: add ppmgr for g12b [1/1] PD#SWPL-6901 Problem: lack of ppmgr in g12b Solution: add ppmgr Verify: verify by g12b Change-Id: Id6d9894d2430cf286e42c90dc340dc10fd0f37c5 Signed-off-by: Luan Yuan --- arch/arm/boot/dts/amlogic/g12a_pxp.dts | 13 +++++++++++++ arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts | 12 ++++++++++++ arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts | 12 ++++++++++++ arch/arm/boot/dts/amlogic/g12b_pxp.dts | 13 +++++++++++++ arch/arm/boot/dts/amlogic/g12b_pxp_a.dts | 13 +++++++++++++ arch/arm/boot/dts/amlogic/sm1_pxp.dts | 12 ++++++++++++ arch/arm64/boot/dts/amlogic/g12a_pxp.dts | 13 +++++++++++++ arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts | 13 +++++++++++++ arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts | 13 +++++++++++++ arch/arm64/boot/dts/amlogic/g12b_pxp.dts | 13 +++++++++++++ arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts | 13 +++++++++++++ arch/arm64/boot/dts/amlogic/sm1_pxp.dts | 13 +++++++++++++ 12 files changed, 153 insertions(+) diff --git a/arch/arm/boot/dts/amlogic/g12a_pxp.dts b/arch/arm/boot/dts/amlogic/g12a_pxp.dts index 4973402c90e9..c0c631c31842 100644 --- a/arch/arm/boot/dts/amlogic/g12a_pxp.dts +++ b/arch/arm/boot/dts/amlogic/g12a_pxp.dts @@ -97,6 +97,13 @@ size = <0x02800000>; alignment = <0x400000>; }; + + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "amlogic, ppmgr_memory"; + size = <0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -173,6 +180,12 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + status = "okay"; + memory-region = <&ppmgr_reserved>; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "okay"; diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts index fd36441e0c62..c6787063b4cc 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400.dts @@ -115,6 +115,11 @@ size = <0x02800000>; alignment = <0x400000>; }; + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "shared-dma-pool"; + size = <0x0>; + }; codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -261,6 +266,13 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + memory-region = <&ppmgr_reserved>; + dev_name = "ppmgr"; + status = "okay"; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "okay"; 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 f92c26d42cf6..4b2d5448aa32 100644 --- a/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts +++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w400_a.dts @@ -115,6 +115,11 @@ size = <0x02800000>; alignment = <0x400000>; }; + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "shared-dma-pool"; + size = <0x0>; + }; codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -261,6 +266,13 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + memory-region = <&ppmgr_reserved>; + dev_name = "ppmgr"; + status = "okay"; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "okay"; diff --git a/arch/arm/boot/dts/amlogic/g12b_pxp.dts b/arch/arm/boot/dts/amlogic/g12b_pxp.dts index f75d525e77e5..14b0dac238d4 100644 --- a/arch/arm/boot/dts/amlogic/g12b_pxp.dts +++ b/arch/arm/boot/dts/amlogic/g12b_pxp.dts @@ -98,6 +98,13 @@ size = <0x02800000>; alignment = <0x400000>; }; + + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "amlogic, ppmgr_memory"; + size = <0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -169,6 +176,12 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + status = "okay"; + memory-region = <&ppmgr_reserved>; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "disabled"; diff --git a/arch/arm/boot/dts/amlogic/g12b_pxp_a.dts b/arch/arm/boot/dts/amlogic/g12b_pxp_a.dts index 593d51b6b906..1b1fd94b7d7c 100644 --- a/arch/arm/boot/dts/amlogic/g12b_pxp_a.dts +++ b/arch/arm/boot/dts/amlogic/g12b_pxp_a.dts @@ -98,6 +98,13 @@ size = <0x02800000>; alignment = <0x400000>; }; + + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "amlogic, ppmgr_memory"; + size = <0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -169,6 +176,12 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + status = "okay"; + memory-region = <&ppmgr_reserved>; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "disabled"; diff --git a/arch/arm/boot/dts/amlogic/sm1_pxp.dts b/arch/arm/boot/dts/amlogic/sm1_pxp.dts index a4c02804c226..4764702fb718 100644 --- a/arch/arm/boot/dts/amlogic/sm1_pxp.dts +++ b/arch/arm/boot/dts/amlogic/sm1_pxp.dts @@ -97,6 +97,13 @@ size = <0x02800000>; alignment = <0x400000>; }; + + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "amlogic, ppmgr_memory"; + size = <0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -188,6 +195,11 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + status = "okay"; + memory-region = <&ppmgr_reserved>; + }; deinterlace { compatible = "amlogic, deinterlace"; status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts index 7613b14ac751..b1fe381c9ff4 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_pxp.dts @@ -97,6 +97,13 @@ size = <0x0 0x02800000>; alignment = <0x0 0x400000>; }; + + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "amlogic, ppmgr_memory"; + size = <0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -173,6 +180,12 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + status = "okay"; + memory-region = <&ppmgr_reserved>; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts index cb7fb69bc648..65244b117870 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts @@ -115,6 +115,12 @@ size = <0x0 0x02800000>; alignment = <0x0 0x400000>; }; + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "shared-dma-pool"; + size = <0x0 0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -261,6 +267,13 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + memory-region = <&ppmgr_reserved>; + dev_name = "ppmgr"; + status = "okay"; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "okay"; 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 7f1418567299..36c317000050 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts @@ -115,6 +115,12 @@ size = <0x0 0x02800000>; alignment = <0x0 0x400000>; }; + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "shared-dma-pool"; + size = <0x0 0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -261,6 +267,13 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + memory-region = <&ppmgr_reserved>; + dev_name = "ppmgr"; + status = "okay"; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/g12b_pxp.dts b/arch/arm64/boot/dts/amlogic/g12b_pxp.dts index 36f125968f83..0fb720ec9d78 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_pxp.dts @@ -98,6 +98,13 @@ size = <0x0 0x02800000>; alignment = <0x0 0x400000>; }; + + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "amlogic, ppmgr_memory"; + size = <0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -168,6 +175,12 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + status = "okay"; + memory-region = <&ppmgr_reserved>; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "disabled"; diff --git a/arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts b/arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts index b1e9088a1665..235045aa468e 100644 --- a/arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts +++ b/arch/arm64/boot/dts/amlogic/g12b_pxp_a.dts @@ -98,6 +98,13 @@ size = <0x0 0x02800000>; alignment = <0x0 0x400000>; }; + + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "amlogic, ppmgr_memory"; + size = <0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -168,6 +175,12 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + status = "okay"; + memory-region = <&ppmgr_reserved>; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "disabled"; diff --git a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts index e0fdc85ab210..2f5815716d5a 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts @@ -98,6 +98,13 @@ size = <0x0 0x02800000>; alignment = <0x0 0x400000>; }; + + /* POST PROCESS MANAGER */ + ppmgr_reserved:linux,ppmgr { + compatible = "amlogic, ppmgr_memory"; + size = <0x0>; + }; + codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; @@ -189,6 +196,12 @@ status = "okay"; }; + ppmgr { + compatible = "amlogic, ppmgr"; + status = "okay"; + memory-region = <&ppmgr_reserved>; + }; + deinterlace { compatible = "amlogic, deinterlace"; status = "okay";