dmaengine: loongson2-apb: Rename the prefix ls2x to loongson2

Since commit e06c43231214 ("dmaengine: Loongson1: Add Loongson-1 APB DMA
driver"), the Loongson-1 dma controller was added.

Unfortunately their naming has not been standardized, as CPUs belonging
to the same Loongson family, we expect to standardize the naming for
ease of understanding.

Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
Link: https://lore.kernel.org/r/20240924064241.2414629-1-zhoubinbin@loongson.cn
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index c27f3190737f8b85779bde5489639c8b899f4fd8..c5cda5ad4022f668ab1713e8a4aef15a2dfb9e05 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13369,12 +13369,12 @@ S:    Maintained
 F:     Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
 F:     drivers/gpio/gpio-loongson-64bit.c
 
-LOONGSON LS2X APB DMA DRIVER
+LOONGSON-2 APB DMA DRIVER
 M:     Binbin Zhou <zhoubinbin@loongson.cn>
 L:     dmaengine@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/dma/loongson,ls2x-apbdma.yaml
-F:     drivers/dma/ls2x-apb-dma.c
+F:     drivers/dma/loongson2-apb-dma.c
 
 LOONGSON LS2X I2C DRIVER
 M:     Binbin Zhou <zhoubinbin@loongson.cn>

diff --git a/arch/loongarch/configs/loongson3_defconfig b/arch/loongarch/configs/loongson3_defconfig
index 75b366407a60a39803cab69efcb3bdf70ee12b3f..6dfedda930a240236de10b390d345b8ceca4db96 100644 (file)
--- a/arch/loongarch/configs/loongson3_defconfig
+++ b/arch/loongarch/configs/loongson3_defconfig
@@ -775,7 +775,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_LOONGSON=y
 CONFIG_DMADEVICES=y
-CONFIG_LS2X_APB_DMA=y
+CONFIG_LOONGSON2_APB_DMA=y
 CONFIG_UDMABUF=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_DMABUF_HEAPS_SYSTEM=y

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index d9ec1e69e4283188e8c37f0e349eb106ef225f2f..e994d6e0779e02d7af20e7da83b5c2ca485f6d52 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -378,6 +378,20 @@ config LOONGSON1_APB_DMA
          This selects support for the APB DMA controller in Loongson1 SoCs,
          which is required by Loongson1 NAND and audio support.
 
+config LOONGSON2_APB_DMA
+       tristate "Loongson2 APB DMA support"
+       depends on LOONGARCH || COMPILE_TEST
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Support for the Loongson2 APB DMA controller driver. The
+         DMA controller is having single DMA channel which can be
+         configured for different peripherals like audio, nand, sdio
+         etc which is in APB bus.
+
+         This DMA controller transfers data from memory to peripheral fifo.
+         It does not support memory to memory data transfer.
+
 config LPC18XX_DMAMUX
        bool "NXP LPC18xx/43xx DMA MUX for PL080"
        depends on ARCH_LPC18XX || COMPILE_TEST
@@ -396,20 +410,6 @@ config LPC32XX_DMAMUX
          Support for PL080 multiplexed DMA request lines on
          LPC32XX platrofm.
 
-config LS2X_APB_DMA
-       tristate "Loongson LS2X APB DMA support"
-       depends on LOONGARCH || COMPILE_TEST
-       select DMA_ENGINE
-       select DMA_VIRTUAL_CHANNELS
-       help
-         Support for the Loongson LS2X APB DMA controller driver. The
-         DMA controller is having single DMA channel which can be
-         configured for different peripherals like audio, nand, sdio
-         etc which is in APB bus.
-
-         This DMA controller transfers data from memory to peripheral fifo.
-         It does not support memory to memory data transfer.
-
 config MCF_EDMA
        tristate "Freescale eDMA engine support, ColdFire mcf5441x SoCs"
        depends on M5441x || (COMPILE_TEST && FSL_EDMA=n)

diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index ad6a03c052ec4a7ebbdc7c2e29384d27d27e0478..5b2a52f4f2ee99bf36bcce8bd3b30b7d8bbcc871 100644 (file)
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -50,9 +50,9 @@ obj-$(CONFIG_INTEL_IOATDMA) += ioat/
 obj-y += idxd/
 obj-$(CONFIG_K3_DMA) += k3dma.o
 obj-$(CONFIG_LOONGSON1_APB_DMA) += loongson1-apb-dma.o
+obj-$(CONFIG_LOONGSON2_APB_DMA) += loongson2-apb-dma.o
 obj-$(CONFIG_LPC18XX_DMAMUX) += lpc18xx-dmamux.o
 obj-$(CONFIG_LPC32XX_DMAMUX) += lpc32xx-dmamux.o
-obj-$(CONFIG_LS2X_APB_DMA) += ls2x-apb-dma.o
 obj-$(CONFIG_MILBEAUT_HDMAC) += milbeaut-hdmac.o
 obj-$(CONFIG_MILBEAUT_XDMAC) += milbeaut-xdmac.o
 obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o

diff --git a/drivers/dma/ls2x-apb-dma.c b/drivers/dma/loongson2-apb-dma.c
similarity index 99%
rename from drivers/dma/ls2x-apb-dma.c
rename to drivers/dma/loongson2-apb-dma.c
index 2460cf9a44f5dc5202858ea702ec6651dad63dc8..367ed34ce4da5bbaa4d60b10ff2dac7494de9177 100644 (file)
--- a/drivers/dma/ls2x-apb-dma.c
+++ b/drivers/dma/loongson2-apb-dma.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Driver for the Loongson LS2X APB DMA Controller
+ * Driver for the Loongson-2 APB DMA Controller
  *
  * Copyright (C) 2017-2023 Loongson Corporation
  */
@@ -700,6 +700,6 @@ static struct platform_driver ls2x_dmac_driver = {
 };
 module_platform_driver(ls2x_dmac_driver);
 
-MODULE_DESCRIPTION("Loongson LS2X APB DMA Controller driver");
+MODULE_DESCRIPTION("Loongson-2 APB DMA Controller driver");
 MODULE_AUTHOR("Loongson Technology Corporation Limited");
 MODULE_LICENSE("GPL");