dmaengine: bcm2835: add additional defines for DMA-registers

Add additional defines describing the DMA registers
as well as adding some more documentation to those registers.

Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index e4ca980049bab83ddbb58435c662e4a30321d4f8..a1d851aa5b182f9b0f4d6c2ab719b1ade2167c11 100644 (file)
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -97,26 +97,67 @@ struct bcm2835_desc {
 
 #define BCM2835_DMA_CS         0x00
 #define BCM2835_DMA_ADDR       0x04
+#define BCM2835_DMA_TI         0x08
 #define BCM2835_DMA_SOURCE_AD  0x0c
 #define BCM2835_DMA_DEST_AD    0x10
-#define BCM2835_DMA_NEXTCB     0x1C
+#define BCM2835_DMA_LEN                0x14
+#define BCM2835_DMA_STRIDE     0x18
+#define BCM2835_DMA_NEXTCB     0x1c
+#define BCM2835_DMA_DEBUG      0x20
 
 /* DMA CS Control and Status bits */
-#define BCM2835_DMA_ACTIVE     BIT(0)
-#define BCM2835_DMA_INT        BIT(2)
+#define BCM2835_DMA_ACTIVE     BIT(0)  /* activate the DMA */
+#define BCM2835_DMA_END                BIT(1)  /* current CB has ended */
+#define BCM2835_DMA_INT                BIT(2)  /* interrupt status */
+#define BCM2835_DMA_DREQ       BIT(3)  /* DREQ state */
 #define BCM2835_DMA_ISPAUSED   BIT(4)  /* Pause requested or not active */
 #define BCM2835_DMA_ISHELD     BIT(5)  /* Is held by DREQ flow control */
-#define BCM2835_DMA_ERR        BIT(8)
+#define BCM2835_DMA_WAITING_FOR_WRITES BIT(6) /* waiting for last
+                                              * AXI-write to ack
+                                              */
+#define BCM2835_DMA_ERR                BIT(8)
+#define BCM2835_DMA_PRIORITY(x) ((x & 15) << 16) /* AXI priority */
+#define BCM2835_DMA_PANIC_PRIORITY(x) ((x & 15) << 20) /* panic priority */
+/* current value of TI.BCM2835_DMA_WAIT_RESP */
+#define BCM2835_DMA_WAIT_FOR_WRITES BIT(28)
+#define BCM2835_DMA_DIS_DEBUG  BIT(29) /* disable debug pause signal */
 #define BCM2835_DMA_ABORT      BIT(30) /* Stop current CB, go to next, WO */
 #define BCM2835_DMA_RESET      BIT(31) /* WO, self clearing */
 
+/* Transfer information bits - also bcm2835_cb.info field */
 #define BCM2835_DMA_INT_EN     BIT(0)
+#define BCM2835_DMA_TDMODE     BIT(1) /* 2D-Mode */
+#define BCM2835_DMA_WAIT_RESP  BIT(3) /* wait for AXI-write to be acked */
 #define BCM2835_DMA_D_INC      BIT(4)
-#define BCM2835_DMA_D_DREQ     BIT(6)
+#define BCM2835_DMA_D_WIDTH    BIT(5) /* 128bit writes if set */
+#define BCM2835_DMA_D_DREQ     BIT(6) /* enable DREQ for destination */
+#define BCM2835_DMA_D_IGNORE   BIT(7) /* ignore destination writes */
 #define BCM2835_DMA_S_INC      BIT(8)
-#define BCM2835_DMA_S_DREQ     BIT(10)
-
-#define BCM2835_DMA_PER_MAP(x) ((x) << 16)
+#define BCM2835_DMA_S_WIDTH    BIT(9) /* 128bit writes if set */
+#define BCM2835_DMA_S_DREQ     BIT(10) /* enable SREQ for source */
+#define BCM2835_DMA_S_IGNORE   BIT(11) /* ignore source reads - read 0 */
+#define BCM2835_DMA_BURST_LENGTH(x) ((x & 15) << 12)
+#define BCM2835_DMA_PER_MAP(x) ((x & 31) << 16) /* REQ source */
+#define BCM2835_DMA_WAIT(x)    ((x & 31) << 21) /* add DMA-wait cycles */
+#define BCM2835_DMA_NO_WIDE_BURSTS BIT(26) /* no 2 beat write bursts */
+
+/* debug register bits */
+#define BCM2835_DMA_DEBUG_LAST_NOT_SET_ERR     BIT(0)
+#define BCM2835_DMA_DEBUG_FIFO_ERR             BIT(1)
+#define BCM2835_DMA_DEBUG_READ_ERR             BIT(2)
+#define BCM2835_DMA_DEBUG_OUTSTANDING_WRITES_SHIFT 4
+#define BCM2835_DMA_DEBUG_OUTSTANDING_WRITES_BITS 4
+#define BCM2835_DMA_DEBUG_ID_SHIFT             16
+#define BCM2835_DMA_DEBUG_ID_BITS              9
+#define BCM2835_DMA_DEBUG_STATE_SHIFT          16
+#define BCM2835_DMA_DEBUG_STATE_BITS           9
+#define BCM2835_DMA_DEBUG_VERSION_SHIFT                25
+#define BCM2835_DMA_DEBUG_VERSION_BITS         3
+#define BCM2835_DMA_DEBUG_LITE                 BIT(28)
+
+/* shared registers for all dma channels */
+#define BCM2835_DMA_INT_STATUS         0xfe0
+#define BCM2835_DMA_ENABLE             0xff0
 
 #define BCM2835_DMA_DATA_TYPE_S8       1
 #define BCM2835_DMA_DATA_TYPE_S16      2