From e1fc17552316e76807a20b2ffb69125fec933256 Mon Sep 17 00:00:00 2001 From: "henry.qin" Date: Thu, 28 Apr 2022 13:36:45 +0800 Subject: [PATCH] HIFI4: Add hifi4 clk and rst, del unused code, resolve code review problems, change file access mode. Signed-off-by: henry.qin --- arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 8 ++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 21 +++++++++++++++++++++ drivers/Kconfig | 3 +++ drivers/Makefile | 1 + 4 files changed, 33 insertions(+) diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi index 7df4651..909b062 100755 --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi @@ -51,6 +51,14 @@ no-map; reg = <0x0 0xc0110000 0x0 0xf0000>; }; + + xrp_reserved: xrpbuffer@f0000000 { + reg = <0x0 0xf0000000 0x0 0x01ffffff + 0x0 0xf2000000 0x0 0x00001000 + 0x0 0xf2001000 0x0 0x00fff000 + 0x0 0xf3000000 0x0 0x00001000>; + }; + }; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 63ae13c..ee242a0 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -1282,5 +1282,26 @@ status = "disabled"; dsp@0 {}; }; + + xrp: xrp@0 { + compatible = "cdns,xrp"; + reg = <0x0 0x10230000 0x0 0x00010000 + 0x0 0x10240000 0x0 0x00010000>; + memory-region = <&xrp_reserved>; + clocks = <&clkgen JH7110_HIFI4_CLK_CORE>; + clock-names = "core_clk"; + resets = <&rstgen RSTN_U0_HIFI4_CORE>, + <&rstgen RSTN_U0_HIFI4_AXI>; + reset-names = "rst_core","rst_axi"; + firmware-name = "hifi4_elf"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x40000000 0x0 0x20000000 0x040000 + 0xf0000000 0x0 0xf0000000 0x03000000>; + status = "disabled"; + dsp@0 { + }; + }; + }; }; diff --git a/drivers/Kconfig b/drivers/Kconfig index 39a5cfb..f58f714 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -238,4 +238,7 @@ source "drivers/counter/Kconfig" source "drivers/most/Kconfig" source "drivers/e24/Kconfig" + +source "drivers/xrp/Kconfig" + endmenu diff --git a/drivers/Makefile b/drivers/Makefile index ab65c81..07fe733 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -189,3 +189,4 @@ obj-$(CONFIG_INTERCONNECT) += interconnect/ obj-$(CONFIG_COUNTER) += counter/ obj-$(CONFIG_MOST) += most/ obj-$(CONFIG_E24) += e24/ +obj-$(CONFIG_XRP) += xrp/ -- 2.7.4