remove several ARCH_MX* macros

remove several ARCH_MX* macros

[Sascha Hauer]

The ARCH_MX* and MACH_MX* macros a scheduled for removal for
longer. This series removes several of them in drivers/

Sascha Hauer (5):
      mmc i.MX: remove individual SoC dependency
      dma i.MX: remove individual SOC dependency
      USB host i.MX21: remove dependency on MACH_MX21
      USB gadget i.MX1: remove dependency on ARCH_MXC
      media i.MX1 camera: remove dependency on ARCH_MX1

 drivers/dma/Kconfig         |    6 +++---
 drivers/media/video/Kconfig |    2 +-
 drivers/mmc/host/Kconfig    |   12 ++++++------
 drivers/usb/gadget/Kconfig  |    9 ++++-----
 drivers/usb/host/Kconfig    |    6 +++---
 5 files changed, 17 insertions(+), 18 deletions(-)

[PATCH 1/5] mmc i.MX: remove individual SoC dependency

[Sascha Hauer]

The individual SoC dependency in Kconfig hardly scales anymore.
Instead of having such a fine grained dependency just depend
on ARCH_MXC and risk that the uninformed user has to look in
the help text to figure out which driver is the correct one.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Chris Ball <cjb@laptop.org>
Cc: linux-mmc@vger.kernel.org
---
 drivers/mmc/host/Kconfig |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 8c87096..c226d54 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -131,12 +131,12 @@ config MMC_SDHCI_CNS3XXX
 
 config MMC_SDHCI_ESDHC_IMX
 	tristate "SDHCI platform support for the Freescale eSDHC i.MX controller"
-	depends on ARCH_MX25 || ARCH_MX35 || ARCH_MX5
+	depends on ARCH_MXC
 	depends on MMC_SDHCI_PLTFM
 	select MMC_SDHCI_IO_ACCESSORS
 	help
 	  This selects the Freescale eSDHC controller support on the platform
-	  bus, found on platforms like mx35/51.
+	  bus, found on i.MX25, i.MX35 and i.MX5x.
 
 	  If you have a controller with this interface, say Y or M here.
 
@@ -326,11 +326,11 @@ config MMC_MSM
 	  support for SDIO devices.
 
 config MMC_MXC
-	tristate "Freescale i.MX2/3 Multimedia Card Interface support"
-	depends on MACH_MX21 || MACH_MX27 || ARCH_MX31
+	tristate "Freescale i.MX21/27/31 Multimedia Card Interface support"
+	depends on ARCH_MXC
 	help
-	  This selects the Freescale i.MX2/3 Multimedia card Interface.
-	  If you have a i.MX platform with a Multimedia Card slot,
+	  This selects the Freescale i.MX21, i.MX27 and i.MX31 Multimedia card
+	  Interface. If you have a i.MX platform with a Multimedia Card slot,
 	  say Y or M here.
 
 	  If unsure, say N.
-- 
1.7.5.4

[PATCH 1/5] mmc i.MX: remove individual SoC dependency

[Sascha Hauer]

The individual SoC dependency in Kconfig hardly scales anymore.
Instead of having such a fine grained dependency just depend
on ARCH_MXC and risk that the uninformed user has to look in
the help text to figure out which driver is the correct one.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Chris Ball <cjb@laptop.org>
Cc: linux-mmc at vger.kernel.org
---
 drivers/mmc/host/Kconfig |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 8c87096..c226d54 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -131,12 +131,12 @@ config MMC_SDHCI_CNS3XXX
 
 config MMC_SDHCI_ESDHC_IMX
 	tristate "SDHCI platform support for the Freescale eSDHC i.MX controller"
-	depends on ARCH_MX25 || ARCH_MX35 || ARCH_MX5
+	depends on ARCH_MXC
 	depends on MMC_SDHCI_PLTFM
 	select MMC_SDHCI_IO_ACCESSORS
 	help
 	  This selects the Freescale eSDHC controller support on the platform
-	  bus, found on platforms like mx35/51.
+	  bus, found on i.MX25, i.MX35 and i.MX5x.
 
 	  If you have a controller with this interface, say Y or M here.
 
@@ -326,11 +326,11 @@ config MMC_MSM
 	  support for SDIO devices.
 
 config MMC_MXC
-	tristate "Freescale i.MX2/3 Multimedia Card Interface support"
-	depends on MACH_MX21 || MACH_MX27 || ARCH_MX31
+	tristate "Freescale i.MX21/27/31 Multimedia Card Interface support"
+	depends on ARCH_MXC
 	help
