aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2007-06-11 21:01:00 +0200
committerPierre Ossman <drzeus@drzeus.cx>2007-09-23 20:13:52 +0200
commit0597007f1b22bbb5d4234ca09c045f9bb2711270 (patch)
treeffe8cc7fd237a76e399c755ae4b58a469a03dd50
parent35c66c19088bddb11110c124bad8abd4441a8421 (diff)
sdio: basic parsing of FBR
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-rw-r--r--drivers/mmc/core/sdio.c38
-rw-r--r--include/linux/mmc/sdio_func.h5
2 files changed, 43 insertions, 0 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 7ce3e3104d2..be623856f28 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -23,8 +23,34 @@
#include "sd_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)
{
+ int ret;
struct sdio_func *func;
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;
+ ret = sdio_read_fbr(func);
+ if (ret)
+ goto fail;
+
card->sdio_func[fn - 1] = func;
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)
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index 3365fef5f71..4164809a8e6 100644
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -21,6 +21,11 @@ struct sdio_func {
struct mmc_card *card; /* the card this device belongs to */
struct device dev; /* the device */
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 */
#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */
};