6.1-stable patches

added patches:
	riscv-kconfig-add-select-arm_amba-to-soc_starfive.patch

diff --git a/queue-6.1/riscv-kconfig-add-select-arm_amba-to-soc_starfive.patch b/queue-6.1/riscv-kconfig-add-select-arm_amba-to-soc_starfive.patch
new file mode 100644 (file)
index 0000000..b3b33bb
--- /dev/null
+++ b/queue-6.1/riscv-kconfig-add-select-arm_amba-to-soc_starfive.patch
@@ -0,0 +1,32 @@
+From 78a03b9f8e6b317f7c65738a3fc60e1e85106a64 Mon Sep 17 00:00:00 2001
+From: Jia Jie Ho <jiajie.ho@starfivetech.com>
+Date: Thu, 25 May 2023 14:18:36 +0800
+Subject: riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE
+
+From: Jia Jie Ho <jiajie.ho@starfivetech.com>
+
+commit 78a03b9f8e6b317f7c65738a3fc60e1e85106a64 upstream.
+
+Selects ARM_AMBA platform support for StarFive SoCs required by spi and
+crypto dma engine.
+
+Signed-off-by: Jia Jie Ho <jiajie.ho@starfivetech.com>
+Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
+Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
+[ resolve conflict due to removal of "select SIFIVE_PLIC" ]
+Signed-off-by: Nam Cao <namcao@linutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/riscv/Kconfig.socs |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/riscv/Kconfig.socs
++++ b/arch/riscv/Kconfig.socs
+@@ -23,6 +23,7 @@ config SOC_STARFIVE
+       select PINCTRL
+       select RESET_CONTROLLER
+       select SIFIVE_PLIC
++      select ARM_AMBA
+       help
+         This enables support for StarFive SoC platform hardware.
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index c4569bd24f1abd763820122f14862f132b6a38e0..d67e272ee3f6b2b80b511b7d314edfbb5a19d03a 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -187,3 +187,4 @@ mips-loongson64-reserve-vgabios-memory-on-boot.patch
 mips-loongson64-handle-more-memory-types-passed-from-firmware.patch
 mips-loongson64-enable-dma-noncoherent-support.patch
 netfilter-nft_set_pipapo-skip-inactive-elements-during-set-walk.patch
+riscv-kconfig-add-select-arm_amba-to-soc_starfive.patch