lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sdio: basic parsing of FBR

Browse Source 
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Pierre Ossman
2007-06-11 21:01:00 +02:00
parent 35c66c1908
commit 0597007f1b
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/mmc/core/sdio.c
View File

@@ -23,8 +23,34 @@
#include "sd_ops.h" #include "sd_ops.h"
#include "sdio_ops.h" #include "sdio_ops.h"
static int sdio_read_fbr(struct sdio_func *func)
{
int ret;
unsigned char data;
ret = mmc_io_rw_direct(func->card, 0, 0,
func->num * 0x100 + SDIO_FBR_STD_IF, 0, &data);
if (ret)
goto out;
data &= 0x0f;
if (data == 0x0f) {
ret = mmc_io_rw_direct(func->card, 0, 0,
func->num * 0x100 + SDIO_FBR_STD_IF_EXT, 0, &data);
if (ret)
goto out;
}
func->class = data;
out:
return ret;
}
static int sdio_init_func(struct mmc_card *card, unsigned int fn) static int sdio_init_func(struct mmc_card *card, unsigned int fn)
{ {
int ret;
struct sdio_func *func; struct sdio_func *func;
BUG_ON(fn > SDIO_MAX_FUNCS); BUG_ON(fn > SDIO_MAX_FUNCS);
@@ -35,9 +61,21 @@ static int sdio_init_func(struct mmc_card *card, unsigned int fn)
func->num = fn; func->num = fn;
ret = sdio_read_fbr(func);
if (ret)
goto fail;
card->sdio_func[fn - 1] = func; card->sdio_func[fn - 1] = func;
return 0; return 0;
fail:
/*
* It is okay to remove the function here even though we hold
* the host lock as we haven't registered the device yet.
*/
sdio_remove_func(func);
return ret;
} }
static int sdio_read_cccr(struct mmc_card *card) static int sdio_read_cccr(struct mmc_card *card)

5
include/linux/mmc/sdio_func.h
View File

@@ -21,6 +21,11 @@ struct sdio_func {
struct mmc_card *card; /* the card this device belongs to */ struct mmc_card *card; /* the card this device belongs to */
struct device dev; /* the device */ struct device dev; /* the device */
unsigned int num; /* function number */ unsigned int num; /* function number */
unsigned char class; /* standard interface class */
unsigned short vendor; /* vendor id */
unsigned short device; /* device id */
unsigned int state; /* function state */ unsigned int state; /* function state */
#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */ #define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */
}; };