#include <asm/irq.h>
#include <asm/io.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
#include <asm/serial.h>
#include <asm/mach-types.h>
#include <asm/dma.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/irda.h>
+#include <mach/mux.h>
+#include <mach/gpio.h>
+#include <mach/irda.h>
#define UART3_EFR_EN (1 << 4)
#define UART3_MCR_EN_TCR_TLR (1 << 6)
skb_reserve(skb, 1);
- w = OMAP_DMA_CDAC_REG(omap_ir->rx_dma_channel);
-
- if (cpu_is_omap16xx())
- w -= OMAP1_DMA_CDSA_L_REG(omap_ir->rx_dma_channel);
- if (cpu_is_omap24xx())
- w -= OMAP2_DMA_CDSA_REG(omap_ir->rx_dma_channel);
+ w = omap_get_dma_dst_pos(omap_ir->rx_dma_channel) -
+ omap_ir->rx_buf_dma_phys;
if (!IS_FIR(omap_ir))
/* Copy DMA buffer to skb */