[PATCH] mmc: Add architecture dependency for Marvell SoC controller

[PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Mark Brown]

Since the driver is for controllers integrated into Marvells SoCs only
offer MMC_SDHCI_MV if we're building for one.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/mmc/host/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index ce099c4..5fa4e2b 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -133,6 +133,7 @@ config MMC_SDHCI_CNS3XXX
 config MMC_SDHCI_MV
 	tristate "SDHCI support on Marvell's SoC"
 	depends on MMC_SDHCI
+	depends on (PLAT_PXA || PLAT_ORION)
 	select MMC_SDHCI_IO_ACCESSORS
 	help
 	  This selects the Secure Digital Host Controller Interface in
-- 
1.7.1

Re: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Arnd Bergmann]

On Monday 13 September 2010, Mark Brown wrote:
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index ce099c4..5fa4e2b 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -133,6 +133,7 @@ config MMC_SDHCI_CNS3XXX
>  config MMC_SDHCI_MV
>         tristate "SDHCI support on Marvell's SoC"
>         depends on MMC_SDHCI
> +       depends on (PLAT_PXA || PLAT_ORION)
>         select MMC_SDHCI_IO_ACCESSORS
>         help
>           This selects the Secure Digital Host Controller Interface in

I think we normally try to do the the other way round: in order to increase
build coverage, try to enable all drivers on as many platforms as possible,
just don't have them in the defconfig.

Do you get build errors on other platforms? If yes, there is probably
a bug in the driver that should be fixed instead.

	Arnd

Re: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Mark Brown]

On Mon, Sep 13, 2010 at 12:48:38PM +0200, Arnd Bergmann wrote:

> I think we normally try to do the the other way round: in order to increase
> build coverage, try to enable all drivers on as many platforms as possible,
> just don't have them in the defconfig.

This is not the general pattern for on-CPU devices on the embedded SoCs,
for those we normally only offer the config option when building for a
system which could physically have the device.  Looking at the existing
MMC host drivers you'll see this pattern is already heavily used there -
all the existing embedded controllers have similar dependencies.

> Do you get build errors on other platforms? If yes, there is probably
> a bug in the driver that should be fixed instead.

No, I didn't even try to build it - I saw that I was being offered a
device for a Marvell CPU when building for a non-Marvell CPU.

Re: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Chris Ball]

Hi,

On Mon, Sep 13, 2010 at 09:24:39AM +0100, Mark Brown wrote:
> Since the driver is for controllers integrated into Marvells SoCs only
> offer MMC_SDHCI_MV if we're building for one.
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  drivers/mmc/host/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index ce099c4..5fa4e2b 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -133,6 +133,7 @@ config MMC_SDHCI_CNS3XXX
>  config MMC_SDHCI_MV
>  	tristate "SDHCI support on Marvell's SoC"
>  	depends on MMC_SDHCI
> +	depends on (PLAT_PXA || PLAT_ORION)
>  	select MMC_SDHCI_IO_ACCESSORS
>  	help
>  	  This selects the Secure Digital Host Controller Interface in
> -- 
> 1.7.1

This is fine with me.  Saeed, please can you ACK the choice of
platforms if you agree?

Thanks,

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

Re: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Mark Brown]

On Tue, Sep 14, 2010 at 08:05:49PM +0100, Chris Ball wrote:

> This is fine with me.  Saeed, please can you ACK the choice of
> platforms if you agree?

If the list of platforms is wrong we should probably also improve the
help text :)

RE: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Saeed Bishara]

 

>-----Original Message-----
>From: Mark Brown [mailto:broonie@opensource.wolfsonmicro.com] 
>Sent: Wednesday, September 15, 2010 11:40 AM
>To: Chris Ball
>Cc: Saeed Bishara; Andrew Morton; linux-mmc@vger.kernel.org; 
>linux-kernel@vger.kernel.org
>Subject: Re: [PATCH] mmc: Add architecture dependency for 
>Marvell SoC controller
>
>On Tue, Sep 14, 2010 at 08:05:49PM +0100, Chris Ball wrote:
>
>> This is fine with me.  Saeed, please can you ACK the choice of
>> platforms if you agree?
>
>If the list of platforms is wrong we should probably also improve the
>help text :)
I think the PLAT_PXA it too general, maybe you better specify the exact ARCH (ARCH_MMP).
saeed
>

RE: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Saeed Bishara]

 
>Which CPUs does the driver actually support?  The Kconfig and 
>commit log
>just say "Marvell" so I went for the conservative option and included
>all Marvell CPUs I was aware of.
The Marvell Dove SoC includes this device, this SoC defined by ARCH_DOVE
I guess it found also only on mmp (defined by ARCH_MMP), Haojian, can you confirm?
saeed

RE: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Saeed Bishara]

 

