From 3a7bd74c439dfa0580433d41c9801d5b156ea925 Mon Sep 17 00:00:00 2001 From: "cancan.chang" Date: Thu, 8 Aug 2019 12:46:00 +0800 Subject: [PATCH] galcore: resolve the conflict between usb module and nn module [1/1] PD#SH-986 Problem: nn module and usb module confilct Solution: add a label in galcore Verify: s905d3 w400 Change-Id: I3f5b8738aa8924c7a292fc1da6dda1d2002a77ae Signed-off-by: "cancan.chang" --- arch/arm/boot/dts/amlogic/mesong12b.dtsi | 1 + arch/arm/boot/dts/amlogic/mesonsm1.dtsi | 8 ++++---- arch/arm/boot/dts/amlogic/mesontm2.dtsi | 9 +++++---- arch/arm64/boot/dts/amlogic/mesong12b.dtsi | 1 + arch/arm64/boot/dts/amlogic/mesonsm1.dtsi | 8 ++++---- arch/arm64/boot/dts/amlogic/mesontm2.dtsi | 9 +++++---- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/mesong12b.dtsi b/arch/arm/boot/dts/amlogic/mesong12b.dtsi index 20e535ef2a2a..469619754bec 100644 --- a/arch/arm/boot/dts/amlogic/mesong12b.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12b.dtsi @@ -1190,6 +1190,7 @@ >; reg-names = "NN_REG","NN_SRAM","NN_MEM0", "NN_MEM1","NN_RESET","NN_CLK"; + nn_power_version = <2>; nn_efuse = <0xff63003c 0x20>; }; diff --git a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi index e301be988262..4ed56b6e49c8 100644 --- a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi +++ b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi @@ -1190,15 +1190,15 @@ interrupts = <0 186 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*/ + 0xff63c1c8 0x0 >; + reg-names = "NN_REG","NN_SRAM","NN_MEM0", + "NN_MEM1","NN_RESET","NN_CLK"; + nn_power_version = <3>; nn_efuse = <0xff63003c 0x20>; }; aocec: aocec { diff --git a/arch/arm/boot/dts/amlogic/mesontm2.dtsi b/arch/arm/boot/dts/amlogic/mesontm2.dtsi index 3f78c3d654d7..ee69b15c529a 100644 --- a/arch/arm/boot/dts/amlogic/mesontm2.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontm2.dtsi @@ -1327,15 +1327,16 @@ 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*/ + 0xff63c1c8 0x0 >; + reg-names = "NN_REG","NN_SRAM","NN_MEM0", + "NN_MEM1","NN_RESET","NN_CLK"; + nn_power_version = <3>; + nn_efuse = <0xff63003c 0x20>; }; sd_emmc_c: emmc@ffe07000 { status = "disabled"; diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi index e9a619cd611e..d61a42d2e359 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi @@ -1190,6 +1190,7 @@ >; reg-names = "NN_REG","NN_SRAM","NN_MEM0", "NN_MEM1","NN_RESET","NN_CLK"; + nn_power_version = <2>; nn_efuse = <0xff63003c 0x20>; }; diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi index 3fd5dc64cc24..16743243335d 100644 --- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi @@ -1189,15 +1189,15 @@ interrupts = <0 186 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*/ + 0x0 0xff63c1c8 0x0 0x0 >; + reg-names = "NN_REG","NN_SRAM","NN_MEM0", + "NN_MEM1","NN_RESET","NN_CLK"; + nn_power_version = <3>; nn_efuse = <0xff63003c 0x20>; }; aocec: aocec { diff --git a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi index a053dc8dc210..dec6fa440b6b 100644 --- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi @@ -1307,15 +1307,16 @@ 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*/ + 0x0 0xff63c1c8 0x0 0x0 >; + reg-names = "NN_REG","NN_SRAM","NN_MEM0", + "NN_MEM1","NN_RESET","NN_CLK"; + nn_power_version = <3>; + nn_efuse = <0xff63003c 0x20>; }; sd_emmc_c: emmc@ffe07000 { status = "disabled";