-	  This selects the Freescale i.MX2/3 Multimedia card Interface.
-	  If you have a i.MX platform with a Multimedia Card slot,
+	  This selects the Freescale i.MX21, i.MX27 and i.MX31 Multimedia card
+	  Interface. If you have a i.MX platform with a Multimedia Card slot,
 	  say Y or M here.
 
 	  If unsure, say N.
-- 
1.7.5.4

[PATCH 2/5] dma i.MX: remove individual SOC dependency

[Sascha Hauer]

The individual SoC dependency in Kconfig hardly scales anymore.
Instead of having such a fine grained dependency just depend
on ARCH_MXC and risk that the uninformed user has to look in
the help text to figure out which driver is the correct one.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Vinod Koul <vinod.koul@intel.com>
---
 drivers/dma/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 2e3b3d3..eda9e34 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -124,7 +124,7 @@ config MV_XOR
 
 config MX3_IPU
 	bool "MX3x Image Processing Unit support"
-	depends on ARCH_MX3
+	depends on ARCH_MXC
 	select DMA_ENGINE
 	default y
 	help
@@ -215,11 +215,11 @@ config PCH_DMA
 
 config IMX_SDMA
 	tristate "i.MX SDMA support"
-	depends on ARCH_MX25 || ARCH_MX3 || ARCH_MX5
+	depends on ARCH_MXC
 	select DMA_ENGINE
 	help
 	  Support the i.MX SDMA engine. This engine is integrated into
-	  Freescale i.MX25/31/35/51 chips.
+	  Freescale i.MX25/31/35/51/53 chips.
 
 config IMX_DMA
 	tristate "i.MX DMA support"
-- 
1.7.5.4

[PATCH 3/5] USB host i.MX21: remove dependency on MACH_MX21

[Sascha Hauer]

the MACH_MX* macros are scheduled for removal, so just depend
on ARCH_MXC instead. The Kconfig text makes it clear on which
SoC the driver runs on.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-usb at vger.kernel.org
---
 drivers/usb/host/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index ab085f1..24b5d0f 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -544,11 +544,11 @@ config USB_HWA_HCD
 	  will be called "hwa-hc".
 
 config USB_IMX21_HCD
-       tristate "iMX21 HCD support"
-       depends on USB && ARM && MACH_MX21
+       tristate "i.MX21 HCD support"
+       depends on USB && ARM && ARCH_MXC
        help
          This driver enables support for the on-chip USB host in the
-         iMX21 processor.
+         i.MX21 processor.
 
          To compile this driver as a module, choose M here: the
          module will be called "imx21-hcd".
-- 
1.7.5.4

[PATCH 4/5] USB gadget i.MX1: remove dependency on ARCH_MXC

[Sascha Hauer]

The ARCH_MX1 scheduled for removal. Instead, depend on ARCH_MXC
and make clear in the Kconfig text that only i.MX1 has this
hardware.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-usb at vger.kernel.org
---
 drivers/usb/gadget/Kconfig |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 5a084b9..2e4424d 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -255,12 +255,11 @@ config USB_S3C_HSOTG
 	  integrated into the S3C64XX series SoC.
 
 config USB_IMX
-	tristate "Freescale IMX USB Peripheral Controller"
-	depends on ARCH_MX1
+	tristate "Freescale i.MX1 USB Peripheral Controller"
+	depends on ARCH_MXC
 	help
-	   Freescale's IMX series include an integrated full speed
-	   USB 1.1 device controller.  The controller in the IMX series
-	   is register-compatible.
+	   Freescale's i.MX1 includes an integrated full speed
+	   USB 1.1 device controller.
 
 	   It has Six fixed-function endpoints, as well as endpoint
 	   zero (for control transfers).
-- 
1.7.5.4

[PATCH 5/5] media i.MX1 camera: remove dependency on ARCH_MX1

[Sascha Hauer]

The ARCH_MX1 macro is scheduled for removal. Instead,
depend on ARCH_MXC. The Kconfig text makes it clear
on which SoC rhis driver runs on.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/media/video/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f574dc0..bc5df0e 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -883,7 +883,7 @@ config MX1_VIDEO
 
 config VIDEO_MX1
 	tristate "i.MX1/i.MXL CMOS Sensor Interface driver"
