Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[profile/ivi/kernel-adaptation-intel-automotive.git] / drivers / dma / dw_dmac_regs.h

diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h
index f298f69..50830be 100644 (file)
--- a/drivers/dma/dw_dmac_regs.h
+++ b/drivers/dma/dw_dmac_regs.h
@@ -82,7 +82,7 @@ struct dw_dma_regs {
        DW_REG(ID);
        DW_REG(TEST);
 
-       /* optional encoded params, 0x3c8..0x3 */
+       /* optional encoded params, 0x3c8..0x3f7 */
 };
 
 /* Bitfields in CTL_LO */
@@ -219,9 +219,9 @@ static inline struct dw_dma *to_dw_dma(struct dma_device *ddev)
 /* LLI == Linked List Item; a.k.a. DMA block descriptor */
 struct dw_lli {
        /* values that are not changed by hardware */
-       dma_addr_t      sar;
-       dma_addr_t      dar;
-       dma_addr_t      llp;            /* chain to next lli */
+       u32             sar;
+       u32             dar;
+       u32             llp;            /* chain to next lli */
        u32             ctllo;
        /* values that may get written back: */
        u32             ctlhi;