shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

galcore: resolve the conflict between usb module and nn module [1/1]

Browse Source 
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>
This commit is contained in:
cancan.chang
2019-08-08 12:46:00 +08:00
committed by Luke Go
parent ab2a0dd78f
commit 3a7bd74c43
6 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/amlogic/mesong12b.dtsi
View File

@@ -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>;
};

8
arch/arm/boot/dts/amlogic/mesonsm1.dtsi
View File

@@ -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 {

9
arch/arm/boot/dts/amlogic/mesontm2.dtsi
View File

@@ -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";

1
arch/arm64/boot/dts/amlogic/mesong12b.dtsi
View File

@@ -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>;
};

8
arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
View File

@@ -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 {

9
arch/arm64/boot/dts/amlogic/mesontm2.dtsi
View File

@@ -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";