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

Commit ed199f7e authored by Grazvydas Ignotas's avatar Grazvydas Ignotas Committed by Linus Torvalds
Browse files

omap: pandora: pass wl1251 information to SDIO core 



Pandora has TI WL1251 attached on MMC3, which is non-standard SDIO chip.
Make use MMC_QUIRK_NONSTD_SDIO to tell SDIO core about it.

Signed-off-by: default avatarGrazvydas Ignotas <notasas@gmail.com>
Cc: Adrian Hunter <adrian.hunter@nokia.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Bob Copeland <me@bobcopeland.com>
Cc: Kalle Valo <kvalo@adurom.com>
Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
Cc: Kishore Kadiyala <kishore.kadiyala@ti.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4816858c

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

+16 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/input.h>

#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/input/matrix_keypad.h>

#include <linux/gpio_keys.h>

#include <linux/gpio_keys.h>

#include <linux/mmc/card.h>





#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -258,6 +259,20 @@ static struct platform_device pandora_dss_device = { 
	},

	},

};

};





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;

}



static struct omap2_hsmmc_info omap3pandora_mmc[] = {

static struct omap2_hsmmc_info omap3pandora_mmc[] = {

	{

	{

		.mmc		= 1,

		.mmc		= 1,
@@ -279,6 +294,7 @@ static struct omap2_hsmmc_info omap3pandora_mmc[] = { 
		.wires		= 4,

		.wires		= 4,

		.gpio_cd	= -EINVAL,

		.gpio_cd	= -EINVAL,

		.gpio_wp	= -EINVAL,

		.gpio_wp	= -EINVAL,

		.init_card	= pandora_wl1251_init_card,

	},

	},

	{}	/* Terminator */

	{}	/* Terminator */

};

};

arch/arm/mach-omap2/hsmmc.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -268,6 +268,7 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers) 
		mmc->slots[0].gpio_wp = c->gpio_wp;

		mmc->slots[0].gpio_wp = c->gpio_wp;





		mmc->slots[0].remux = c->remux;

		mmc->slots[0].remux = c->remux;

		mmc->slots[0].init_card = c->init_card;





		if (c->cover_only)

		if (c->cover_only)

			mmc->slots[0].cover = 1;

			mmc->slots[0].cover = 1;

arch/arm/mach-omap2/hsmmc.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,8 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 */

 */





struct mmc_card;



struct omap2_hsmmc_info {

struct omap2_hsmmc_info {

	u8	mmc;		/* controller 1/2/3 */

	u8	mmc;		/* controller 1/2/3 */

	u8	wires;		/* 1/4/8 wires */

	u8	wires;		/* 1/4/8 wires */
@@ -23,6 +25,8 @@ struct omap2_hsmmc_info { 
	int	ocr_mask;	/* temporary HACK */

	int	ocr_mask;	/* temporary HACK */

	/* Remux (pad configuation) when powering on/off */

	/* Remux (pad configuation) when powering on/off */

	void (*remux)(struct device *dev, int slot, int power_on);

	void (*remux)(struct device *dev, int slot, int power_on);

	/* init some special card */

	void (*init_card)(struct mmc_card *card);

};

};





#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)

#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)