[PATCH] [OMAP] HTCHERALD: MMC, I2C, HTCPLD, SPI, TSC2046

[Cory Maccarrone]

On Thu, Sep 30, 2010 at 11:48 AM, Tony Lindgren <tony at atomide.com> wrote:
> * Cory Maccarrone <darkstar6262 at gmail.com> [100930 11:34]:
>> >
>> > Looks like also board-sx1-mmc.c and board-h[23]-mmc.c have the
>> > same spotty voltage range.
>> >
>> > Cory, care to do a patch that fixes it for all of them?
>> >
>>
>> Yeah, I can do that.  I'll resubmit this patch too with the fixed up ranges.
>
> Turns out I already did it :) Care to test/ack this one?
>
> Tony
>
> From: Tony Lindgren <tony at atomide.com>
> Date: Thu, 30 Sep 2010 11:40:56 -0700
> Subject: [PATCH] omap: Fix spotty MMC voltages
>
> As noted by Michał Mirosław <mirqus at gmail.com>, the voltages should
> cover the supported voltage range instead of missing some values
> within the range.
>
> Reported-by: Michał Mirosław <mirqus at gmail.com>
> Signed-off-by: Tony Lindgren <tony at atomide.com>
>
> diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
> index b30c499..50d9032 100644
> --- a/arch/arm/mach-omap1/board-h2-mmc.c
> +++ b/arch/arm/mach-omap1/board-h2-mmc.c
> @@ -58,7 +58,8 @@ static struct omap_mmc_platform_data mmc1_data = {
>        .dma_mask                       = 0xffffffff,
>        .slots[0]       = {
>                .set_power              = mmc_set_power,
> -               .ocr_mask               = MMC_VDD_28_29 | MMC_VDD_30_31 |
> +               .ocr_mask               = MMC_VDD_28_29 | MMC_VDD_29_30 |
> +                                         MMC_VDD_30_31 | MMC_VDD_31_32 |
>                                          MMC_VDD_32_33 | MMC_VDD_33_34,
>                .name                   = "mmcblk",
>        },
> diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c
> index 54b0f06..9f073bf 100644
> --- a/arch/arm/mach-omap1/board-h3-mmc.c
> +++ b/arch/arm/mach-omap1/board-h3-mmc.c
> @@ -40,7 +40,8 @@ static struct omap_mmc_platform_data mmc1_data = {
>        .dma_mask                       = 0xffffffff,
>        .slots[0]       = {
>                .set_power              = mmc_set_power,
> -               .ocr_mask               = MMC_VDD_28_29 | MMC_VDD_30_31 |
> +               .ocr_mask               = MMC_VDD_28_29 | MMC_VDD_29_30 |
> +                                         MMC_VDD_30_31 | MMC_VDD_31_32 |
>                                          MMC_VDD_32_33 | MMC_VDD_33_34,
>                .name                   = "mmcblk",
>        },
> diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
> index 7ea75c1..909fdeb 100644
> --- a/arch/arm/mach-omap1/board-htcherald.c
> +++ b/arch/arm/mach-omap1/board-htcherald.c
> @@ -410,7 +410,8 @@ static struct omap_mmc_platform_data htc_mmc1_data = {
>        .nr_slots                       = 1,
>        .switch_slot                    = NULL,
>        .slots[0]       = {
> -               .ocr_mask               = MMC_VDD_28_29 | MMC_VDD_30_31 |
> +               .ocr_mask               = MMC_VDD_28_29 | MMC_VDD_29_30 |
> +                                         MMC_VDD_30_31 | MMC_VDD_31_32 |
>                                          MMC_VDD_32_33 | MMC_VDD_33_34,
>                .name                   = "mmcblk",
>                .nomux                  = 1,
> diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c
> index 5b33ae8..be5a365 100644
> --- a/arch/arm/mach-omap1/board-sx1-mmc.c
> +++ b/arch/arm/mach-omap1/board-sx1-mmc.c
> @@ -44,7 +44,8 @@ static struct omap_mmc_platform_data mmc1_data = {
>        .nr_slots                       = 1,
>        .slots[0]       = {
>                .set_power              = mmc_set_power,
> -               .ocr_mask               = MMC_VDD_28_29 | MMC_VDD_30_31 |
> +               .ocr_mask               = MMC_VDD_28_29 | MMC_VDD_29_30 |
> +                                         MMC_VDD_30_31 | MMC_VDD_31_32 |
>                                          MMC_VDD_32_33 | MMC_VDD_33_34,
>                .name                   = "mmcblk",
>        },
> diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
> index 7a93bd5..abd7e77 100644
> --- a/arch/arm/mach-omap2/board-n8x0.c
> +++ b/arch/arm/mach-omap2/board-n8x0.c
> @@ -493,7 +493,8 @@ static struct omap_mmc_platform_data mmc1_data = {
>                .set_bus_mode           = n8x0_mmc_set_bus_mode,
>                .get_cover_state        = n8x0_mmc_get_cover_state,
>                .ocr_mask               = MMC_VDD_165_195 | MMC_VDD_30_31 |
> -                                               MMC_VDD_32_33   | MMC_VDD_33_34,
> +                                               MMC_VDD_31_32 | MMC_VDD_32_33 |
> +                                               MMC_VDD_33_34,
>                .name                   = "internal",
>        },
>        .slots[1] = {
>

Sure thing, hopefully in the next day or two. :)

- Cory