Commit 6abd2c86 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: (67 commits)
  mmc: don't use weight32()
  pxamci: support arbitrary block size
  sdio: make the IRQ thread more resilient in the presence of bad states
  sdio: fix IRQ diagnostic message
  sdhci: remove old dma module params
  sdhci: add SDHCI_QUIRK_BROKEN_DMA quirk
  sdhci: remove DMA capability check from controller's PCI Class reg
  sdhci: fix a typo
  mmc: Disabler for Ricoh MMC controller
  sdio: adaptive interrupt polling
  mmc: pxamci: add SDIO card interrupt reporting capability
  mmc: pxamci: set proper buswidth capabilities according to PXA flavor
  mmc: pxamci: set proper block capabilities according to PXA flavor
  mmc: pxamci: better pending IRQ determination
  arm: i.MX/MX1 SDHC implements SD cards read-only switch read-back
  mmc: add led trigger
  mmc_spi host driver
  MMC core learns about SPI
  MMC/SD card driver learns SPI
  MMC headers learn about SPI
  ...
parents d2c75f2f 019a5f56

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -2561,12 +2561,18 @@ L: linux-kernel@vger.kernel.org 
W:	http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html

S:	Maintained



MULTIMEDIA CARD (MMC) AND SECURE DIGITAL (SD) SUBSYSTEM

MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM

P:	Pierre Ossman

M:	drzeus-mmc@drzeus.cx

L:	linux-kernel@vger.kernel.org

S:	Maintained



MULTIMEDIA CARD (MMC) ETC. OVER SPI

P:	David Brownell

M:	dbrownell@users.sourceforge.net

L:	linux-kernel@vger.kernel.org

S:	Odd fixes



MULTISOUND SOUND DRIVER

P:	Andrew Veliath

M:	andrewtv@usa.net

arch/arm/mach-imx/mx1ads.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static struct platform_device *devices[] __initdata = { 
};



#ifdef CONFIG_MMC_IMX

static int mx1ads_mmc_card_present(void)

static int mx1ads_mmc_card_present(struct device *dev)

{

	/* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */

	return (SSR(1) & (1 << 20) ? 0 : 1);

drivers/mmc/card/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -32,3 +32,10 @@ config MMC_BLOCK_BOUNCE 


	  If unsure, say Y here.



config SDIO_UART

	tristate "SDIO UART/GPS class support"

	depends on MMC

	help

	  SDIO function driver for SDIO cards that implements the UART

	  class, as well as the GPS class which appears like a UART.

drivers/mmc/card/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -9,3 +9,5 @@ endif 
obj-$(CONFIG_MMC_BLOCK)		+= mmc_block.o

mmc_block-objs			:= block.o queue.o



obj-$(CONFIG_SDIO_UART)		+= sdio_uart.o

drivers/mmc/card/block.c

+18 −12
Original line number Diff line number Diff line
@@ -151,17 +151,19 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card) 


	cmd.opcode = MMC_APP_CMD;

	cmd.arg = card->rca << 16;

	cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;

	cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;



	err = mmc_wait_for_cmd(card->host, &cmd, 0);

	if ((err != MMC_ERR_NONE) || !(cmd.resp[0] & R1_APP_CMD))

	if (err)

		return (u32)-1;

	if (!mmc_host_is_spi(card->host) && !(cmd.resp[0] & R1_APP_CMD))

		return (u32)-1;



	memset(&cmd, 0, sizeof(struct mmc_command));



	cmd.opcode = SD_APP_SEND_NUM_WR_BLKS;

	cmd.arg = 0;

	cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;

	cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;



	memset(&data, 0, sizeof(struct mmc_data));
@@ -192,7 +194,7 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card) 


	mmc_wait_for_req(card->host, &mrq);



	if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE)

	if (cmd.error || data.error)

		return (u32)-1;



	blocks = ntohl(blocks);
@@ -220,17 +222,15 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
		brq.cmd.arg = req->sector;

		if (!mmc_card_blockaddr(card))

			brq.cmd.arg <<= 9;

		brq.cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;

		brq.cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;

		brq.data.blksz = 1 << md->block_bits;

		brq.stop.opcode = MMC_STOP_TRANSMISSION;

		brq.stop.arg = 0;

		brq.stop.flags = MMC_RSP_R1B | MMC_CMD_AC;

		brq.stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;

		brq.data.blocks = req->nr_sectors >> (md->block_bits - 9);

		if (brq.data.blocks > card->host->max_blk_count)

			brq.data.blocks = card->host->max_blk_count;



		mmc_set_data_timeout(&brq.data, card, rq_data_dir(req) != READ);



		/*

		 * If the host doesn't support multiple block writes, force

		 * block writes to single block. SD cards are excepted from
@@ -243,7 +243,11 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
			brq.data.blocks = 1;



		if (brq.data.blocks > 1) {

			brq.data.flags |= MMC_DATA_MULTI;

			/* SPI multiblock writes terminate using a special

			 * token, not a STOP_TRANSMISSION request.

			 */

			if (!mmc_host_is_spi(card->host)

					|| rq_data_dir(req) == READ)

				brq.mrq.stop = &brq.stop;

			readcmd = MMC_READ_MULTIPLE_BLOCK;

			writecmd = MMC_WRITE_MULTIPLE_BLOCK;
@@ -261,6 +265,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
			brq.data.flags |= MMC_DATA_WRITE;

		}



		mmc_set_data_timeout(&brq.data, card);



		brq.data.sg = mq->sg;

		brq.data.sg_len = mmc_queue_map_sg(mq);
@@ -302,7 +308,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
			goto cmd_err;

		}



		if (rq_data_dir(req) != READ) {

		if (!mmc_host_is_spi(card->host) && rq_data_dir(req) != READ) {

			do {

				int err;
@@ -510,7 +516,7 @@ mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card) 
	mmc_claim_host(card->host);

	cmd.opcode = MMC_SET_BLOCKLEN;

	cmd.arg = 1 << md->block_bits;

	cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;

	cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;

	err = mmc_wait_for_cmd(card->host, &cmd, 5);

	mmc_release_host(card->host);

CRA Git | Maintained and supported by SUSTech CRA and CCSE