diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-06-02 09:31:08 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-06-02 09:31:08 -0500 |
| commit | e09c8e18cd1bdced6e7012af270654c120515a71 (patch) | |
| tree | ad82f01c9ecc93911fa83e01f98443c55e9c1eaf /include | |
| parent | 9946db2b6c6cef5051aa57e7d1acb47aca612904 (diff) | |
| parent | 02c6c799b01507aefd8981b63e8a8c1c2bc4d8fd (diff) | |
Merge branch 'Wlan-next' of git://dev.omapzoom.org/pub/scm/pradeep/wlan-1283 into L24x7
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/int-ll64.h | 2 | ||||
| -rw-r--r-- | include/linux/mmc/host.h | 18 | ||||
| -rw-r--r-- | include/linux/mmc/sdio_func.h | 10 | ||||
| -rw-r--r-- | include/linux/mmc/sdio_ids.h | 5 |
4 files changed, 34 insertions, 1 deletions
diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h index f394147c0739..0d806774a6ec 100644 --- a/include/asm-generic/int-ll64.h +++ b/include/asm-generic/int-ll64.h @@ -8,7 +8,7 @@ #ifndef _ASM_GENERIC_INT_LL64_H #define _ASM_GENERIC_INT_LL64_H -#include <asm/bitsperlong.h> +#include <asm-generic/bitsperlong.h> #ifndef __ASSEMBLY__ /* diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 43eaf5ca5848..9f416867b459 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -208,6 +208,17 @@ struct mmc_host { struct dentry *debugfs_root; +#ifdef CONFIG_TIWLAN_SDIO + struct { + struct sdio_cis *cis; + struct sdio_embedded_func *funcs; + unsigned int quirks; /* embedded sdio card quirks */ +#define MMC_QUIRK_VDD_165_195 (1<<0) /* do not ignore MMC_VDD_165_195 */ +#define MMC_QUIRK_LENIENT_FUNC0 (1<<1) + /* allow SDIO FN0 writes outside of VS CCCR */ + } embedded_sdio_data; +#endif + unsigned long private[0] ____cacheline_aligned; }; @@ -216,6 +227,13 @@ extern int mmc_add_host(struct mmc_host *); extern void mmc_remove_host(struct mmc_host *); extern void mmc_free_host(struct mmc_host *); +#ifdef CONFIG_TIWLAN_SDIO +extern void mmc_set_embedded_sdio_data(struct mmc_host *host, + struct sdio_cis *cis, + struct sdio_embedded_func *funcs, + unsigned int quirks); +#endif + static inline void *mmc_priv(struct mmc_host *host) { return (void *)host->private; diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h index c6c0cceba5fe..d522c8624778 100644 --- a/include/linux/mmc/sdio_func.h +++ b/include/linux/mmc/sdio_func.h @@ -22,6 +22,16 @@ struct sdio_func; typedef void (sdio_irq_handler_t)(struct sdio_func *); +#ifdef CONFIG_TIWLAN_SDIO +/* + * Structure used to hold embedded SDIO device data from platform layer + */ +struct sdio_embedded_func { + uint8_t f_class; + uint32_t f_maxblksize; +}; +#endif + /* * SDIO function CIS tuple (unknown to the core) */ diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h index 33b2ea09a4ad..770f311fcdb9 100644 --- a/include/linux/mmc/sdio_ids.h +++ b/include/linux/mmc/sdio_ids.h @@ -35,6 +35,11 @@ #define SDIO_DEVICE_ID_MARVELL_8688WLAN 0x9104 #define SDIO_DEVICE_ID_MARVELL_8688BT 0x9105 +#ifdef CONFIG_TIWLAN_SDIO +#define SDIO_VENDOR_ID_TI 0x104c +#define SDIO_DEVICE_ID_TI_WL12xx 0x9066 +#endif + #define SDIO_VENDOR_ID_SIANO 0x039a #define SDIO_DEVICE_ID_SIANO_NOVA_B0 0x0201 #define SDIO_DEVICE_ID_SIANO_NICE 0x0202 |