From ac88ccffd704b7bef168229e85858fe0bb488dc6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 17 Aug 2024 09:43:44 +0200 Subject: [PATCH] drop queue-5.10/memory-fsl_ifc-make-fsl_ifc-config-visible-and-selec.patch --- ...ake-fsl_ifc-config-visible-and-selec.patch | 54 ------------------- queue-5.10/series | 1 - 2 files changed, 55 deletions(-) delete mode 100644 queue-5.10/memory-fsl_ifc-make-fsl_ifc-config-visible-and-selec.patch diff --git a/queue-5.10/memory-fsl_ifc-make-fsl_ifc-config-visible-and-selec.patch b/queue-5.10/memory-fsl_ifc-make-fsl_ifc-config-visible-and-selec.patch deleted file mode 100644 index b91eb5612b6..00000000000 --- a/queue-5.10/memory-fsl_ifc-make-fsl_ifc-config-visible-and-selec.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 51df79923483b56775358272229d9b2f2e824ca2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 30 May 2024 16:46:36 +0200 -Subject: memory: fsl_ifc: Make FSL_IFC config visible and selectable - -From: Esben Haabendal - -[ Upstream commit 9ba0cae3cac07c21c583f9ff194f74043f90d29c ] - -While use of fsl_ifc driver with NAND flash is fine, as the fsl_ifc_nand -driver selects FSL_IFC automatically, we need the CONFIG_FSL_IFC option to -be selectable for platforms using fsl_ifc with NOR flash. - -Fixes: ea0c0ad6b6eb ("memory: Enable compile testing for most of the drivers") -Reviewed-by: Miquel Raynal -Signed-off-by: Esben Haabendal -Link: https://lore.kernel.org/r/20240530-fsl-ifc-config-v3-1-1fd2c3d233dd@geanix.com -Signed-off-by: Krzysztof Kozlowski -Signed-off-by: Sasha Levin ---- - drivers/memory/Kconfig | 2 +- - drivers/mtd/nand/raw/Kconfig | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig -index cc2c83e1accfb..244dc48d1b715 100644 ---- a/drivers/memory/Kconfig -+++ b/drivers/memory/Kconfig -@@ -159,7 +159,7 @@ config FSL_CORENET_CF - represents a coherency violation. - - config FSL_IFC -- bool "Freescale IFC driver" if COMPILE_TEST -+ bool "Freescale IFC driver" - depends on FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST - depends on HAS_IOMEM - -diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig -index 6c46f25b57e2a..205663298734a 100644 ---- a/drivers/mtd/nand/raw/Kconfig -+++ b/drivers/mtd/nand/raw/Kconfig -@@ -282,8 +282,7 @@ config MTD_NAND_FSL_IFC - tristate "Freescale IFC NAND controller" - depends on FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST - depends on HAS_IOMEM -- select FSL_IFC -- select MEMORY -+ depends on FSL_IFC - help - Various Freescale chips e.g P1010, include a NAND Flash machine - with built-in hardware ECC capabilities. --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 5b5572438f7..4382d23639d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -13,7 +13,6 @@ hwmon-max6697-fix-swapped-temp-1-8-critical-alarms.patch arm64-dts-qcom-sdm845-add-power-domain-to-ufs-phy.patch soc-qcom-rpmh-rsc-ensure-irqs-aren-t-disabled-by-rpm.patch arm64-dts-qcom-msm8996-specify-ufs-core_clk-frequenc.patch -memory-fsl_ifc-make-fsl_ifc-config-visible-and-selec.patch soc-qcom-pdr-protect-locator_addr-with-the-main-mute.patch soc-qcom-pdr-fix-parsing-of-domains-lists.patch arm64-dts-rockchip-increase-vop-clk-rate-on-rk3328.patch -- 2.47.3