projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: OMAP2+: Remove dma.h
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
omap_hwmod_2xxx_3xxx_ipblock_data.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
index 534974e08add21655fbea5fe647c45670c2e0102..5da7a42a6d9085984b79e10c0e46423432f7b0f0 100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
+++ b/
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
@@
-17,7
+17,6
@@
#include "hdq1w.h"
#include "omap_hwmod_common_data.h"
#include "hdq1w.h"
#include "omap_hwmod_common_data.h"
-#include "dma.h"
/* UART */
/* UART */
@@
-89,32
+88,32
@@
struct omap_hwmod_class omap2_venc_hwmod_class = {
/* Common DMA request line data */
struct omap_hwmod_dma_info omap2_uart1_sdma_reqs[] = {
/* Common DMA request line data */
struct omap_hwmod_dma_info omap2_uart1_sdma_reqs[] = {
- { .name = "rx", .dma_req =
OMAP24XX_DMA_UART1_RX
, },
- { .name = "tx", .dma_req =
OMAP24XX_DMA_UART1_TX
, },
+ { .name = "rx", .dma_req =
50
, },
+ { .name = "tx", .dma_req =
49
, },
{ .dma_req = -1 }
};
struct omap_hwmod_dma_info omap2_uart2_sdma_reqs[] = {
{ .dma_req = -1 }
};
struct omap_hwmod_dma_info omap2_uart2_sdma_reqs[] = {
- { .name = "rx", .dma_req =
OMAP24XX_DMA_UART2_RX
, },
- { .name = "tx", .dma_req =
OMAP24XX_DMA_UART2_TX
, },
+ { .name = "rx", .dma_req =
52
, },
+ { .name = "tx", .dma_req =
51
, },
{ .dma_req = -1 }
};
struct omap_hwmod_dma_info omap2_uart3_sdma_reqs[] = {
{ .dma_req = -1 }
};
struct omap_hwmod_dma_info omap2_uart3_sdma_reqs[] = {
- { .name = "rx", .dma_req =
OMAP24XX_DMA_UART3_RX
, },
- { .name = "tx", .dma_req =
OMAP24XX_DMA_UART3_TX
, },
+ { .name = "rx", .dma_req =
54
, },
+ { .name = "tx", .dma_req =
53
, },
{ .dma_req = -1 }
};
struct omap_hwmod_dma_info omap2_i2c1_sdma_reqs[] = {
{ .dma_req = -1 }
};
struct omap_hwmod_dma_info omap2_i2c1_sdma_reqs[] = {
- { .name = "tx", .dma_req =
OMAP24XX_DMA_I2C1_TX
},
- { .name = "rx", .dma_req =
OMAP24XX_DMA_I2C1_RX
},
+ { .name = "tx", .dma_req =
27
},
+ { .name = "rx", .dma_req =
28
},
{ .dma_req = -1 }
};
struct omap_hwmod_dma_info omap2_i2c2_sdma_reqs[] = {
{ .dma_req = -1 }
};
struct omap_hwmod_dma_info omap2_i2c2_sdma_reqs[] = {
- { .name = "tx", .dma_req =
OMAP24XX_DMA_I2C2_TX
},
- { .name = "rx", .dma_req =
OMAP24XX_DMA_I2C2_RX
},
+ { .name = "tx", .dma_req =
29
},
+ { .name = "rx", .dma_req =
30
},
{ .dma_req = -1 }
};
{ .dma_req = -1 }
};