diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-09-08 03:26:43 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:12:56 -0400 |
commit | 87f3dd77974cba1ba0798abd741ede50f56b3eb3 (patch) | |
tree | 9f89bf77ac4ddc919a91b438d061849314ea5049 /drivers/net/irda/pxaficp_ir.c | |
parent | cbd18f8e3de62f91001963467ab6aad80a2a25ac (diff) |
[ARM] pxa: simplify DMA register definitions
1. DRCMRxx is no longer recommended, use DRCMR(xx) instead, and
pass DRCMR index by "struct resource" if possible
2. DCSRxx, DDADRxx, DSADRxx, DTADRxx, DCMDxx is never used, use
DCSR(), DDADR(), DSADR(), DTADR(), DCMD() instead
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/net/irda/pxaficp_ir.c')
-rw-r--r-- | drivers/net/irda/pxaficp_ir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index 4aa61a1a3d55..c5b02b66f756 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
@@ -572,8 +572,8 @@ static void pxa_irda_startup(struct pxa_irda *si) | |||
572 | ICCR2 = ICCR2_TXP | ICCR2_TRIG_32; | 572 | ICCR2 = ICCR2_TXP | ICCR2_TRIG_32; |
573 | 573 | ||
574 | /* configure DMAC */ | 574 | /* configure DMAC */ |
575 | DRCMR17 = si->rxdma | DRCMR_MAPVLD; | 575 | DRCMR(17) = si->rxdma | DRCMR_MAPVLD; |
576 | DRCMR18 = si->txdma | DRCMR_MAPVLD; | 576 | DRCMR(18) = si->txdma | DRCMR_MAPVLD; |
577 | 577 | ||
578 | /* force SIR reinitialization */ | 578 | /* force SIR reinitialization */ |
579 | si->speed = 4000000; | 579 | si->speed = 4000000; |
@@ -602,8 +602,8 @@ static void pxa_irda_shutdown(struct pxa_irda *si) | |||
602 | /* disable the STUART or FICP clocks */ | 602 | /* disable the STUART or FICP clocks */ |
603 | pxa_irda_disable_clk(si); | 603 | pxa_irda_disable_clk(si); |
604 | 604 | ||
605 | DRCMR17 = 0; | 605 | DRCMR(17) = 0; |
606 | DRCMR18 = 0; | 606 | DRCMR(18) = 0; |
607 | 607 | ||
608 | local_irq_restore(flags); | 608 | local_irq_restore(flags); |
609 | 609 | ||