diff mbox

ARM: imx: remove check for CONFIG_SDMA_IRAM

Message ID 1400140671.20469.7.camel@x220 (mailing list archive)
State New, archived
Headers show

Commit Message

Paul Bolle May 15, 2014, 7:57 a.m. UTC
A check for CONFIG_SDMA_IRAM was added in v2.6.34. But the Kconfig
symbol SDMA_IRAM was never added. Remove this check.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Untested.

Note that none of the MX51_MXC_DMA_CHANNEL_* macros are actually used.
Why are they needed?

 arch/arm/mach-imx/mx51.h | 4 ----
 1 file changed, 4 deletions(-)

Comments

Sascha Hauer May 15, 2014, 12:25 p.m. UTC | #1
Hi Paul,

On Thu, May 15, 2014 at 09:57:51AM +0200, Paul Bolle wrote:
> A check for CONFIG_SDMA_IRAM was added in v2.6.34. But the Kconfig
> symbol SDMA_IRAM was never added. Remove this check.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> Untested.
> 
> Note that none of the MX51_MXC_DMA_CHANNEL_* macros are actually used.
> Why are they needed?

All these can be removed. They came in with the initial i.MX5 commit and
were never meaningful in a mainline kernel.

Sascha
diff mbox

Patch

diff --git a/arch/arm/mach-imx/mx51.h b/arch/arm/mach-imx/mx51.h
index af844f76261a..f2604098fd06 100644
--- a/arch/arm/mach-imx/mx51.h
+++ b/arch/arm/mach-imx/mx51.h
@@ -160,11 +160,7 @@ 
 #define MX51_MXC_DMA_CHANNEL_SSI1_RX	MXC_DMA_DYNAMIC_CHANNEL
 #define MX51_MXC_DMA_CHANNEL_SSI1_TX	MXC_DMA_DYNAMIC_CHANNEL
 #define MX51_MXC_DMA_CHANNEL_SSI2_RX	MXC_DMA_DYNAMIC_CHANNEL
-#ifdef CONFIG_SDMA_IRAM
-#define MX51_MXC_DMA_CHANNEL_SSI2_TX	(MX51_MXC_DMA_CHANNEL_IRAM + 1)
-#else				/*CONFIG_SDMA_IRAM */
 #define MX51_MXC_DMA_CHANNEL_SSI2_TX	MXC_DMA_DYNAMIC_CHANNEL
-#endif				/*CONFIG_SDMA_IRAM */
 #define MX51_MXC_DMA_CHANNEL_CSPI1_RX	MXC_DMA_DYNAMIC_CHANNEL
 #define MX51_MXC_DMA_CHANNEL_CSPI1_TX	MXC_DMA_DYNAMIC_CHANNEL
 #define MX51_MXC_DMA_CHANNEL_CSPI2_RX	MXC_DMA_DYNAMIC_CHANNEL