Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dma updates from Vinod Koul:
 "Some notable changes are:
   - new driver for AMBA AXI NBPF by Guennadi
   - new driver for sun6i controller by Maxime
   - pl330 drivers fixes from Lar's
   - sh-dma updates and fixes from Laurent, Geert and Kuninori
   - Documentation updates from Geert
   - drivers fixes and updates spread over dw, edma, freescale, mpc512x
     etc.."

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (72 commits)
  dmaengine: sun6i: depends on RESET_CONTROLLER
  dma: at_hdmac: fix invalid remaining bytes detection
  dmaengine: nbpfaxi: don't build this driver where it cannot be used
  dmaengine: nbpf_error_get_channel() can be static
  dma: pl08x: Use correct specifier for size_t values
  dmaengine: Remove the context argument to the prep_dma_cyclic operation
  dmaengine: nbpfaxi: convert to tasklet
  dmaengine: nbpfaxi: fix a theoretical race
  dmaengine: add a driver for AMBA AXI NBPF DMAC IP cores
  dmaengine: add device tree binding documentation for the nbpfaxi driver
  dmaengine: edma: Do not register second device when booted with DT
  dmaengine: edma: Do not change the error code returned from edma_alloc_slot
  dmaengine: rcar-dmac: Add device tree bindings documentation
  dmaengine: shdma: Allocate cyclic sg list dynamically
  dmaengine: shdma: Make channel filter ignore unrelated devices
  dmaengine: sh: Rework Kconfig and Makefile
  dmaengine: sun6i: Fix memory leaks
  dmaengine: sun6i: Free the interrupt before killing the tasklet
  dmaengine: sun6i: Remove switch statement from buswidth convertion routine
  dmaengine: of: kconfig: select DMA_ENGINE when DMA_OF is selected
  ...

1 files changed, 19 insertions, 17 deletions

diff --git a/arch/sh/include/asm/dma-register.h b/arch/sh/include/asm/dma-register.h
index 51cd78feacff..c757b47e6b64 100644
--- a/arch/sh/include/asm/dma-register.h
+++ b/arch/sh/include/asm/dma-register.h
@@ -13,17 +13,17 @@
 #ifndef DMA_REGISTER_H
 #define DMA_REGISTER_H
 
-/* DMA register */
-#define SAR     0x00
-#define DAR     0x04
-#define TCR     0x08
-#define CHCR    0x0C
-#define DMAOR   0x40
+/* DMA registers */
+#define SAR     0x00    /* Source Address Register */
+#define DAR     0x04    /* Destination Address Register */
+#define TCR     0x08    /* Transfer Count Register */
+#define CHCR    0x0C    /* Channel Control Register */
+#define DMAOR   0x40    /* DMA Operation Register */
 
 /* DMAOR definitions */
-#define DMAOR_AE        0x00000004
+#define DMAOR_AE        0x00000004      /* Address Error Flag */
 #define DMAOR_NMIF      0x00000002
-#define DMAOR_DME       0x00000001
+#define DMAOR_DME       0x00000001      /* DMA Master Enable */
 
 /* Definitions for the SuperH DMAC */
 #define REQ_L   0x00000000
@@ -34,18 +34,20 @@
 #define ACK_W   0x00020000
 #define ACK_H   0x00000000
 #define ACK_L   0x00010000
-#define DM_INC  0x00004000
-#define DM_DEC  0x00008000
-#define DM_FIX  0x0000c000
-#define SM_INC  0x00001000
-#define SM_DEC  0x00002000
-#define SM_FIX  0x00003000
+#define DM_INC  0x00004000      /* Destination addresses are incremented */
+#define DM_DEC  0x00008000      /* Destination addresses are decremented */
+#define DM_FIX  0x0000c000      /* Destination address is fixed */
+#define SM_INC  0x00001000      /* Source addresses are incremented */
+#define SM_DEC  0x00002000      /* Source addresses are decremented */
+#define SM_FIX  0x00003000      /* Source address is fixed */
 #define RS_IN   0x00000200
 #define RS_OUT  0x00000300
+#define RS_AUTO 0x00000400      /* Auto Request */
+#define RS_ERS  0x00000800      /* DMA extended resource selector */
 #define TS_BLK  0x00000040
 #define TM_BUR  0x00000020
-#define CHCR_DE 0x00000001
-#define CHCR_TE 0x00000002
-#define CHCR_IE 0x00000004
+#define CHCR_DE 0x00000001      /* DMA Enable */
+#define CHCR_TE 0x00000002      /* Transfer End Flag */
+#define CHCR_IE 0x00000004      /* Interrupt Enable */
 
 #endif