>-----Original Message-----
>From: Haojian Zhuang [mailto:haojian.zhuang@gmail.com] 
>Sent: Wednesday, September 15, 2010 1:21 PM
>To: Saeed Bishara
>Cc: Mark Brown; Chris Ball; Andrew Morton; 
>linux-mmc@vger.kernel.org; linux-kernel@vger.kernel.org
>Subject: Re: [PATCH] mmc: Add architecture dependency for 
>Marvell SoC controller
>
>On Wed, Sep 15, 2010 at 6:06 PM, Saeed Bishara 
><saeed@marvell.com> wrote:
>>
>>>Which CPUs does the driver actually support?  The Kconfig and
>>>commit log
>>>just say "Marvell" so I went for the conservative option and included
>>>all Marvell CPUs I was aware of.
>> The Marvell Dove SoC includes this device, this SoC defined 
>by ARCH_DOVE
>> I guess it found also only on mmp (defined by ARCH_MMP), 
>Haojian, can you confirm?
>> saeed
>
>As I know, MG1 is also using this IP. Although MG1 isn't supported in
>mainline, it's planned to be added into ARCH_PXA or one new ARCH. So
>PLAT_PXA is preferred.
I think (ARCH_DOVE || ARCH_MMP) is prefered, when MG1 gets added to mainline, then we will add that new ARCH.

saeed

Re: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Mark Brown]

On Wed, Sep 15, 2010 at 12:55:33PM +0300, Saeed Bishara wrote:

> I think the PLAT_PXA it too general, maybe you better specify the
> exact ARCH (ARCH_MMP).

Which CPUs does the driver actually support?  The Kconfig and commit log
just say "Marvell" so I went for the conservative option and included
all Marvell CPUs I was aware of.

Re: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Haojian Zhuang]

On Wed, Sep 15, 2010 at 6:06 PM, Saeed Bishara <saeed@marvell.com> wrote:
>
>>Which CPUs does the driver actually support?  The Kconfig and
>>commit log
>>just say "Marvell" so I went for the conservative option and included
>>all Marvell CPUs I was aware of.
> The Marvell Dove SoC includes this device, this SoC defined by ARCH_DOVE
> I guess it found also only on mmp (defined by ARCH_MMP), Haojian, can you confirm?
> saeed

As I know, MG1 is also using this IP. Although MG1 isn't supported in
mainline, it's planned to be added into ARCH_PXA or one new ARCH. So
PLAT_PXA is preferred.

Best Regards
Haojian

Re: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Haojian Zhuang]

On Wed, Sep 15, 2010 at 6:29 PM, Saeed Bishara <saeed@marvell.com> wrote:
>
>
>>-----Original Message-----
>>From: Haojian Zhuang [mailto:haojian.zhuang@gmail.com]
>>Sent: Wednesday, September 15, 2010 1:21 PM
>>To: Saeed Bishara
>>Cc: Mark Brown; Chris Ball; Andrew Morton;
>>linux-mmc@vger.kernel.org; linux-kernel@vger.kernel.org
>>Subject: Re: [PATCH] mmc: Add architecture dependency for
>>Marvell SoC controller
>>
>>On Wed, Sep 15, 2010 at 6:06 PM, Saeed Bishara
>><saeed@marvell.com> wrote:
>>>
>>>>Which CPUs does the driver actually support?  The Kconfig and
>>>>commit log
>>>>just say "Marvell" so I went for the conservative option and included
>>>>all Marvell CPUs I was aware of.
>>> The Marvell Dove SoC includes this device, this SoC defined
>>by ARCH_DOVE
>>> I guess it found also only on mmp (defined by ARCH_MMP),
>>Haojian, can you confirm?
>>> saeed
>>
>>As I know, MG1 is also using this IP. Although MG1 isn't supported in
>>mainline, it's planned to be added into ARCH_PXA or one new ARCH. So
>>PLAT_PXA is preferred.
> I think (ARCH_DOVE || ARCH_MMP) is prefered, when MG1 gets added to mainline, then we will add that new ARCH.
>
> saeed

OK.

Re: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

[Chris Ball]

On Wed, Sep 15, 2010 at 01:29:11PM +0300, Saeed Bishara wrote:
> I think (ARCH_DOVE || ARCH_MMP) is prefered, when MG1 gets added to
> mainline, then we will add that new ARCH.

Thanks, pushed to mmc-next as below.

From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 15 Sep 2010 16:45:41 -0400
Subject: [PATCH] mmc: Add architecture dependency for Marvell SoC controller

Since the driver is for controllers integrated into Marvell SoCs only
offer MMC_SDHCI_MV if we're building for one.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Saeed Bishara <saeed@marvell.com>
[cjb: Use list of arches from Saeed, and update help text accordingly]
Signed-off-by: Chris Ball <cjb@laptop.org>
---
 drivers/mmc/host/Kconfig |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index ce099c4..6f12d5d 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -133,10 +133,11 @@ config MMC_SDHCI_CNS3XXX
 config MMC_SDHCI_MV
 	tristate "SDHCI support on Marvell's SoC"
 	depends on MMC_SDHCI
+	depends on (ARCH_DOVE || ARCH_MMP)
 	select MMC_SDHCI_IO_ACCESSORS
 	help
-	  This selects the Secure Digital Host Controller Interface in
-	  Marvell's SoC controllers.
+	  This selects SDHCI support for controllers found in the Dove
+	  and MMP SoCs from Marvell.
 
 	  If you have a controller with this interface, say Y or M here.
 
-- 
1.7.2.2

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