sdio: support for WLAN class and sans patch for embedded SDIO

Added sdio function support for WLAN/BT class, populating
embedded_sdio_data structure in mmc-tlw4030.

Signed-off-by: Panduranga <x0125717.@ti.com>

3 files changed, 65 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index 5d2982bb5eca..3a119aa09c83 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -25,6 +25,11 @@
 #include <plat/mmc.h>
 #include <plat/board.h>
 
+#ifdef CONFIG_TIWLAN_SDIO
+#include <linux/mmc/sdio_ids.h>
+#include <linux/mmc/sdio_func.h>
+#endif
+
 #include "mmc-twl4030.h"
 #include <linux/i2c/twl.h>
 
@@ -480,6 +485,29 @@ static int twl_mmc23_set_sleep(struct device *dev, int slot, int sleep, int vdd,
 
 static struct omap_mmc_platform_data *hsmmc_data[OMAP44XX_NR_MMC] __initdata;
 
+#ifdef CONFIG_TIWLAN_SDIO
+static struct sdio_embedded_func wifi_func_array[] = {
+	{
+		.f_class        = SDIO_CLASS_BT_A,
+		.f_maxblksize   = 512,
+	},
+	{
+		.f_class        = SDIO_CLASS_WLAN,
+		.f_maxblksize   = 512,
+	},
+};
+
+static struct embedded_sdio_data omap_wifi_emb_data = {
+	.cis    = {
+		.vendor         = SDIO_VENDOR_ID_TI,
+		.device         = SDIO_DEVICE_ID_TI_WL12xx,
+		.blksize        = 512,
+		.max_dtr        = 24000000,
+	},
+	.funcs  = wifi_func_array,
+};
+#endif
+
 void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 {
 	struct twl4030_hsmmc_info *c;
@@ -533,6 +561,16 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 		else
 			snprintf(twl->name, ARRAY_SIZE(twl->name),
 				"mmc%islot%i", c->mmc, 1);
+
+#ifdef CONFIG_TIWLAN_SDIO
+		if (c->mmc == CONFIG_TIWLAN_MMC_CONTROLLER) {
+			mmc->slots[0].embedded_sdio = &omap_wifi_emb_data;
+			mmc->slots[0].register_status_notify =
+				&omap_wifi_status_register;
+			mmc->slots[0].card_detect = &omap_wifi_status;
+		}
+#endif
+
 		mmc->slots[0].name = twl->name;
 		mmc->nr_slots = 1;
 		mmc->slots[0].wires = c->wires;
@@ -624,6 +662,9 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 			/* off-chip level shifting, or none */
 			mmc->slots[0].set_power = twl_mmc23_set_power;
 			mmc->slots[0].set_sleep = twl_mmc23_set_sleep;
+#ifdef CONFIG_TIWLAN_SDIO
+			mmc->slots[0].ocr_mask  = MMC_VDD_165_195;
+#endif
 			break;
 		default:
 			pr_err("MMC%d configuration not supported!\n", c->mmc);
diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h
index a47e68563fb6..1da38a26c2bf 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.h
+++ b/arch/arm/mach-omap2/mmc-twl4030.h
@@ -21,6 +21,12 @@ struct twl4030_hsmmc_info {
 	int	ocr_mask;	/* temporary HACK */
 };
 
+#ifdef CONFIG_TIWLAN_SDIO
+int omap_wifi_status_register(void (*callback)(int card_present,
+	void *dev_id), void *dev_id);
+int omap_wifi_status(int irq);
+#endif
+
 #if defined(CONFIG_REGULATOR) && \
 	(defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
 	 defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE))
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h
index 29937137bf3e..3b1e964cba73 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -17,6 +17,10 @@
 
 #include <plat/board.h>
 
+#ifdef CONFIG_TIWLAN_SDIO
+#include <linux/mmc/card.h>
+#endif
+
 #define OMAP15XX_NR_MMC		1
 #define OMAP16XX_NR_MMC		2
 #define OMAP1_MMC_SIZE		0x080
@@ -43,6 +47,13 @@
 
 #define OMAP_MMC_MAX_SLOTS	2
 
+#ifdef CONFIG_TIWLAN_SDIO
+struct embedded_sdio_data {
+struct sdio_cis cis;
+struct sdio_embedded_func *funcs;
+};
+#endif
+
 struct omap_mmc_platform_data {
 	/* back-link to device */
 	struct device *dev;
@@ -122,6 +133,13 @@ struct omap_mmc_platform_data {
 
 		unsigned int ban_openended:1;
 
+#ifdef CONFIG_TIWLAN_SDIO
+		struct embedded_sdio_data *embedded_sdio;
+		int (*register_status_notify)
+			(void (*callback)(int card_present, void *dev_id),
+			void *dev_id);
+#endif
+
 	} slots[OMAP_MMC_MAX_SLOTS];
 };