[PATCH] ARM: multi_v7_defconfig: re-enable SDHCI drivers

[PATCH] ARM: multi_v7_defconfig: re-enable SDHCI drivers

[Stephen Warren]

From: Stephen Warren <swarren@nvidia.com>

Following 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
SDHCI drivers that use MMC_SDHCI_PLTFM no longer select it, but
instead depend on it. This means that multi_v7_defconfig no longer
selects it, and hence many SDHCI drivers are no longer enabled.
Explicitly enable MMC_SDHCI_PLTFM to solve this.

Fixes: 5d01b7684b7e ("mmc: simplify SDHCI Kconfig dependencies")
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
This is a fix for 3.16, and based directly on v3.16-rc1.

 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index e2d62048e198..17d9462b9fb9 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -300,6 +300,7 @@ CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=16
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_DOVE=y
-- 
1.8.1.5

Re: [PATCH] ARM: multi_v7_defconfig: re-enable SDHCI drivers

[Matt Porter]

On Mon, Jun 16, 2014 at 10:50:42AM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Following 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
> SDHCI drivers that use MMC_SDHCI_PLTFM no longer select it, but
> instead depend on it. This means that multi_v7_defconfig no longer
> selects it, and hence many SDHCI drivers are no longer enabled.
> Explicitly enable MMC_SDHCI_PLTFM to solve this.
> 
> Fixes: 5d01b7684b7e ("mmc: simplify SDHCI Kconfig dependencies")
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> This is a fix for 3.16, and based directly on v3.16-rc1.
> 
>  arch/arm/configs/multi_v7_defconfig | 1 +
>  1 file changed, 1 insertion(+)

Thanks, fixes the boot failure on my BCM mobile boards. I'm posting the
equivalent for our own defconfig.

Tested-by: Matt Porter <mporter@linaro.org>

Re: [PATCH] ARM: multi_v7_defconfig: re-enable SDHCI drivers

[Ulf Hansson]

On 16 June 2014 18:50, Stephen Warren <swarren@wwwdotorg.org> wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> Following 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
> SDHCI drivers that use MMC_SDHCI_PLTFM no longer select it, but
> instead depend on it. This means that multi_v7_defconfig no longer
> selects it, and hence many SDHCI drivers are no longer enabled.
> Explicitly enable MMC_SDHCI_PLTFM to solve this.
>
> Fixes: 5d01b7684b7e ("mmc: simplify SDHCI Kconfig dependencies")
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

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

I suppose this goes through arm-soc, otherwise ping me if you want me
to handle it as a fix for 3.16.

Kind regards
Uffe

> ---
> This is a fix for 3.16, and based directly on v3.16-rc1.
>
>  arch/arm/configs/multi_v7_defconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index e2d62048e198..17d9462b9fb9 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -300,6 +300,7 @@ CONFIG_MMC=y
>  CONFIG_MMC_BLOCK_MINORS=16
>  CONFIG_MMC_ARMMMCI=y
>  CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_PLTFM=y
>  CONFIG_MMC_SDHCI_OF_ARASAN=y
>  CONFIG_MMC_SDHCI_ESDHC_IMX=y
>  CONFIG_MMC_SDHCI_DOVE=y
> --
> 1.8.1.5
>
> --
> 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

Re: [PATCH] ARM: multi_v7_defconfig: re-enable SDHCI drivers

[Arnd Bergmann]

On Monday 16 June 2014 23:16:01 Ulf Hansson wrote:
> On 16 June 2014 18:50, Stephen Warren <swarren@wwwdotorg.org> wrote:
> > From: Stephen Warren <swarren@nvidia.com>
> >
> > Following 5d01b7684b7e "mmc: simplify SDHCI Kconfig dependencies",
> > SDHCI drivers that use MMC_SDHCI_PLTFM no longer select it, but
> > instead depend on it. This means that multi_v7_defconfig no longer
> > selects it, and hence many SDHCI drivers are no longer enabled.
> > Explicitly enable MMC_SDHCI_PLTFM to solve this.
> >
> > Fixes: 5d01b7684b7e ("mmc: simplify SDHCI Kconfig dependencies")
> > Signed-off-by: Stephen Warren <swarren@nvidia.com>
> 
> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
> 
> I suppose this goes through arm-soc, otherwise ping me if you want me
> to handle it as a fix for 3.16.

I've added it to the fixes branch now, thanks!

	Arnd