From 9a32299394d8cce79ca7d0098dc32c4f14032dcd Mon Sep 17 00:00:00 2001 From: Philippe De Muyter Date: Fri, 12 Oct 2012 17:52:45 +0200 Subject: [PATCH] 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 Signed-off-by: Anatolij Gustschin --- arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 6 +++--- arch/powerpc/platforms/Kconfig | 2 -- arch/powerpc/sysdev/Makefile | 1 - drivers/Makefile | 2 +- drivers/ata/pata_mpc52xx.c | 6 +++--- drivers/dma/Kconfig | 2 ++ drivers/dma/Makefile | 1 + {arch/powerpc/sysdev => drivers/dma}/bestcomm/Kconfig | 0 {arch/powerpc/sysdev => drivers/dma}/bestcomm/Makefile | 0 {arch/powerpc/sysdev => drivers/dma}/bestcomm/ata.c | 6 +++--- .../powerpc/sysdev => drivers/dma}/bestcomm/bcom_ata_task.c | 0 .../sysdev => drivers/dma}/bestcomm/bcom_fec_rx_task.c | 0 .../sysdev => drivers/dma}/bestcomm/bcom_fec_tx_task.c | 0 .../sysdev => drivers/dma}/bestcomm/bcom_gen_bd_rx_task.c | 0 .../sysdev => drivers/dma}/bestcomm/bcom_gen_bd_tx_task.c | 0 {arch/powerpc/sysdev => drivers/dma}/bestcomm/bestcomm.c | 6 +++--- {arch/powerpc/sysdev => drivers/dma}/bestcomm/fec.c | 6 +++--- {arch/powerpc/sysdev => drivers/dma}/bestcomm/gen_bd.c | 6 +++--- {arch/powerpc/sysdev => drivers/dma}/bestcomm/sram.c | 2 +- drivers/net/ethernet/freescale/fec_mpc52xx.c | 4 ++-- {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/ata.h | 0 .../sysdev => include/linux/fsl}/bestcomm/bestcomm.h | 0 .../sysdev => include/linux/fsl}/bestcomm/bestcomm_priv.h | 0 {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/fec.h | 0 .../powerpc/sysdev => include/linux/fsl}/bestcomm/gen_bd.h | 0 {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/sram.h | 0 sound/soc/fsl/mpc5200_dma.c | 4 ++-- 27 files changed, 27 insertions(+), 27 deletions(-) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/Kconfig (100%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/Makefile (100%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/ata.c (97%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_ata_task.c (100%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_fec_rx_task.c (100%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_fec_tx_task.c (100%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_gen_bd_rx_task.c (100%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bcom_gen_bd_tx_task.c (100%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/bestcomm.c (99%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/fec.c (98%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/gen_bd.c (98%) rename {arch/powerpc/sysdev => drivers/dma}/bestcomm/sram.c (99%) rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/ata.h (100%) rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/bestcomm.h (100%) rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/bestcomm_priv.h (100%) rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/fec.h (100%) rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/gen_bd.h (100%) rename {arch/powerpc/sysdev => include/linux/fsl}/bestcomm/sram.h (100%) diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c index 16150fa430f9..93fa645904e6 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include MODULE_AUTHOR("Grant Likely "); MODULE_DESCRIPTION("MPC5200 LocalPlus FIFO device driver"); diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 48a920d51489..52de8bccfb30 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -352,8 +352,6 @@ config OF_RTC Uses information from the OF or flattened device tree to instantiate platform devices for direct mapped RTC chips like the DS1742 or DS1743. -source "arch/powerpc/sysdev/bestcomm/Kconfig" - config SIMPLE_GPIO bool "Support for simple, memory-mapped GPIO controllers" depends on PPC diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index a57600b3a4e3..3884776600fd 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -26,7 +26,6 @@ obj-$(CONFIG_SIMPLE_GPIO) += simple_gpio.o obj-$(CONFIG_FSL_RIO) += fsl_rio.o fsl_rmu.o obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ -obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ mv64x60-$(CONFIG_PCI) += mv64x60_pci.o obj-$(CONFIG_MV64X60) += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \ mv64x60_udbg.o diff --git a/drivers/Makefile b/drivers/Makefile index 7863b9fee50b..d8372ab2e4cf 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -29,7 +29,7 @@ obj-$(CONFIG_PNP) += pnp/ obj-y += amba/ # Many drivers will want to use DMA so this has to be made available # really early. -obj-$(CONFIG_DMA_ENGINE) += dma/ +obj-$(CONFIG_DMADEVICES) += dma/ obj-$(CONFIG_VIRTIO) += virtio/ obj-$(CONFIG_XEN) += xen/ diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c index ec67f54dc56f..0b363e9d42a5 100644 --- a/drivers/ata/pata_mpc52xx.c +++ b/drivers/ata/pata_mpc52xx.c @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include +#include +#include #define DRV_NAME "mpc52xx_ata" diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index d4c12180c654..40179e749f08 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -125,6 +125,8 @@ config MPC512X_DMA ---help--- Enable support for the Freescale MPC512x built-in DMA engine. +source "drivers/dma/bestcomm/Kconfig" + config MV_XOR bool "Marvell XOR engine support" depends on PLAT_ORION diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index 7428feaa8705..642d96736cf5 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_INTEL_IOATDMA) += ioat/ obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o obj-$(CONFIG_FSL_DMA) += fsldma.o obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o +obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ obj-$(CONFIG_MV_XOR) += mv_xor.o obj-$(CONFIG_DW_DMAC) += dw_dmac.o obj-$(CONFIG_AT_HDMAC) += at_hdmac.o diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/drivers/dma/bestcomm/Kconfig similarity index 100% rename from arch/powerpc/sysdev/bestcomm/Kconfig rename to drivers/dma/bestcomm/Kconfig diff --git a/arch/powerpc/sysdev/bestcomm/Makefile b/drivers/dma/bestcomm/Makefile similarity index 100% rename from arch/powerpc/sysdev/bestcomm/Makefile rename to drivers/dma/bestcomm/Makefile diff --git a/arch/powerpc/sysdev/bestcomm/ata.c b/drivers/dma/bestcomm/ata.c similarity index 97% rename from arch/powerpc/sysdev/bestcomm/ata.c rename to drivers/dma/bestcomm/ata.c index 901c9f91e5dd..2fd87f83cf90 100644 --- a/arch/powerpc/sysdev/bestcomm/ata.c +++ b/drivers/dma/bestcomm/ata.c @@ -18,9 +18,9 @@ #include #include -#include "bestcomm.h" -#include "bestcomm_priv.h" -#include "ata.h" +#include +#include +#include /* ======================================================================== */ diff --git a/arch/powerpc/sysdev/bestcomm/bcom_ata_task.c b/drivers/dma/bestcomm/bcom_ata_task.c similarity index 100% rename from arch/powerpc/sysdev/bestcomm/bcom_ata_task.c rename to drivers/dma/bestcomm/bcom_ata_task.c diff --git a/arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c b/drivers/dma/bestcomm/bcom_fec_rx_task.c similarity index 100% rename from arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c rename to drivers/dma/bestcomm/bcom_fec_rx_task.c diff --git a/arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c b/drivers/dma/bestcomm/bcom_fec_tx_task.c similarity index 100% rename from arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c rename to drivers/dma/bestcomm/bcom_fec_tx_task.c diff --git a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c b/drivers/dma/bestcomm/bcom_gen_bd_rx_task.c similarity index 100% rename from arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c rename to drivers/dma/bestcomm/bcom_gen_bd_rx_task.c diff --git a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c b/drivers/dma/bestcomm/bcom_gen_bd_tx_task.c similarity index 100% rename from arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c rename to drivers/dma/bestcomm/bcom_gen_bd_tx_task.c diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/drivers/dma/bestcomm/bestcomm.c similarity index 99% rename from arch/powerpc/sysdev/bestcomm/bestcomm.c rename to drivers/dma/bestcomm/bestcomm.c index b3fbb271be87..67371fb820d3 100644 --- a/arch/powerpc/sysdev/bestcomm/bestcomm.c +++ b/drivers/dma/bestcomm/bestcomm.c @@ -23,9 +23,9 @@ #include #include -#include "sram.h" -#include "bestcomm_priv.h" -#include "bestcomm.h" +#include +#include +#include "linux/fsl/bestcomm/bestcomm.h" #define DRIVER_NAME "bestcomm-core" diff --git a/arch/powerpc/sysdev/bestcomm/fec.c b/drivers/dma/bestcomm/fec.c similarity index 98% rename from arch/powerpc/sysdev/bestcomm/fec.c rename to drivers/dma/bestcomm/fec.c index 957a988d23ea..7f1fb1c999e4 100644 --- a/arch/powerpc/sysdev/bestcomm/fec.c +++ b/drivers/dma/bestcomm/fec.c @@ -16,9 +16,9 @@ #include #include -#include "bestcomm.h" -#include "bestcomm_priv.h" -#include "fec.h" +#include +#include +#include /* ======================================================================== */ diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.c b/drivers/dma/bestcomm/gen_bd.c similarity index 98% rename from arch/powerpc/sysdev/bestcomm/gen_bd.c rename to drivers/dma/bestcomm/gen_bd.c index e0a53e3147b2..1a5b22d88127 100644 --- a/arch/powerpc/sysdev/bestcomm/gen_bd.c +++ b/drivers/dma/bestcomm/gen_bd.c @@ -21,9 +21,9 @@ #include #include -#include "bestcomm.h" -#include "bestcomm_priv.h" -#include "gen_bd.h" +#include +#include +#include /* ======================================================================== */ diff --git a/arch/powerpc/sysdev/bestcomm/sram.c b/drivers/dma/bestcomm/sram.c similarity index 99% rename from arch/powerpc/sysdev/bestcomm/sram.c rename to drivers/dma/bestcomm/sram.c index b6db23e085fb..5e2ed30ba2c4 100644 --- a/arch/powerpc/sysdev/bestcomm/sram.c +++ b/drivers/dma/bestcomm/sram.c @@ -23,7 +23,7 @@ #include #include -#include "sram.h" +#include /* Struct keeping our 'state' */ diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c index 817d081d2cd8..85e776d500a6 100644 --- a/drivers/net/ethernet/freescale/fec_mpc52xx.c +++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c @@ -40,8 +40,8 @@ #include #include -#include -#include +#include +#include #include "fec_mpc52xx.h" diff --git a/arch/powerpc/sysdev/bestcomm/ata.h b/include/linux/fsl/bestcomm/ata.h similarity index 100% rename from arch/powerpc/sysdev/bestcomm/ata.h rename to include/linux/fsl/bestcomm/ata.h diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.h b/include/linux/fsl/bestcomm/bestcomm.h similarity index 100% rename from arch/powerpc/sysdev/bestcomm/bestcomm.h rename to include/linux/fsl/bestcomm/bestcomm.h diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h b/include/linux/fsl/bestcomm/bestcomm_priv.h similarity index 100% rename from arch/powerpc/sysdev/bestcomm/bestcomm_priv.h rename to include/linux/fsl/bestcomm/bestcomm_priv.h diff --git a/arch/powerpc/sysdev/bestcomm/fec.h b/include/linux/fsl/bestcomm/fec.h similarity index 100% rename from arch/powerpc/sysdev/bestcomm/fec.h rename to include/linux/fsl/bestcomm/fec.h diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.h b/include/linux/fsl/bestcomm/gen_bd.h similarity index 100% rename from arch/powerpc/sysdev/bestcomm/gen_bd.h rename to include/linux/fsl/bestcomm/gen_bd.h diff --git a/arch/powerpc/sysdev/bestcomm/sram.h b/include/linux/fsl/bestcomm/sram.h similarity index 100% rename from arch/powerpc/sysdev/bestcomm/sram.h rename to include/linux/fsl/bestcomm/sram.h diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index 9997c039bb24..2a847ca494b5 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -14,8 +14,8 @@ #include -#include -#include +#include +#include #include #include "mpc5200_dma.h"