diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 18:20:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 18:20:41 -0500 |
commit | 3298a3511f1e73255a8dc023efd909e569eea037 (patch) | |
tree | 2d8e9bdb9e398049e3876b99fbb4d51099a45cc3 /drivers/net/ethernet | |
parent | 5ce7aba976ebdfbf467e3cbcd3a7536ebdec4b11 (diff) | |
parent | acb7452369e4f8749dd32d48dbda98936035a87c (diff) |
Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC multiplatform support from Arnd Bergmann:
"Converting more ARM platforms to multiplatform support. This time,
OMAP gets converted, which is a major step since this is by far the
largest platform in terms of code size. The same thing happens to the
vt8500 platform."
* tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
net: cwdavinci_cpdma: export symbols for cpsw
remoteproc: omap: depend on OMAP_MBOX_FWK
[media] davinci: do not include mach/hardware.h
ARM: OMAP2+: Make sure files with omap initcalls include soc.h
ARM: OMAP2+: Include soc.h to drm.c to fix compiling
ARM: OMAP2+: Fix warning for hwspinlock omap_postcore_initcall
ARM: multi_v7_defconfig: add ARCH_ZYNQ
ARM: multi_v7_defconfig: remove unnecessary CONFIG_GPIOLIB
arm: vt8500: Remove remaining mach includes
arm: vt8500: Convert debug-macro.S to be multiplatform friendly
arm: vt8500: Remove single platform Kconfig options
ARM: OMAP2+: Remove now obsolete uncompress.h and debug-macro.S
ARM: OMAP2+: Add minimal support for booting vexpress
ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support
ARM: OMAP2+: Disable code that currently does not work with multiplaform
ARM: OMAP2+: Add multiplatform debug_ll support
ARM: OMAP: Fix dmaengine init for multiplatform
ARM: OMAP: Fix i2c cmdline initcall for multiplatform
ARM: OMAP2+: Use omap initcalls
ARM: OMAP2+: Limit omap initcalls to omap only on multiplatform kernels
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/ti/davinci_cpdma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index 68c3418160ba..ee13dc78430c 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c | |||
@@ -492,11 +492,13 @@ int cpdma_ctlr_int_ctrl(struct cpdma_ctlr *ctlr, bool enable) | |||
492 | spin_unlock_irqrestore(&ctlr->lock, flags); | 492 | spin_unlock_irqrestore(&ctlr->lock, flags); |
493 | return 0; | 493 | return 0; |
494 | } | 494 | } |
495 | EXPORT_SYMBOL_GPL(cpdma_ctlr_int_ctrl); | ||
495 | 496 | ||
496 | void cpdma_ctlr_eoi(struct cpdma_ctlr *ctlr, u32 value) | 497 | void cpdma_ctlr_eoi(struct cpdma_ctlr *ctlr, u32 value) |
497 | { | 498 | { |
498 | dma_reg_write(ctlr, CPDMA_MACEOIVECTOR, value); | 499 | dma_reg_write(ctlr, CPDMA_MACEOIVECTOR, value); |
499 | } | 500 | } |
501 | EXPORT_SYMBOL_GPL(cpdma_ctlr_eoi); | ||
500 | 502 | ||
501 | struct cpdma_chan *cpdma_chan_create(struct cpdma_ctlr *ctlr, int chan_num, | 503 | struct cpdma_chan *cpdma_chan_create(struct cpdma_ctlr *ctlr, int chan_num, |
502 | cpdma_handler_fn handler) | 504 | cpdma_handler_fn handler) |
@@ -1028,3 +1030,4 @@ unlock_ret: | |||
1028 | spin_unlock_irqrestore(&ctlr->lock, flags); | 1030 | spin_unlock_irqrestore(&ctlr->lock, flags); |
1029 | return ret; | 1031 | return ret; |
1030 | } | 1032 | } |
1033 | EXPORT_SYMBOL_GPL(cpdma_control_set); | ||