Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc, dma: move bestcomm driver from arch/powerpc/sysdev to drivers/dma

The bestcomm dma hardware, and some of its users like the FEC ethernet
component, is used in different FreeScale parts, including non-powerpc
parts like the ColdFire MCF547x & MCF548x families. Don't keep the
driver hidden in arch/powerpc where it is inaccessible for other arches.
.c files are moved to drivers/dma/bestcomm, while .h files are moved to
include/linux/fsl/bestcomm. Makefiles, Kconfigs and #include directives
are updated for the new file locations.

Tested by recompiling for MPC5200 with all bestcomm users enabled.

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Anatolij Gustschin <agust@denx.de>

authored by

Philippe De Muyter and committed by
Anatolij Gustschin
9a322993 d1c3ed66

+27 -27
+3 -3
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
··· 20 20 #include <asm/mpc52xx.h> 21 21 #include <asm/time.h> 22 22 23 - #include <sysdev/bestcomm/bestcomm.h> 24 - #include <sysdev/bestcomm/bestcomm_priv.h> 25 - #include <sysdev/bestcomm/gen_bd.h> 23 + #include <linux/fsl/bestcomm/bestcomm.h> 24 + #include <linux/fsl/bestcomm/bestcomm_priv.h> 25 + #include <linux/fsl/bestcomm/gen_bd.h> 26 26 27 27 MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>"); 28 28 MODULE_DESCRIPTION("MPC5200 LocalPlus FIFO device driver");
-2
arch/powerpc/platforms/Kconfig
··· 352 352 Uses information from the OF or flattened device tree to instantiate 353 353 platform devices for direct mapped RTC chips like the DS1742 or DS1743. 354 354 355 - source "arch/powerpc/sysdev/bestcomm/Kconfig" 356 - 357 355 config SIMPLE_GPIO 358 356 bool "Support for simple, memory-mapped GPIO controllers" 359 357 depends on PPC
-1
arch/powerpc/sysdev/Makefile
··· 26 26 obj-$(CONFIG_FSL_RIO) += fsl_rio.o fsl_rmu.o 27 27 obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o 28 28 obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ 29 - obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ 30 29 mv64x60-$(CONFIG_PCI) += mv64x60_pci.o 31 30 obj-$(CONFIG_MV64X60) += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \ 32 31 mv64x60_udbg.o
arch/powerpc/sysdev/bestcomm/Kconfig drivers/dma/bestcomm/Kconfig
arch/powerpc/sysdev/bestcomm/Makefile drivers/dma/bestcomm/Makefile
+3 -3
arch/powerpc/sysdev/bestcomm/ata.c drivers/dma/bestcomm/ata.c
··· 18 18 #include <linux/types.h> 19 19 #include <asm/io.h> 20 20 21 - #include "bestcomm.h" 22 - #include "bestcomm_priv.h" 23 - #include "ata.h" 21 + #include <linux/fsl/bestcomm/bestcomm.h> 22 + #include <linux/fsl/bestcomm/bestcomm_priv.h> 23 + #include <linux/fsl/bestcomm/ata.h> 24 24 25 25 26 26 /* ======================================================================== */
arch/powerpc/sysdev/bestcomm/ata.h include/linux/fsl/bestcomm/ata.h
arch/powerpc/sysdev/bestcomm/bcom_ata_task.c drivers/dma/bestcomm/bcom_ata_task.c
arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c drivers/dma/bestcomm/bcom_fec_rx_task.c
arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c drivers/dma/bestcomm/bcom_fec_tx_task.c
arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c drivers/dma/bestcomm/bcom_gen_bd_rx_task.c
arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c drivers/dma/bestcomm/bcom_gen_bd_tx_task.c
+3 -3
arch/powerpc/sysdev/bestcomm/bestcomm.c drivers/dma/bestcomm/bestcomm.c
··· 23 23 #include <asm/irq.h> 24 24 #include <asm/mpc52xx.h> 25 25 26 - #include "sram.h" 27 - #include "bestcomm_priv.h" 28 - #include "bestcomm.h" 26 + #include <linux/fsl/bestcomm/sram.h> 27 + #include <linux/fsl/bestcomm/bestcomm_priv.h> 28 + #include "linux/fsl/bestcomm/bestcomm.h" 29 29 30 30 #define DRIVER_NAME "bestcomm-core" 31 31
arch/powerpc/sysdev/bestcomm/bestcomm.h include/linux/fsl/bestcomm/bestcomm.h
arch/powerpc/sysdev/bestcomm/bestcomm_priv.h include/linux/fsl/bestcomm/bestcomm_priv.h
+3 -3
arch/powerpc/sysdev/bestcomm/fec.c drivers/dma/bestcomm/fec.c
··· 16 16 #include <linux/types.h> 17 17 #include <asm/io.h> 18 18 19 - #include "bestcomm.h" 20 - #include "bestcomm_priv.h" 21 - #include "fec.h" 19 + #include <linux/fsl/bestcomm/bestcomm.h> 20 + #include <linux/fsl/bestcomm/bestcomm_priv.h> 21 + #include <linux/fsl/bestcomm/fec.h> 22 22 23 23 24 24 /* ======================================================================== */
arch/powerpc/sysdev/bestcomm/fec.h include/linux/fsl/bestcomm/fec.h
+3 -3
arch/powerpc/sysdev/bestcomm/gen_bd.c drivers/dma/bestcomm/gen_bd.c
··· 21 21 #include <asm/mpc52xx.h> 22 22 #include <asm/mpc52xx_psc.h> 23 23 24 - #include "bestcomm.h" 25 - #include "bestcomm_priv.h" 26 - #include "gen_bd.h" 24 + #include <linux/fsl/bestcomm/bestcomm.h> 25 + #include <linux/fsl/bestcomm/bestcomm_priv.h> 26 + #include <linux/fsl/bestcomm/gen_bd.h> 27 27 28 28 29 29 /* ======================================================================== */
arch/powerpc/sysdev/bestcomm/gen_bd.h include/linux/fsl/bestcomm/gen_bd.h
+1 -1
arch/powerpc/sysdev/bestcomm/sram.c drivers/dma/bestcomm/sram.c
··· 23 23 #include <asm/io.h> 24 24 #include <asm/mmu.h> 25 25 26 - #include "sram.h" 26 + #include <linux/fsl/bestcomm/sram.h> 27 27 28 28 29 29 /* Struct keeping our 'state' */
arch/powerpc/sysdev/bestcomm/sram.h include/linux/fsl/bestcomm/sram.h
+1 -1
drivers/Makefile
··· 29 29 obj-y += amba/ 30 30 # Many drivers will want to use DMA so this has to be made available 31 31 # really early. 32 - obj-$(CONFIG_DMA_ENGINE) += dma/ 32 + obj-$(CONFIG_DMADEVICES) += dma/ 33 33 34 34 obj-$(CONFIG_VIRTIO) += virtio/ 35 35 obj-$(CONFIG_XEN) += xen/
+3 -3
drivers/ata/pata_mpc52xx.c
··· 26 26 #include <asm/prom.h> 27 27 #include <asm/mpc52xx.h> 28 28 29 - #include <sysdev/bestcomm/bestcomm.h> 30 - #include <sysdev/bestcomm/bestcomm_priv.h> 31 - #include <sysdev/bestcomm/ata.h> 29 + #include <linux/fsl/bestcomm/bestcomm.h> 30 + #include <linux/fsl/bestcomm/bestcomm_priv.h> 31 + #include <linux/fsl/bestcomm/ata.h> 32 32 33 33 #define DRV_NAME "mpc52xx_ata" 34 34
+2
drivers/dma/Kconfig
··· 125 125 ---help--- 126 126 Enable support for the Freescale MPC512x built-in DMA engine. 127 127 128 + source "drivers/dma/bestcomm/Kconfig" 129 + 128 130 config MV_XOR 129 131 bool "Marvell XOR engine support" 130 132 depends on PLAT_ORION
+1
drivers/dma/Makefile
··· 10 10 obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o 11 11 obj-$(CONFIG_FSL_DMA) += fsldma.o 12 12 obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o 13 + obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ 13 14 obj-$(CONFIG_MV_XOR) += mv_xor.o 14 15 obj-$(CONFIG_DW_DMAC) += dw_dmac.o 15 16 obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
+2 -2
drivers/net/ethernet/freescale/fec_mpc52xx.c
··· 40 40 #include <asm/delay.h> 41 41 #include <asm/mpc52xx.h> 42 42 43 - #include <sysdev/bestcomm/bestcomm.h> 44 - #include <sysdev/bestcomm/fec.h> 43 + #include <linux/fsl/bestcomm/bestcomm.h> 44 + #include <linux/fsl/bestcomm/fec.h> 45 45 46 46 #include "fec_mpc52xx.h" 47 47
+2 -2
sound/soc/fsl/mpc5200_dma.c
··· 14 14 15 15 #include <sound/soc.h> 16 16 17 - #include <sysdev/bestcomm/bestcomm.h> 18 - #include <sysdev/bestcomm/gen_bd.h> 17 + #include <linux/fsl/bestcomm/bestcomm.h> 18 + #include <linux/fsl/bestcomm/gen_bd.h> 19 19 #include <asm/mpc52xx_psc.h> 20 20 21 21 #include "mpc5200_dma.h"