summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhenry.qin <henry.qin@starfivetech.com>2022-04-28 08:36:45 +0300
committerhenry.qin <henry.qin@starfivetech.com>2022-04-28 13:47:51 +0300
commite1fc17552316e76807a20b2ffb69125fec933256 (patch)
treefe87e76360678504f9082dd4aa26c497c2a8adb5
parent98a549ec6a36ac47b45bfa6939605efbd81e99e8 (diff)
downloadlinux-e1fc17552316e76807a20b2ffb69125fec933256.tar.xz
HIFI4: Add hifi4 clk and rst, del unused code, resolve code review
problems, change file access mode. Signed-off-by: henry.qin <henry.qin@starfivetech.com>
-rwxr-xr-xarch/riscv/boot/dts/starfive/jh7110-common.dtsi8
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110.dtsi21
-rw-r--r--drivers/Kconfig3
-rw-r--r--drivers/Makefile1
4 files changed, 33 insertions, 0 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
index 7df46513611c..909b06295f44 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 63ae13c0de59..ee242a055ce3 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 39a5cfb2661e..f58f71444d23 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 ab65c81153be..07fe733e4136 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/