* [PATCH] ARM: imx: remove check for CONFIG_SDMA_IRAM
@ 2014-05-15 7:57 Paul Bolle
2014-05-15 12:25 ` Sascha Hauer
0 siblings, 1 reply; 5+ messages in thread
From: Paul Bolle @ 2014-05-15 7:57 UTC (permalink / raw)
To: linux-arm-kernel
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(-)
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
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] ARM: imx: remove check for CONFIG_SDMA_IRAM
2014-05-15 7:57 [PATCH] ARM: imx: remove check for CONFIG_SDMA_IRAM Paul Bolle
@ 2014-05-15 12:25 ` Sascha Hauer
2014-05-16 9:09 ` [PATCH v2] ARM: imx: remove unused defines Paul Bolle
0 siblings, 1 reply; 5+ messages in thread
From: Sascha Hauer @ 2014-05-15 12:25 UTC (permalink / raw)
To: linux-arm-kernel
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
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] ARM: imx: remove unused defines
2014-05-15 12:25 ` Sascha Hauer
@ 2014-05-16 9:09 ` Paul Bolle
2014-05-16 11:24 ` Sascha Hauer
2014-05-19 5:51 ` Shawn Guo
0 siblings, 2 replies; 5+ messages in thread
From: Paul Bolle @ 2014-05-16 9:09 UTC (permalink / raw)
To: linux-arm-kernel
None of the defines "for modules using static and dynamic DMA channels"
are used. Remove these.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) v1 was called "ARM: imx: remove check for CONFIG_SDMA_IRAM". This
version just removes the entire block of defines, as Sascha suggested.
1) Still untested.
arch/arm/mach-imx/mx51.h | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/arch/arm/mach-imx/mx51.h b/arch/arm/mach-imx/mx51.h
index af844f76261a..3f6d4a674ffb 100644
--- a/arch/arm/mach-imx/mx51.h
+++ b/arch/arm/mach-imx/mx51.h
@@ -145,39 +145,6 @@
#define MX51_SPBA_CTRL 0x3c
/*
- * Defines for modules using static and dynamic DMA channels
- */
-#define MX51_MXC_DMA_CHANNEL_IRAM 30
-#define MX51_MXC_DMA_CHANNEL_SPDIF_TX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART1_RX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART1_TX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART2_RX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART2_TX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART3_RX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART3_TX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_MMC1 MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_MMC2 MXC_DMA_DYNAMIC_CHANNEL
-#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
-#define MX51_MXC_DMA_CHANNEL_CSPI2_TX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_CSPI3_RX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_CSPI3_TX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_ATA_RX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_ATA_TX MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_MEMORY MXC_DMA_DYNAMIC_CHANNEL
-
-#define MX51_IS_MEM_DEVICE_NONSHARED(x) 0
-
-/*
* DMA request assignments
*/
#define MX51_DMA_REQ_VPU 0
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2] ARM: imx: remove unused defines
2014-05-16 9:09 ` [PATCH v2] ARM: imx: remove unused defines Paul Bolle
@ 2014-05-16 11:24 ` Sascha Hauer
2014-05-19 5:51 ` Shawn Guo
1 sibling, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2014-05-16 11:24 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, May 16, 2014 at 11:09:29AM +0200, Paul Bolle wrote:
> None of the defines "for modules using static and dynamic DMA channels"
> are used. Remove these.
>
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha
> ---
> 0) v1 was called "ARM: imx: remove check for CONFIG_SDMA_IRAM". This
> version just removes the entire block of defines, as Sascha suggested.
>
> 1) Still untested.
>
> arch/arm/mach-imx/mx51.h | 33 ---------------------------------
> 1 file changed, 33 deletions(-)
>
> diff --git a/arch/arm/mach-imx/mx51.h b/arch/arm/mach-imx/mx51.h
> index af844f76261a..3f6d4a674ffb 100644
> --- a/arch/arm/mach-imx/mx51.h
> +++ b/arch/arm/mach-imx/mx51.h
> @@ -145,39 +145,6 @@
> #define MX51_SPBA_CTRL 0x3c
>
> /*
> - * Defines for modules using static and dynamic DMA channels
> - */
> -#define MX51_MXC_DMA_CHANNEL_IRAM 30
> -#define MX51_MXC_DMA_CHANNEL_SPDIF_TX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_UART1_RX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_UART1_TX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_UART2_RX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_UART2_TX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_UART3_RX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_UART3_TX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_MMC1 MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_MMC2 MXC_DMA_DYNAMIC_CHANNEL
> -#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
> -#define MX51_MXC_DMA_CHANNEL_CSPI2_TX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_CSPI3_RX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_CSPI3_TX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_ATA_RX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_ATA_TX MXC_DMA_DYNAMIC_CHANNEL
> -#define MX51_MXC_DMA_CHANNEL_MEMORY MXC_DMA_DYNAMIC_CHANNEL
> -
> -#define MX51_IS_MEM_DEVICE_NONSHARED(x) 0
> -
> -/*
> * DMA request assignments
> */
> #define MX51_DMA_REQ_VPU 0
> --
> 1.9.0
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] ARM: imx: remove unused defines
2014-05-16 9:09 ` [PATCH v2] ARM: imx: remove unused defines Paul Bolle
2014-05-16 11:24 ` Sascha Hauer
@ 2014-05-19 5:51 ` Shawn Guo
1 sibling, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2014-05-19 5:51 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, May 16, 2014 at 11:09:29AM +0200, Paul Bolle wrote:
> None of the defines "for modules using static and dynamic DMA channels"
> are used. Remove these.
>
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-05-19 5:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-15 7:57 [PATCH] ARM: imx: remove check for CONFIG_SDMA_IRAM Paul Bolle
2014-05-15 12:25 ` Sascha Hauer
2014-05-16 9:09 ` [PATCH v2] ARM: imx: remove unused defines Paul Bolle
2014-05-16 11:24 ` Sascha Hauer
2014-05-19 5:51 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).