ARM: bcm_defconfig: re-enable BCM Kona SDHCI driver

Message ID 1402941376-29594-1-git-send-email-mporter@linaro.org
State New
Headers show

Commit Message

Matt Porter June 16, 2014, 5:56 p.m.
Since 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
MMC_SDHCI_PLTFM is no longer selected by the BCM Kona SDHCI
driver which is enabled in this defconfig. This results in the
SDHCI driver not being built and a boot failure. Explictly
enable MMC_SDHCI_PLTFM in bcm_defconfig so the BCM Kona SDHCI
driver is built.

Fixes: 5d01b7684b7e ("mmc: simplify SDHCI Kconfig dependencies")
Signed-off-by: Matt Porter <mporter@linaro.org>
---
 arch/arm/configs/bcm_defconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Alex Elder June 16, 2014, 7:12 p.m. | #1
On 06/16/2014 12:56 PM, Matt Porter wrote:
> Since 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
> MMC_SDHCI_PLTFM is no longer selected by the BCM Kona SDHCI
> driver which is enabled in this defconfig. This results in the
> SDHCI driver not being built and a boot failure. Explictly
> enable MMC_SDHCI_PLTFM in bcm_defconfig so the BCM Kona SDHCI
> driver is built.
> 
> Fixes: 5d01b7684b7e ("mmc: simplify SDHCI Kconfig dependencies")
> Signed-off-by: Matt Porter <mporter@linaro.org>

Works for me.

Tested-by: Alex Elder <elder@linaro.org>

> ---
>  arch/arm/configs/bcm_defconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
> index 9d13dae..dcfc559 100644
> --- a/arch/arm/configs/bcm_defconfig
> +++ b/arch/arm/configs/bcm_defconfig
> @@ -98,6 +98,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
>  CONFIG_MMC_BLOCK_MINORS=32
>  CONFIG_MMC_TEST=y
>  CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_PLTFM=y
>  CONFIG_MMC_SDHCI_BCM_KONA=y
>  CONFIG_NEW_LEDS=y
>  CONFIG_LEDS_CLASS=y
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson June 16, 2014, 9:22 p.m. | #2
On 16 June 2014 19:56, Matt Porter <mporter@linaro.org> wrote:
> Since 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
> MMC_SDHCI_PLTFM is no longer selected by the BCM Kona SDHCI
> driver which is enabled in this defconfig. This results in the
> SDHCI driver not being built and a boot failure. Explictly
> enable MMC_SDHCI_PLTFM in bcm_defconfig so the BCM Kona SDHCI
> driver is built.
>
> Fixes: 5d01b7684b7e ("mmc: simplify SDHCI Kconfig dependencies")
> Signed-off-by: Matt Porter <mporter@linaro.org>

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

I suppose this goes through arm-soc, but ping me if want me to send
this as a fix for 3.16.

Kind regards
Uffe

> ---
>  arch/arm/configs/bcm_defconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
> index 9d13dae..dcfc559 100644
> --- a/arch/arm/configs/bcm_defconfig
> +++ b/arch/arm/configs/bcm_defconfig
> @@ -98,6 +98,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
>  CONFIG_MMC_BLOCK_MINORS=32
>  CONFIG_MMC_TEST=y
>  CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_PLTFM=y
>  CONFIG_MMC_SDHCI_BCM_KONA=y
>  CONFIG_NEW_LEDS=y
>  CONFIG_LEDS_CLASS=y
> --
> 1.8.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Russell King - ARM Linux June 16, 2014, 9:55 p.m. | #3
On Mon, Jun 16, 2014 at 01:56:16PM -0400, Matt Porter wrote:
> Since 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
> MMC_SDHCI_PLTFM is no longer selected by the BCM Kona SDHCI
> driver which is enabled in this defconfig. This results in the
> SDHCI driver not being built and a boot failure. Explictly
> enable MMC_SDHCI_PLTFM in bcm_defconfig so the BCM Kona SDHCI
> driver is built.

