soc: sifive: shunt ccache driver to drivers/cache

Move the ccache driver over to drivers/cache, out of the drivers/soc
dumping ground, to this new collection point for cache controller
drivers.

Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
Tested-by: Samuel Holland <samuel.holland@sifive.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 97f51d5ec1cfd715487a616c78afd40324082dfc..3135ec3de6edef20b108f3c7b775115f97b72788 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19785,6 +19785,13 @@ S:     Supported
 N:     sifive
 K:     [^@]sifive
 
+SIFIVE CACHE DRIVER
+M:     Conor Dooley <conor@kernel.org>
+L:     linux-riscv@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
+F:     drivers/cache/sifive_ccache.c
+
 SIFIVE FU540 SYSTEM-ON-CHIP
 M:     Paul Walmsley <paul.walmsley@sifive.com>
 M:     Palmer Dabbelt <palmer@dabbelt.com>
@@ -19800,13 +19807,6 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
 F:     drivers/dma/sf-pdma/
 
-SIFIVE SOC DRIVERS
-M:     Conor Dooley <conor@kernel.org>
-L:     linux-riscv@lists.infradead.org
-S:     Maintained
-T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
-F:     Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
-F:     drivers/soc/sifive/
 
 SILEAD TOUCHSCREEN DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/cache/Kconfig b/drivers/cache/Kconfig
index d6e5e3abaad8afde8f2f0a852f2408b4e1c5c4ac..9345ce4976d76d7d56b39c373e1d5bf8a374c1a5 100644 (file)
--- a/drivers/cache/Kconfig
+++ b/drivers/cache/Kconfig
@@ -8,4 +8,10 @@ config AX45MP_L2_CACHE
        help
          Support for the L2 cache controller on Andes Technology AX45MP platforms.
 
+config SIFIVE_CCACHE
+       bool "Sifive Composable Cache controller"
+       depends on ARCH_SIFIVE || ARCH_STARFIVE
+       help
+         Support for the composable cache controller on SiFive platforms.
+
 endmenu

diff --git a/drivers/cache/Makefile b/drivers/cache/Makefile
index 2012e7fb978dc5cc645a67f14f5af5373f04819c..7657cff3bd6c74e964db7c833bee79dc6abe7fee 100644 (file)
--- a/drivers/cache/Makefile
+++ b/drivers/cache/Makefile
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
 
-obj-$(CONFIG_AX45MP_L2_CACHE) += ax45mp_cache.o
+obj-$(CONFIG_AX45MP_L2_CACHE)  += ax45mp_cache.o
+obj-$(CONFIG_SIFIVE_CCACHE)    += sifive_ccache.o

diff --git a/drivers/soc/sifive/sifive_ccache.c b/drivers/cache/sifive_ccache.c
similarity index 100%
rename from drivers/soc/sifive/sifive_ccache.c
rename to drivers/cache/sifive_ccache.c

diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index 10a9ff84ff41d038c28e4308ae712bf2df9c6008..5d924e946507b78ff90f13bf6d1b2466196ed024 100644 (file)
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -22,7 +22,6 @@ source "drivers/soc/qcom/Kconfig"
 source "drivers/soc/renesas/Kconfig"
 source "drivers/soc/rockchip/Kconfig"
 source "drivers/soc/samsung/Kconfig"
-source "drivers/soc/sifive/Kconfig"
 source "drivers/soc/sunxi/Kconfig"
 source "drivers/soc/tegra/Kconfig"
 source "drivers/soc/ti/Kconfig"

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 0706a27d13bef3c39e81ee53b496dee587c75cf9..ba8f5b5460e1462640087c44a5331619cb14ad1f 100644 (file)
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -28,7 +28,6 @@ obj-y                         += qcom/
 obj-y                          += renesas/
 obj-y                          += rockchip/
 obj-$(CONFIG_SOC_SAMSUNG)      += samsung/
-obj-y                          += sifive/
 obj-y                          += sunxi/
 obj-$(CONFIG_ARCH_TEGRA)       += tegra/
 obj-y                          += ti/

diff --git a/drivers/soc/sifive/Kconfig b/drivers/soc/sifive/Kconfig
deleted file mode 100644 (file)
index 139884a..0000000
--- a/drivers/soc/sifive/Kconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-if ARCH_SIFIVE || ARCH_STARFIVE
-
-config SIFIVE_CCACHE
-       bool "Sifive Composable Cache controller"
-       help
-         Support for the composable cache controller on SiFive platforms.
-
-endif

diff --git a/drivers/soc/sifive/Makefile b/drivers/soc/sifive/Makefile
deleted file mode 100644 (file)
index 1f5dc33..0000000
--- a/drivers/soc/sifive/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-obj-$(CONFIG_SIFIVE_CCACHE)    += sifive_ccache.o