-	depends on VIDEO_DEV && ARCH_MX1 && SOC_CAMERA
+	depends on VIDEO_DEV && ARCH_MXC && SOC_CAMERA
 	select FIQ
 	select VIDEOBUF_DMA_CONTIG
 	select MX1_VIDEO
-- 
1.7.5.4

Re: [PATCH 1/5] mmc i.MX: remove individual SoC dependency

[Chris Ball]

Hi Sascha,

On Wed, Aug 24 2011, Sascha Hauer wrote:
> The individual SoC dependency in Kconfig hardly scales anymore.
> Instead of having such a fine grained dependency just depend
> on ARCH_MXC and risk that the uninformed user has to look in
> the help text to figure out which driver is the correct one.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: linux-mmc@vger.kernel.org

Looks good, thanks -- applied to mmc-next for 3.2.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

[PATCH 1/5] mmc i.MX: remove individual SoC dependency

[Chris Ball]

Hi Sascha,

On Wed, Aug 24 2011, Sascha Hauer wrote:
> The individual SoC dependency in Kconfig hardly scales anymore.
> Instead of having such a fine grained dependency just depend
> on ARCH_MXC and risk that the uninformed user has to look in
> the help text to figure out which driver is the correct one.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: linux-mmc at vger.kernel.org

Looks good, thanks -- applied to mmc-next for 3.2.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

[PATCH 2/5] dma i.MX: remove individual SOC dependency

[Sascha Hauer]

Vinod,

Ping. Can you please queue this one?

Thanks
  Sascha

On Wed, Aug 24, 2011 at 08:41:09AM +0200, Sascha Hauer wrote:
> The individual SoC dependency in Kconfig hardly scales anymore.
> Instead of having such a fine grained dependency just depend
> on ARCH_MXC and risk that the uninformed user has to look in
> the help text to figure out which driver is the correct one.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Vinod Koul <vinod.koul@intel.com>
> ---
>  drivers/dma/Kconfig |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> index 2e3b3d3..eda9e34 100644
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@ -124,7 +124,7 @@ config MV_XOR
>  
>  config MX3_IPU
>  	bool "MX3x Image Processing Unit support"
> -	depends on ARCH_MX3
> +	depends on ARCH_MXC
>  	select DMA_ENGINE
>  	default y
>  	help
> @@ -215,11 +215,11 @@ config PCH_DMA
>  
>  config IMX_SDMA
>  	tristate "i.MX SDMA support"
> -	depends on ARCH_MX25 || ARCH_MX3 || ARCH_MX5
> +	depends on ARCH_MXC
>  	select DMA_ENGINE
>  	help
>  	  Support the i.MX SDMA engine. This engine is integrated into
> -	  Freescale i.MX25/31/35/51 chips.
> +	  Freescale i.MX25/31/35/51/53 chips.
>  
>  config IMX_DMA
>  	tristate "i.MX DMA support"
> -- 
> 1.7.5.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

-- 
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 |

[PATCH 2/5] dma i.MX: remove individual SOC dependency

[Vinod Koul]