I really don't understand why MMC_SDHCI_PLTFM isn't selected by the
sub-drivers.  sdhci-pltfm.c is a library module, which is only
useful with one of the sub-drivers enabled.

So, rather than providing a multitude of dependent options, why not
present people with:

 + sdhci drivers
   + sdhci pci
   + sdhci acpi
   + Arasan
   + Freescale eSDHC
   + Nintendo Wii
   + Dove

and leave MMC_SDHCI_PLTFM as a hidden option whose purpose is to
enable building of sdhci-pltfm.c.
Stephen Warren June 16, 2014, 10:16 p.m. | #4
On 06/16/2014 03:55 PM, Russell King - ARM Linux wrote:
> On Mon, Jun 16, 2014 at 01:56:16PM -0400, Matt Porter wrote:
>> Since 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
>> MMC_SDHCI_PLTFM is no longer selected by the BCM Kona SDHCI
>> driver which is enabled in this defconfig. This results in the
>> SDHCI driver not being built and a boot failure. Explictly
>> enable MMC_SDHCI_PLTFM in bcm_defconfig so the BCM Kona SDHCI
>> driver is built.
> 
> I really don't understand why MMC_SDHCI_PLTFM isn't selected by the
> sub-drivers.  sdhci-pltfm.c is a library module, which is only
> useful with one of the sub-drivers enabled.
> 
> So, rather than providing a multitude of dependent options, why not
> present people with:
> 
>  + sdhci drivers
>    + sdhci pci
>    + sdhci acpi
>    + Arasan
>    + Freescale eSDHC
>    + Nintendo Wii
>    + Dove
> 
> and leave MMC_SDHCI_PLTFM as a hidden option whose purpose is to
> enable building of sdhci-pltfm.c.

CC'ing Arnd, as author of 5d01b7684b7e "mmc: simplify SDHCI Kconfig
dependencies". I also forgot to do that on the patch that fixed
multi_v7_defconfig for this:-(
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Arnd Bergmann June 17, 2014, 11:46 a.m. | #5
On Tuesday 17 June 2014, Stephen Warren wrote:
> On 06/16/2014 03:55 PM, Russell King - ARM Linux wrote:
> > On Mon, Jun 16, 2014 at 01:56:16PM -0400, Matt Porter wrote:
> >> Since 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
> >> MMC_SDHCI_PLTFM is no longer selected by the BCM Kona SDHCI
> >> driver which is enabled in this defconfig. This results in the
> >> SDHCI driver not being built and a boot failure. Explictly
> >> enable MMC_SDHCI_PLTFM in bcm_defconfig so the BCM Kona SDHCI
> >> driver is built.
> > 
> > I really don't understand why MMC_SDHCI_PLTFM isn't selected by the
> > sub-drivers.  sdhci-pltfm.c is a library module, which is only
> > useful with one of the sub-drivers enabled.
> > 
> > So, rather than providing a multitude of dependent options, why not
> > present people with:
> > 
> >  + sdhci drivers
> >    + sdhci pci
> >    + sdhci acpi
> >    + Arasan
> >    + Freescale eSDHC
> >    + Nintendo Wii
> >    + Dove
> >
> > and leave MMC_SDHCI_PLTFM as a hidden option whose purpose is to
> > enable building of sdhci-pltfm.c.
> 
> CC'ing Arnd, as author of 5d01b7684b7e "mmc: simplify SDHCI Kconfig
> dependencies". I also forgot to do that on the patch that fixed
> multi_v7_defconfig for this:-(

I think doing it the other way round as Russell suggested is a good
idea, and we can definitely do that. We have a similar situation in
other subsystems, sometimes we do it one way and sometimes the other.

The problem I was addressing in my patch was that the SDHCI driver
in particular was mixing the two approaches, which is much worse
as that can cause Kconfig dependency loops and is rather confusing.
I picked the approach that seemed simpler at the time.

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 9d13dae..dcfc559 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -98,6 +98,7 @@  CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_TEST=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_BCM_KONA=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y