diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-26 00:50:17 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-12 18:02:23 -0400 |
| commit | b27af39935855c88ef2203dcfc1ff54e013237c4 (patch) | |
| tree | 741e0eb177bf5dab0e50cc99b4c6a5983ef07fbb /drivers | |
| parent | 29487ef4d5d720012658cb7a093af742f8ae2af5 (diff) | |
| download | u-boot-b27af39935855c88ef2203dcfc1ff54e013237c4.zip u-boot-b27af39935855c88ef2203dcfc1ff54e013237c4.tar.gz u-boot-b27af39935855c88ef2203dcfc1ff54e013237c4.tar.bz2 | |
dma: import linux/dma-direction.h to consolidate enum dma_data_direction
Import include/linux/dma-direction.h from Linux 4.13-rc7 and delete
duplicated definitions of enum dma_data_direction.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/sata_dwc.c | 1 | ||||
| -rw-r--r-- | drivers/ata/sata_dwc.h | 7 | ||||
| -rw-r--r-- | drivers/mmc/uniphier-sd.c | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/drivers/ata/sata_dwc.c b/drivers/ata/sata_dwc.c index a226ca2..2f3b2dd 100644 --- a/drivers/ata/sata_dwc.c +++ b/drivers/ata/sata_dwc.c @@ -26,6 +26,7 @@ #include <command.h> #include <pci.h> #include <asm/processor.h> +#include <linux/dma-direction.h> #include <linux/errno.h> #include <asm/io.h> #include <malloc.h> diff --git a/drivers/ata/sata_dwc.h b/drivers/ata/sata_dwc.h index e2d9e0c..17fb20c 100644 --- a/drivers/ata/sata_dwc.h +++ b/drivers/ata/sata_dwc.h @@ -401,13 +401,6 @@ struct ata_device { #endif }; -enum dma_data_direction { - DMA_BIDIRECTIONAL = 0, - DMA_TO_DEVICE = 1, - DMA_FROM_DEVICE = 2, - DMA_NONE = 3, -}; - struct ata_link { struct ata_port *ap; int pmp; diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c index e272b14..721b75f 100644 --- a/drivers/mmc/uniphier-sd.c +++ b/drivers/mmc/uniphier-sd.c @@ -11,10 +11,10 @@ #include <mmc.h> #include <dm.h> #include <linux/compat.h> +#include <linux/dma-direction.h> #include <linux/io.h> #include <linux/sizes.h> #include <asm/unaligned.h> -#include <asm/dma-mapping.h> DECLARE_GLOBAL_DATA_PTR; |