diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-spear13xx/spear1340.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-spear13xx/spear13xx-dma.h (renamed from arch/arm/mach-spear13xx/include/mach/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-spear13xx/spear13xx.c | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-spear13xx/spear1340.c b/arch/arm/mach-spear13xx/spear1340.c index 9a28beb2a113..b01c4c7009a7 100644 --- a/arch/arm/mach-spear13xx/spear1340.c +++ b/arch/arm/mach-spear13xx/spear1340.c | |||
@@ -20,10 +20,11 @@ | |||
20 | #include <linux/of_platform.h> | 20 | #include <linux/of_platform.h> |
21 | #include <linux/irqchip.h> | 21 | #include <linux/irqchip.h> |
22 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
23 | #include <mach/dma.h> | ||
24 | #include <mach/generic.h> | 23 | #include <mach/generic.h> |
25 | #include <mach/spear.h> | 24 | #include <mach/spear.h> |
26 | 25 | ||
26 | #include "spear13xx-dma.h" | ||
27 | |||
27 | /* Base addresses */ | 28 | /* Base addresses */ |
28 | #define SPEAR1340_SATA_BASE UL(0xB1000000) | 29 | #define SPEAR1340_SATA_BASE UL(0xB1000000) |
29 | #define SPEAR1340_UART1_BASE UL(0xB4100000) | 30 | #define SPEAR1340_UART1_BASE UL(0xB4100000) |
diff --git a/arch/arm/mach-spear13xx/include/mach/dma.h b/arch/arm/mach-spear13xx/spear13xx-dma.h index d50bdb605925..d50bdb605925 100644 --- a/arch/arm/mach-spear13xx/include/mach/dma.h +++ b/arch/arm/mach-spear13xx/spear13xx-dma.h | |||
diff --git a/arch/arm/mach-spear13xx/spear13xx.c b/arch/arm/mach-spear13xx/spear13xx.c index c7d2b4a8d8cc..988fefebf81e 100644 --- a/arch/arm/mach-spear13xx/spear13xx.c +++ b/arch/arm/mach-spear13xx/spear13xx.c | |||
@@ -21,10 +21,11 @@ | |||
21 | #include <asm/hardware/cache-l2x0.h> | 21 | #include <asm/hardware/cache-l2x0.h> |
22 | #include <asm/mach/map.h> | 22 | #include <asm/mach/map.h> |
23 | #include <asm/smp_twd.h> | 23 | #include <asm/smp_twd.h> |
24 | #include <mach/dma.h> | ||
25 | #include <mach/generic.h> | 24 | #include <mach/generic.h> |
26 | #include <mach/spear.h> | 25 | #include <mach/spear.h> |
27 | 26 | ||
27 | #include "spear13xx-dma.h" | ||
28 | |||
28 | /* common dw_dma filter routine to be used by peripherals */ | 29 | /* common dw_dma filter routine to be used by peripherals */ |
29 | bool dw_dma_filter(struct dma_chan *chan, void *slave) | 30 | bool dw_dma_filter(struct dma_chan *chan, void *slave) |
30 | { | 31 | { |