From 2c92210ffa688a86231cca619ad12cc472cbc5ca Mon Sep 17 00:00:00 2001 From: "cancan.chang" Date: Tue, 13 Aug 2019 11:30:13 +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: w411 Change-Id: I11c0c7ea3c8ce251a4dc937d76085c75d267372d Signed-off-by: "cancan.chang" --- arch/arm/boot/dts/amlogic/mesong12b_a.dtsi | 1 + arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi index b2405525feb7..59b639cf8514 100644 --- a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi @@ -1150,6 +1150,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/mesong12b_a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi index 44569fa64fa1..7740701de2f0 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi @@ -1150,6 +1150,7 @@ >; reg-names = "NN_REG","NN_SRAM","NN_MEM0", "NN_MEM1","NN_RESET","NN_CLK"; + nn_power_version = <2>; nn_efuse = <0xff63003c 0x20>; };