Skip to content

Commit 8974f34

Browse files
AaronDotvinodkoul
authored andcommitted
dmaengine: loongson2-apb: Rename the prefix ls2x to loongson2
Since commit e06c432 ("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>
1 parent 7655ec4 commit 8974f34

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13369,12 +13369,12 @@ S: Maintained
1336913369
F: Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
1337013370
F: drivers/gpio/gpio-loongson-64bit.c
1337113371

13372-
LOONGSON LS2X APB DMA DRIVER
13372+
LOONGSON-2 APB DMA DRIVER
1337313373
M: Binbin Zhou <zhoubinbin@loongson.cn>
1337413374
L: dmaengine@vger.kernel.org
1337513375
S: Maintained
1337613376
F: Documentation/devicetree/bindings/dma/loongson,ls2x-apbdma.yaml
13377-
F: drivers/dma/ls2x-apb-dma.c
13377+
F: drivers/dma/loongson2-apb-dma.c
1337813378

1337913379
LOONGSON LS2X I2C DRIVER
1338013380
M: Binbin Zhou <zhoubinbin@loongson.cn>

arch/loongarch/configs/loongson3_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ CONFIG_RTC_CLASS=y
775775
CONFIG_RTC_DRV_EFI=y
776776
CONFIG_RTC_DRV_LOONGSON=y
777777
CONFIG_DMADEVICES=y
778-
CONFIG_LS2X_APB_DMA=y
778+
CONFIG_LOONGSON2_APB_DMA=y
779779
CONFIG_UDMABUF=y
780780
CONFIG_DMABUF_HEAPS=y
781781
CONFIG_DMABUF_HEAPS_SYSTEM=y

drivers/dma/Kconfig

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,20 @@ config LOONGSON1_APB_DMA
378378
This selects support for the APB DMA controller in Loongson1 SoCs,
379379
which is required by Loongson1 NAND and audio support.
380380

381+
config LOONGSON2_APB_DMA
382+
tristate "Loongson2 APB DMA support"
383+
depends on LOONGARCH || COMPILE_TEST
384+
select DMA_ENGINE
385+
select DMA_VIRTUAL_CHANNELS
386+
help
387+
Support for the Loongson2 APB DMA controller driver. The
388+
DMA controller is having single DMA channel which can be
389+
configured for different peripherals like audio, nand, sdio
390+
etc which is in APB bus.
391+
392+
This DMA controller transfers data from memory to peripheral fifo.
393+
It does not support memory to memory data transfer.
394+
381395
config LPC18XX_DMAMUX
382396
bool "NXP LPC18xx/43xx DMA MUX for PL080"
383397
depends on ARCH_LPC18XX || COMPILE_TEST
@@ -396,20 +410,6 @@ config LPC32XX_DMAMUX
396410
Support for PL080 multiplexed DMA request lines on
397411
LPC32XX platrofm.
398412

399-
config LS2X_APB_DMA
400-
tristate "Loongson LS2X APB DMA support"
401-
depends on LOONGARCH || COMPILE_TEST
402-
select DMA_ENGINE
403-
select DMA_VIRTUAL_CHANNELS
404-
help
405-
Support for the Loongson LS2X APB DMA controller driver. The
406-
DMA controller is having single DMA channel which can be
407-
configured for different peripherals like audio, nand, sdio
408-
etc which is in APB bus.
409-
410-
This DMA controller transfers data from memory to peripheral fifo.
411-
It does not support memory to memory data transfer.
412-
413413
config MCF_EDMA
414414
tristate "Freescale eDMA engine support, ColdFire mcf5441x SoCs"
415415
depends on M5441x || (COMPILE_TEST && FSL_EDMA=n)

drivers/dma/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ obj-$(CONFIG_INTEL_IOATDMA) += ioat/
5050
obj-y += idxd/
5151
obj-$(CONFIG_K3_DMA) += k3dma.o
5252
obj-$(CONFIG_LOONGSON1_APB_DMA) += loongson1-apb-dma.o
53+
obj-$(CONFIG_LOONGSON2_APB_DMA) += loongson2-apb-dma.o
5354
obj-$(CONFIG_LPC18XX_DMAMUX) += lpc18xx-dmamux.o
5455
obj-$(CONFIG_LPC32XX_DMAMUX) += lpc32xx-dmamux.o
55-
obj-$(CONFIG_LS2X_APB_DMA) += ls2x-apb-dma.o
5656
obj-$(CONFIG_MILBEAUT_HDMAC) += milbeaut-hdmac.o
5757
obj-$(CONFIG_MILBEAUT_XDMAC) += milbeaut-xdmac.o
5858
obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o

drivers/dma/ls2x-apb-dma.c renamed to drivers/dma/loongson2-apb-dma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
/*
3-
* Driver for the Loongson LS2X APB DMA Controller
3+
* Driver for the Loongson-2 APB DMA Controller
44
*
55
* Copyright (C) 2017-2023 Loongson Corporation
66
*/
@@ -700,6 +700,6 @@ static struct platform_driver ls2x_dmac_driver = {
700700
};
701701
module_platform_driver(ls2x_dmac_driver);
702702

703-
MODULE_DESCRIPTION("Loongson LS2X APB DMA Controller driver");
703+
MODULE_DESCRIPTION("Loongson-2 APB DMA Controller driver");
704704
MODULE_AUTHOR("Loongson Technology Corporation Limited");
705705
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)