Commit e55cec4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  mmc: Correct definition of R6
  omap: Update MMC response types
parents 6d3154cc 6f949909

drivers/mmc/imxmmc.c

+0 −3
Original line number Diff line number Diff line
@@ -351,9 +351,6 @@ static void imxmci_start_cmd(struct imxmci_host *host, struct mmc_command *cmd, 
	case MMC_RSP_R3: /* short */

		cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3;

		break;

	case MMC_RSP_R6: /* short CRC */

		cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R6;

		break;

	default:

		break;

	}

drivers/mmc/omap.c

+9 −6
Original line number Diff line number Diff line
@@ -91,7 +91,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 */
@@ -204,18 +203,22 @@ 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):

		/* resp 1, resp 1b */

	switch (mmc_resp_type(cmd)) {

	case MMC_RSP_NONE:

		break;

	case MMC_RSP_R1:

	case MMC_RSP_R1B:

		/* resp 1, 1b, 6, 7 */

		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;

	default:

		dev_err(mmc_dev(host->mmc), "Invalid response type: %04x\n", mmc_resp_type(cmd));

		break;

	}

drivers/mmc/pxamci.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd, 


#define RSP_TYPE(x)	((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE))

	switch (RSP_TYPE(mmc_resp_type(cmd))) {

	case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6 */

	case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6, r7 */

		cmdat |= CMDAT_RESP_SHORT;

		break;

	case RSP_TYPE(MMC_RSP_R3):

drivers/mmc/tifm_sd.c

+0 −3
Original line number Diff line number Diff line
@@ -173,9 +173,6 @@ static unsigned int tifm_sd_op_flags(struct mmc_command *cmd) 
	case MMC_RSP_R3:

		rc |= TIFM_MMCSD_RSP_R3;

		break;

	case MMC_RSP_R6:

		rc |= TIFM_MMCSD_RSP_R6;

		break;

	default:

		BUG();

	}

include/linux/mmc/mmc.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct mmc_command { 
#define MMC_RSP_R1B	(MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)

#define MMC_RSP_R2	(MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)

#define MMC_RSP_R3	(MMC_RSP_PRESENT)

#define MMC_RSP_R6	(MMC_RSP_PRESENT|MMC_RSP_CRC)

#define MMC_RSP_R6	(MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)



#define mmc_resp_type(cmd)	((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE))