From: Carlos Aguiar Date: Tue, 9 Jan 2007 23:54:46 +0000 (-0800) Subject: MMC: Update omap response types X-Git-Tag: v2.6.21-omap1~164 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e450521a397f8a5f2df00dad4a625e80ad840205;p=linux-2.6-omap-h63xx.git MMC: Update omap response types This patch is a fix in order to update MMC response types. This modification is needed to allow SD card support on OMAP platforms. Signed-off-by: Carlos Eduardo Aguiar Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren --- diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index 0d4379a6540..594d28bcdab 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c @@ -92,7 +92,6 @@ #define DRIVER_NAME "mmci-omap" -#define RSP_TYPE(x) ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE)) /* Specifies how often in millisecs to poll for card status changes * when the cover switch is open */ @@ -205,18 +204,25 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd) cmdtype = 0; /* Our hardware needs to know exact type */ - switch (RSP_TYPE(mmc_resp_type(cmd))) { - case RSP_TYPE(MMC_RSP_R1): + switch (mmc_resp_type(cmd)) { + case MMC_RSP_NONE: + break; + case MMC_RSP_R1: + case MMC_RSP_R1B: /* resp 1, resp 1b */ resptype = 1; break; - case RSP_TYPE(MMC_RSP_R2): + case MMC_RSP_R2: resptype = 2; break; - case RSP_TYPE(MMC_RSP_R3): + case MMC_RSP_R3: resptype = 3; break; + case MMC_RSP_R6: + resptype = 6; + break; default: + dev_err(mmc_dev(host->mmc), "Invalid response type: %04x\n", mmc_resp_type(cmd)); break; }