On Tue, 2011-11-08 at 16:22 +0100, Sascha Hauer wrote:
> Vinod,
> 
> Ping. Can you please queue this one?
Sorry Sascha, looks like I have missed this one :(

Nevertheless, this seems to be part of a series, but I couldn't locate
the rest.
Do you want me to apply only this individual patch, seems little odd if
thats the case...

> 
> Thanks
>   Sascha
> 
> On Wed, Aug 24, 2011 at 08:41:09AM +0200, Sascha Hauer wrote:
> > The individual SoC dependency in Kconfig hardly scales anymore.
> > Instead of having such a fine grained dependency just depend
> > on ARCH_MXC and risk that the uninformed user has to look in
> > the help text to figure out which driver is the correct one.
> > 
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > Cc: Vinod Koul <vinod.koul@intel.com>
> > ---
> >  drivers/dma/Kconfig |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> > index 2e3b3d3..eda9e34 100644
> > --- a/drivers/dma/Kconfig
> > +++ b/drivers/dma/Kconfig
> > @@ -124,7 +124,7 @@ config MV_XOR
> >  
> >  config MX3_IPU
> >  	bool "MX3x Image Processing Unit support"
> > -	depends on ARCH_MX3
> > +	depends on ARCH_MXC
> >  	select DMA_ENGINE
> >  	default y
> >  	help
> > @@ -215,11 +215,11 @@ config PCH_DMA
> >  
> >  config IMX_SDMA
> >  	tristate "i.MX SDMA support"
> > -	depends on ARCH_MX25 || ARCH_MX3 || ARCH_MX5
> > +	depends on ARCH_MXC
> >  	select DMA_ENGINE
> >  	help
> >  	  Support the i.MX SDMA engine. This engine is integrated into
> > -	  Freescale i.MX25/31/35/51 chips.
> > +	  Freescale i.MX25/31/35/51/53 chips.
> >  
> >  config IMX_DMA
> >  	tristate "i.MX DMA support"
> > -- 
> > 1.7.5.4
> > 
> > 
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> > 
> 


-- 
~Vinod

[PATCH 2/5] dma i.MX: remove individual SOC dependency

[Uwe Kleine-König]

On Tue, Nov 08, 2011 at 09:40:33PM +0530, Vinod Koul wrote:
> On Tue, 2011-11-08 at 16:22 +0100, Sascha Hauer wrote:
> > Vinod,
> > 
> > Ping. Can you please queue this one?
> Sorry Sascha, looks like I have missed this one :(
> 
> Nevertheless, this seems to be part of a series, but I couldn't locate
> the rest.
> Do you want me to apply only this individual patch, seems little odd if
> thats the case...
It was part of a series that removes SOC dependencies in different
subsystems. So it's right that each patch goes via a different
maintainer.

Best regards
Uwe
-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH 2/5] dma i.MX: remove individual SOC dependency

[Michał Mirosław]

2011/8/24 Sascha Hauer <s.hauer@pengutronix.de>:
> The individual SoC dependency in Kconfig hardly scales anymore.
> Instead of having such a fine grained dependency just depend
> on ARCH_MXC and risk that the uninformed user has to look in
> the help text to figure out which driver is the correct one.
[...]
> ?config MX3_IPU
> ? ? ? ?bool "MX3x Image Processing Unit support"
> - ? ? ? depends on ARCH_MX3
> + ? ? ? depends on ARCH_MXC
> ? ? ? ?select DMA_ENGINE
> ? ? ? ?default y
> ? ? ? ?help

You could instead make it depend on HAVE_MX3_IPU and select this
symbol from relevant model config. Leaving it for the users is making
every one of them redo the work you already did.

Best Regards,
Micha? Miros?aw

[PATCH 2/5] dma i.MX: remove individual SOC dependency

[Sascha Hauer]

On Tue, Nov 08, 2011 at 09:42:56PM +0100, Micha? Miros?aw wrote:
> 2011/8/24 Sascha Hauer <s.hauer@pengutronix.de>:
> > The individual SoC dependency in Kconfig hardly scales anymore.
> > Instead of having such a fine grained dependency just depend
> > on ARCH_MXC and risk that the uninformed user has to look in
> > the help text to figure out which driver is the correct one.
> [...]
> > ?config MX3_IPU
> > ? ? ? ?bool "MX3x Image Processing Unit support"
> > - ? ? ? depends on ARCH_MX3
> > + ? ? ? depends on ARCH_MXC
> > ? ? ? ?select DMA_ENGINE
> > ? ? ? ?default y
> > ? ? ? ?help
> 
> You could instead make it depend on HAVE_MX3_IPU and select this
> symbol from relevant model config. Leaving it for the users is making
> every one of them redo the work you already did.

I thought about this. I came to the conclusion that these are quite hard
to change when they are present in many subsystems (I try to get rid of
ARCH_MXx macros for some time now). Also with upcoming devicetree
support the IMX_HAVE_ macros will loose their meaning anyway. Being a
bit more relaxed with the 'depends on' only means that a user might
compile in some unused drivers, which is the standard case on other
architectures like x86 anyway.

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 |

[PATCH 2/5] dma i.MX: remove individual SOC dependency

[Sascha Hauer]

On Tue, Nov 08, 2011 at 09:40:33PM +0530, Vinod Koul wrote:
> On Tue, 2011-11-08 at 16:22 +0100, Sascha Hauer wrote:
> > Vinod,
> > 
> > Ping. Can you please queue this one?
> Sorry Sascha, looks like I have missed this one :(
> 
> Nevertheless, this seems to be part of a series, but I couldn't locate
> the rest.
> Do you want me to apply only this individual patch, seems little odd if
> thats the case...

Yes, only this patch please. Maybe I should send patches for different
subsystems in individual patches instead as a series, but it's very
convenient to create a series, add maintainers to the Cc field and just
send it out.

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 |