target/linux/brcm2708/patches-4.4/0394-dmaengine-bcm2835-add-additional-defines-for-DMA-reg.patch

   1 From 2e9daa8fabdef7a31da63f9a532105d94ade48ae Mon Sep 17 00:00:00 2001
   2 From: Martin Sperl <kernel@martin.sperl.org>
   3 Date: Wed, 16 Mar 2016 12:24:57 -0700
   4 Subject: [PATCH] dmaengine: bcm2835: add additional defines for DMA-registers
   5
   6 Add additional defines describing the DMA registers
   7 as well as adding some more documentation to those registers.
   8
   9 Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
  10 Reviewed-by: Eric Anholt <eric@anholt.net>
  11 Signed-off-by: Eric Anholt <eric@anholt.net>
  12 Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  13 ---
  14  drivers/dma/bcm2835-dma.c | 57 ++++++++++++++++++++++++++++++++++++++++-------
  15  1 file changed, 49 insertions(+), 8 deletions(-)
  16
  17 --- a/drivers/dma/bcm2835-dma.c
  18 +++ b/drivers/dma/bcm2835-dma.c
  19 @@ -97,26 +97,67 @@ struct bcm2835_desc {
  20
  21  #define BCM2835_DMA_CS         0x00
  22  #define BCM2835_DMA_ADDR       0x04
  23 +#define BCM2835_DMA_TI         0x08
  24  #define BCM2835_DMA_SOURCE_AD  0x0c
  25  #define BCM2835_DMA_DEST_AD    0x10
  26 -#define BCM2835_DMA_NEXTCB     0x1C
  27 +#define BCM2835_DMA_LEN                0x14
  28 +#define BCM2835_DMA_STRIDE     0x18
  29 +#define BCM2835_DMA_NEXTCB     0x1c
  30 +#define BCM2835_DMA_DEBUG      0x20
  31
  32  /* DMA CS Control and Status bits */
  33 -#define BCM2835_DMA_ACTIVE     BIT(0)
  34 -#define BCM2835_DMA_INT        BIT(2)
  35 +#define BCM2835_DMA_ACTIVE     BIT(0)  /* activate the DMA */
  36 +#define BCM2835_DMA_END                BIT(1)  /* current CB has ended */
  37 +#define BCM2835_DMA_INT                BIT(2)  /* interrupt status */
  38 +#define BCM2835_DMA_DREQ       BIT(3)  /* DREQ state */
  39  #define BCM2835_DMA_ISPAUSED   BIT(4)  /* Pause requested or not active */
  40  #define BCM2835_DMA_ISHELD     BIT(5)  /* Is held by DREQ flow control */
  41 -#define BCM2835_DMA_ERR        BIT(8)
  42 +#define BCM2835_DMA_WAITING_FOR_WRITES BIT(6) /* waiting for last
  43 +                                              * AXI-write to ack
  44 +                                              */
  45 +#define BCM2835_DMA_ERR                BIT(8)
  46 +#define BCM2835_DMA_PRIORITY(x) ((x & 15) << 16) /* AXI priority */
  47 +#define BCM2835_DMA_PANIC_PRIORITY(x) ((x & 15) << 20) /* panic priority */
  48 +/* current value of TI.BCM2835_DMA_WAIT_RESP */
  49 +#define BCM2835_DMA_WAIT_FOR_WRITES BIT(28)
  50 +#define BCM2835_DMA_DIS_DEBUG  BIT(29) /* disable debug pause signal */
  51  #define BCM2835_DMA_ABORT      BIT(30) /* Stop current CB, go to next, WO */
  52  #define BCM2835_DMA_RESET      BIT(31) /* WO, self clearing */
  53
  54 +/* Transfer information bits - also bcm2835_cb.info field */
  55  #define BCM2835_DMA_INT_EN     BIT(0)
  56 +#define BCM2835_DMA_TDMODE     BIT(1) /* 2D-Mode */
  57 +#define BCM2835_DMA_WAIT_RESP  BIT(3) /* wait for AXI-write to be acked */
  58  #define BCM2835_DMA_D_INC      BIT(4)
  59 -#define BCM2835_DMA_D_DREQ     BIT(6)
  60 +#define BCM2835_DMA_D_WIDTH    BIT(5) /* 128bit writes if set */
  61 +#define BCM2835_DMA_D_DREQ     BIT(6) /* enable DREQ for destination */
  62 +#define BCM2835_DMA_D_IGNORE   BIT(7) /* ignore destination writes */
  63  #define BCM2835_DMA_S_INC      BIT(8)
  64 -#define BCM2835_DMA_S_DREQ     BIT(10)
  65 +#define BCM2835_DMA_S_WIDTH    BIT(9) /* 128bit writes if set */
  66 +#define BCM2835_DMA_S_DREQ     BIT(10) /* enable SREQ for source */
  67 +#define BCM2835_DMA_S_IGNORE   BIT(11) /* ignore source reads - read 0 */
  68 +#define BCM2835_DMA_BURST_LENGTH(x) ((x & 15) << 12)
  69 +#define BCM2835_DMA_PER_MAP(x) ((x & 31) << 16) /* REQ source */
  70 +#define BCM2835_DMA_WAIT(x)    ((x & 31) << 21) /* add DMA-wait cycles */
  71 +#define BCM2835_DMA_NO_WIDE_BURSTS BIT(26) /* no 2 beat write bursts */
  72
  73 -#define BCM2835_DMA_PER_MAP(x) ((x) << 16)
  74 +/* debug register bits */
  75 +#define BCM2835_DMA_DEBUG_LAST_NOT_SET_ERR     BIT(0)
  76 +#define BCM2835_DMA_DEBUG_FIFO_ERR             BIT(1)
  77 +#define BCM2835_DMA_DEBUG_READ_ERR             BIT(2)
  78 +#define BCM2835_DMA_DEBUG_OUTSTANDING_WRITES_SHIFT 4
  79 +#define BCM2835_DMA_DEBUG_OUTSTANDING_WRITES_BITS 4
  80 +#define BCM2835_DMA_DEBUG_ID_SHIFT             16
  81 +#define BCM2835_DMA_DEBUG_ID_BITS              9
  82 +#define BCM2835_DMA_DEBUG_STATE_SHIFT          16
  83 +#define BCM2835_DMA_DEBUG_STATE_BITS           9
  84 +#define BCM2835_DMA_DEBUG_VERSION_SHIFT                25
  85 +#define BCM2835_DMA_DEBUG_VERSION_BITS         3
  86 +#define BCM2835_DMA_DEBUG_LITE                 BIT(28)
  87 +
  88 +/* shared registers for all dma channels */
  89 +#define BCM2835_DMA_INT_STATUS         0xfe0
  90 +#define BCM2835_DMA_ENABLE             0xff0
  91
  92  #define BCM2835_DMA_DATA_TYPE_S8       1
  93  #define BCM2835_DMA_DATA_TYPE_S16      2