[PATCH v4] arm: mach-mmp: brownstone.c support multiple sd slots

[Eric Miao]

On Thu, Jul 7, 2011 at 12:08 AM, Philip Rakity <prakity at marvell.com> wrote:
> Eric,
>
> Not sure what to suggest.
>
> If it makes more sense to take V3 which powers on the wifi card but does not do power handling per
> new spec take that.  At least wifi card works and then wait for power code.  New code could delete
> power code as part of the mod.
>
> If it makes more sense to wait for power code -- take V4.
>

No worries. I'll wait for v4.

> Philip
>
>
>
>
> V4
> ==
> remove code to enable power for wifi.  Coming in separate patch
> (by others) that conforms to new power architecture.
>
> V3
> ==
> Change since V2 -- delete mmc3 since it was committed
> to linux next.
>
> enable mmc1 used for wifi (8688) and marked PERMANENT.
> Wifi requires enabling of power on the device by
> toggling the gpio lines for power and reset.
>
> Signed-off-by: Philip Rakity <prakity at marvell.com>
> ---
>  arch/arm/mach-mmp/brownstone.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-mmp/brownstone.c b/arch/arm/mach-mmp/brownstone.c
> index c79162a..7634b2f 100644
> --- a/arch/arm/mach-mmp/brownstone.c
> +++ b/arch/arm/mach-mmp/brownstone.c
> @@ -180,6 +180,11 @@ static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc0 = {
>        .clk_delay_cycles = 0x1f,
>  };
>
> +static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc1 = {
> +       .clk_delay_cycles = 0x1f,
> +       .flags          = PXA_FLAG_CARD_PERMANENT,
> +};
> +
>  static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc2 = {
>        .clk_delay_cycles = 0x1f,
>        .flags = PXA_FLAG_CARD_PERMANENT
> @@ -195,8 +200,9 @@ static void __init brownstone_init(void)
>        mmp2_add_uart(1);
>        mmp2_add_uart(3);
>        mmp2_add_twsi(1, NULL, ARRAY_AND_SIZE(brownstone_twsi1_info));
> -       mmp2_add_sdhost(0, &mmp2_sdh_platdata_mmc0); /* SD/MMC */
>        mmp2_add_sdhost(2, &mmp2_sdh_platdata_mmc2); /* eMMC */
> +       mmp2_add_sdhost(0, &mmp2_sdh_platdata_mmc0); /* SD/MMC */
> +       mmp2_add_sdhost(1, &mmp2_sdh_platdata_mmc1); /* Wifi */
>
>        /* enable 5v regulator */
>        platform_device_register(&brownstone_v_5vp_device);
> --
> 1.7.0.4
>
>
>