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" <cancan.chang@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/mesong12b.dtsi b/arch/arm/boot/dts/amlogic/mesong12b.dtsi
index 39705e5..7b23315 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesong12b.dtsi
@@ -1205,6 +1205,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 d23bf41..acb01ae 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
@@ -1107,15 +1107,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 f687c7d..62618ee 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesontm2.dtsi
@@ -1283,15 +1283,15 @@
                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 {

diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
index 043519c..add712c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -1205,6 +1205,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 6379e63..8506d6d 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
@@ -1106,15 +1106,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 3f01bf7..a81a8ee 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
@@ -1281,15 +1281,15 @@
                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 {