From 1ebcc6e8e04ad5c45c5971cdcbd1d47a67b3cabc Mon Sep 17 00:00:00 2001 From: "cancan.chang" Date: Fri, 26 Apr 2019 19:59:59 +0800 Subject: [PATCH] npu: check chip whether contain npu module [1/2] PD#SWPL-7761 Problem: S922X revb boot up fail Solution: add check function Verify: test pass at g12b revb Change-Id: I17de7f9f82e09c68e27668288cb001e975785f5b Signed-off-by: cancan chang --- arch/arm/boot/dts/amlogic/mesong12b.dtsi | 10 +++++++++- arch/arm/boot/dts/amlogic/mesong12b_a.dtsi | 10 +++++++++- arch/arm64/boot/dts/amlogic/mesong12b.dtsi | 10 +++++++++- arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi | 10 +++++++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/mesong12b.dtsi b/arch/arm/boot/dts/amlogic/mesong12b.dtsi index e4b893d..9f6a2ea 100644 --- a/arch/arm/boot/dts/amlogic/mesong12b.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12b.dtsi @@ -1147,7 +1147,15 @@ interrupts = <0 147 4>; interrupt-names = "galcore"; reg = <0xff100000 0x800 - 0xff000000 0x400000>; + 0xff000000 0x400000 + 0xff63c10c 0x4 + 0xff63c110 0x4 + 0xffd01088 0x4 + 0xff63c1c8 0x4 + >; + reg-names = "NN_REG","NN_SRAM","NN_MEM0", + "NN_MEM1","NN_RESET","NN_CLK"; + nn_efuse = <0xff63003c 0x20>; }; aocec: aocec { diff --git a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi index ce28d0a..3f910ea 100644 --- a/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12b_a.dtsi @@ -1142,7 +1142,15 @@ interrupts = <0 147 4>; interrupt-names = "galcore"; reg = <0xff100000 0x800 - 0xff000000 0x400000>; + 0xff000000 0x400000 + 0xff63c10c 0x4 + 0xff63c110 0x4 + 0xffd01088 0x4 + 0xff63c1c8 0x4 + >; + reg-names = "NN_REG","NN_SRAM","NN_MEM0", + "NN_MEM1","NN_RESET","NN_CLK"; + nn_efuse = <0xff63003c 0x20>; }; aocec: aocec { diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi index 524b24e..5b7aa00 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi @@ -1026,7 +1026,15 @@ interrupts = <0 147 4>; interrupt-names = "galcore"; reg = <0x0 0xff100000 0x0 0x800 - 0x0 0xff000000 0x0 0x400000>; + 0x0 0xff000000 0x0 0x400000 + 0x0 0xff63c10c 0x0 0x4 + 0x0 0xff63c110 0x0 0x4 + 0x0 0xffd01088 0x0 0x4 + 0X0 0xff63c1c8 0X0 0x4 + >; + reg-names = "NN_REG","NN_SRAM","NN_MEM0", + "NN_MEM1","NN_RESET","NN_CLK"; + nn_efuse = <0xff63003c 0x20>; }; aocec: aocec { diff --git a/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi index 04d6e1b..b00a84e 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12b_a.dtsi @@ -1021,7 +1021,15 @@ interrupts = <0 147 4>; interrupt-names = "galcore"; reg = <0x0 0xff100000 0x0 0x800 - 0x0 0xff000000 0x0 0x400000>; + 0x0 0xff000000 0x0 0x400000 + 0x0 0xff63c10c 0x0 0x4 + 0x0 0xff63c110 0x0 0x4 + 0x0 0xffd01088 0x0 0x4 + 0X0 0xff63c1c8 0X0 0x4 + >; + reg-names = "NN_REG","NN_SRAM","NN_MEM0", + "NN_MEM1","NN_RESET","NN_CLK"; + nn_efuse = <0xff63003c 0x20>; }; aocec: aocec { -- 2.7.4