From 43cc425ff697e6ef0ba152805a6d5c4b4e9ab252 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 a0d7570b635c..e89d41a7a309 100644 --- a/arch/arm/boot/dts/amlogic/mesontm2.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontm2.dtsi @@ -1235,7 +1235,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 648dc4380cdd..ccea9250688b 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 30960e570255..8e61cadadbf8 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 1caa667f7b2c..281a219fd5c3 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.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_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts index e2941a2b1789..37dfc5ab9a6c 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.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/mesontm2.dtsi b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi index d53c942e31db..99f3db82eba3 100644 --- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi @@ -1215,7 +1215,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 4ba3670eda9f..44ab736125f9 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 c6c153104115..f9f60602f56f 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 509130f8ccb6..ec42a3ce80dd 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.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_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts index 8b9f56eea72b..7db627f29e7f 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts @@ -184,7 +184,9 @@ linux,contiguous-region; }; }; /* end of reserved-memory */ - + galcore { + status = "okay"; + }; codec_mm { compatible = "amlogic, codec, mm"; status = "okay";