From 8e7b59891a8bd4e69760df1c696100f9f07913d9 Mon Sep 17 00:00:00 2001 From: "cancan.chang" Date: Fri, 12 Apr 2019 13:03:45 +0800 Subject: [PATCH] NNA: add NNA support on tm2 [1/1] PD#SWPL-5623 Problem: tm2 not support NNA now. Solution: add NNA support. Verify: Verified on tm2_ab319 Change-Id: Ib41544d0ebeb3f25442692ac3365ad3a5fc5d4ab Signed-off-by: Cancan Chang --- arch/arm/boot/dts/amlogic/mesontm2.dtsi | 18 +++++++++++++++++- arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts | 4 +++- arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts | 4 +++- arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts | 4 +++- arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts | 4 +++- arch/arm64/boot/dts/amlogic/mesontm2.dtsi | 18 +++++++++++++++++- .../boot/dts/amlogic/tm2_t962e2_ab311.dts | 4 +++- .../boot/dts/amlogic/tm2_t962e2_ab319.dts | 4 +++- .../boot/dts/amlogic/tm2_t962x3_ab301.dts | 4 +++- .../boot/dts/amlogic/tm2_t962x3_ab309.dts | 4 +++- 10 files changed, 58 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/mesontm2.dtsi b/arch/arm/boot/dts/amlogic/mesontm2.dtsi index a79018a417d0..7359ce0f2475 100644 --- a/arch/arm/boot/dts/amlogic/mesontm2.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontm2.dtsi @@ -1279,7 +1279,23 @@ pcie-ctrl-iso-shift = <20>; status = "disabled"; }; - + galcore { + compatible = "amlogic, galcore"; + dev_name = "galcore"; + status = "disabled"; + interrupts = <0 147 4>; + interrupt-names = "galcore"; + reg = <0xff100000 0x800 + /*reg base value:0xff100000 */ + 0xff000000 0x400000 + /*Sram bse value:0xff000000*/ + 0xff63c118 0x0 + 0xff63c11c 0x0 + /*0xff63c118,0xff63c11c :nanoq mem regs*/ + 0xffd01088 0x0 + /*0xffd01088:reset reg*/ + >; + }; sd_emmc_c: emmc@ffe07000 { status = "disabled"; compatible = "amlogic, meson-mmc-tm2"; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts index b4e73fdb1590..86f9a7e0b63d 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -187,7 +187,9 @@ linux,contiguous-region; }; }; /* end of reserved-memory */ - + galcore { + status = "okay"; + }; codec_mm { compatible = "amlogic, codec, mm"; status = "okay"; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts index e44b95e3dfd3..2737e4433a0c 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts @@ -184,7 +184,9 @@ linux,contiguous-region; }; }; /* end of reserved-memory */ - + galcore { + status = "okay"; + }; codec_mm { compatible = "amlogic, codec, mm"; status = "okay"; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts index adc316ac0082..14810b25da3e 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts @@ -188,7 +188,9 @@ linux,contiguous-region; }; }; /* end of reserved-memory */ - + galcore { + status = "okay"; + }; codec_mm { compatible = "amlogic, codec, mm"; status = "okay"; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts index 27418b4b9f96..f3241507a4fe 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts @@ -185,7 +185,9 @@ linux,contiguous-region; }; }; /* end of reserved-memory */ - + galcore { + status = "okay"; + }; codec_mm { compatible = "amlogic, codec, mm"; status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi index 7e02100ec24d..aae11022eede 100644 --- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi @@ -1258,7 +1258,23 @@ pcie-ctrl-iso-shift = <20>; status = "disabled"; }; - + galcore { + compatible = "amlogic, galcore"; + dev_name = "galcore"; + status = "disabled"; + interrupts = <0 147 4>; + interrupt-names = "galcore"; + reg = <0x0 0xff100000 0x0 0x800 + /*reg base value:0xff100000 */ + 0x0 0xff000000 0x0 0x400000 + /*Sram bse value:0xff000000*/ + 0x0 0xff63c118 0x0 0x0 + 0x0 0xff63c11c 0x0 0x0 + /*0xff63c118,0xff63c11c :nanoq mem regs*/ + 0x0 0xffd01088 0x0 0x0 + /*0xffd01088:reset reg*/ + >; + }; sd_emmc_c: emmc@ffe07000 { status = "disabled"; compatible = "amlogic, meson-mmc-tm2"; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts index 14ef4d634c8b..f44b119efd85 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -183,7 +183,9 @@ linux,contiguous-region; }; }; /* end of reserved-memory */ - + galcore { + status = "okay"; + }; codec_mm { compatible = "amlogic, codec, mm"; status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts index 72d90485d7fe..0aba9cab1afc 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts @@ -184,7 +184,9 @@ linux,contiguous-region; }; }; /* end of reserved-memory */ - + galcore { + status = "okay"; + }; codec_mm { compatible = "amlogic, codec, mm"; status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts index 9de2ee6133c6..3e0a50d0591b 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts @@ -185,7 +185,9 @@ linux,contiguous-region; }; }; /* end of reserved-memory */ - + galcore { + status = "okay"; + }; codec_mm { compatible = "amlogic, codec, mm"; status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts index bb11edcd053f..f29033d609c0 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts @@ -185,7 +185,9 @@ linux,contiguous-region; }; }; /* end of reserved-memory */ - + galcore { + status = "okay"; + }; codec_mm { compatible = "amlogic, codec, mm"; status = "okay";