| Message ID | 1417563767-32181-2-git-send-email-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Doug Anderson <dianders@chromium.org> [141202 15:45]: > In preparation for having init_card() called for all card types (not > just SDIO), change pandora_wl1251_init_card() so it checks whether the > card type is SDIO. Seems OK to me and should not conflict with linux-omap patches: Acked-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Doug Anderson <dianders@chromium.org> > --- > Changes in v5: > - Split fixup to pandora_wl1251_init_card() into its own patch. > > Changes in v3: None > Changes in v2: None > > arch/arm/mach-omap2/board-omap3pandora.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c > index 7f17087..969e100 100644 > --- a/arch/arm/mach-omap2/board-omap3pandora.c > +++ b/arch/arm/mach-omap2/board-omap3pandora.c > @@ -254,12 +254,14 @@ static void pandora_wl1251_init_card(struct mmc_card *card) > * We have TI wl1251 attached to MMC3. Pass this information to > * SDIO core because it can't be probed by normal methods. > */ > - card->quirks |= MMC_QUIRK_NONSTD_SDIO; > - card->cccr.wide_bus = 1; > - card->cis.vendor = 0x104c; > - card->cis.device = 0x9066; > - card->cis.blksize = 512; > - card->cis.max_dtr = 20000000; > + if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) { > + card->quirks |= MMC_QUIRK_NONSTD_SDIO; > + card->cccr.wide_bus = 1; > + card->cis.vendor = 0x104c; > + card->cis.device = 0x9066; > + card->cis.blksize = 512; > + card->cis.max_dtr = 20000000; > + } > } > > static struct omap2_hsmmc_info omap3pandora_mmc[] = { > -- > 2.2.0.rc0.207.ga3a616c > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 7f17087..969e100 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -254,12 +254,14 @@ static void pandora_wl1251_init_card(struct mmc_card *card) * We have TI wl1251 attached to MMC3. Pass this information to * SDIO core because it can't be probed by normal methods. */ - card->quirks |= MMC_QUIRK_NONSTD_SDIO; - card->cccr.wide_bus = 1; - card->cis.vendor = 0x104c; - card->cis.device = 0x9066; - card->cis.blksize = 512; - card->cis.max_dtr = 20000000; + if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) { + card->quirks |= MMC_QUIRK_NONSTD_SDIO; + card->cccr.wide_bus = 1; + card->cis.vendor = 0x104c; + card->cis.device = 0x9066; + card->cis.blksize = 512; + card->cis.max_dtr = 20000000; + } } static struct omap2_hsmmc_info omap3pandora_mmc[] = {
In preparation for having init_card() called for all card types (not just SDIO), change pandora_wl1251_init_card() so it checks whether the card type is SDIO. Signed-off-by: Doug Anderson <dianders@chromium.org> --- Changes in v5: - Split fixup to pandora_wl1251_init_card() into its own patch. Changes in v3: None Changes in v2: None arch/arm/mach-omap2/board-omap3pandora.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)