diff options
author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2014-11-13 05:52:39 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-11-17 03:37:20 -0500 |
commit | 6e5ae29b6dbdb60ef60f769d7b80274d62e6fbcf (patch) | |
tree | 64638fb4d7ba924479034130b573a65fa4b24250 /drivers | |
parent | 82e2424635f4c0d9af6670638889be81f56ea225 (diff) |
dmaengine: at_xdmac: prefer usage of readl/writel_relaxed
_relaxed version of readl and writel are not implemented on all
architecture so COMPILE_TEST has to be removed in order to not cause
some build failures.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/dma/Kconfig | 2 | ||||
-rw-r--r-- | drivers/dma/at_xdmac.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 607271a999a9..8b6fb0f11007 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
@@ -109,7 +109,7 @@ config AT_HDMAC | |||
109 | 109 | ||
110 | config AT_XDMAC | 110 | config AT_XDMAC |
111 | tristate "Atmel XDMA support" | 111 | tristate "Atmel XDMA support" |
112 | depends on (ARCH_AT91 || COMPILE_TEST) | 112 | depends on ARCH_AT91 |
113 | select DMA_ENGINE | 113 | select DMA_ENGINE |
114 | help | 114 | help |
115 | Support the Atmel XDMA controller. | 115 | Support the Atmel XDMA controller. |
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index 89c43be20a38..1f53d92f63d3 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c | |||
@@ -248,12 +248,12 @@ static inline void __iomem *at_xdmac_chan_reg_base(struct at_xdmac *atxdmac, uns | |||
248 | return atxdmac->regs + (AT_XDMAC_CHAN_REG_BASE + chan_nb * 0x40); | 248 | return atxdmac->regs + (AT_XDMAC_CHAN_REG_BASE + chan_nb * 0x40); |
249 | } | 249 | } |
250 | 250 | ||
251 | #define at_xdmac_read(atxdmac, reg) readl((atxdmac)->regs + (reg)) | 251 | #define at_xdmac_read(atxdmac, reg) readl_relaxed((atxdmac)->regs + (reg)) |
252 | #define at_xdmac_write(atxdmac, reg, value) \ | 252 | #define at_xdmac_write(atxdmac, reg, value) \ |
253 | writel((value), (atxdmac)->regs + (reg)) | 253 | writel_relaxed((value), (atxdmac)->regs + (reg)) |
254 | 254 | ||
255 | #define at_xdmac_chan_read(atchan, reg) readl((atchan)->ch_regs + (reg)) | 255 | #define at_xdmac_chan_read(atchan, reg) readl_relaxed((atchan)->ch_regs + (reg)) |
256 | #define at_xdmac_chan_write(atchan, reg, value) writel((value), (atchan)->ch_regs + (reg)) | 256 | #define at_xdmac_chan_write(atchan, reg, value) writel_relaxed((value), (atchan)->ch_regs + (reg)) |
257 | 257 | ||
258 | static inline struct at_xdmac_chan *to_at_xdmac_chan(struct dma_chan *dchan) | 258 | static inline struct at_xdmac_chan *to_at_xdmac_chan(struct dma_chan *dchan) |
259 | { | 259 | { |