Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a48fd4e7 authored by Doug Anderson's avatar Doug Anderson Committed by Ulf Hansson
Browse files

ARM: OMAP2+: Make sure pandora_wl1251_init_card() applies to SDIO only 



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: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ec6f34e5

arch/arm/mach-omap2/board-omap3pandora.c

+8 −6
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ 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.

	 */

	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;
@@ -261,6 +262,7 @@ static void pandora_wl1251_init_card(struct mmc_card *card) 
		card->cis.blksize = 512;

		card->cis.max_dtr = 20000000;

	}

}



static struct omap2_hsmmc_info omap3pandora_mmc[] = {

	{