Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92bf3d09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

Pull MMC changes from Chris Ball
 - at91-mci: This driver will be replaced by atmel-mci in 3.7.
 - atmel-mci: Add support for old at91-mci hardware.
 - dw_mmc: Allow multiple controllers; this previously caused
   corruption.
 - imxmmc: Remove this driver, replaced by mxcmmc.
 - mmci: Add device tree support.
 - omap: Allow multiple controllers.
 - omap_hsmmc: Auto CMD12, DDR support.
 - tegra: Support SD 3.0 spec.

Fix up the usual trivial conflicts in feature-removal-schedule.txt

* tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (38 commits)
  mmc: at91-mci: this driver is now deprecated
  mmc: omap_hsmmc: pass IRQF_ONESHOT to request_threaded_irq
  mmc: block: Allow disabling 512B sector size emulation
  mmc: atmel-mci: add debug logs
  mmc: atmel-mci: add support for version lower than v2xx
  mmc: atmel-mci: change the state machine for compatibility with old IP
  mmc: atmel-mci: the r/w proof capability lack was not well managed
  mmc: dw_mmc: Fixed sdio interrupt mask bit setting bug
  mmc: omap: convert to module_platform_driver
  mmc: omap: make it behave well as a module
  mmc: omap: convert to per instance workqueue
  mmc: core: Remove dead code
  mmc: card: Avoid null pointer dereference
  mmc: core: Prevent eMMC VCC supply to be cut from late init
  mmc: dw_mmc: make multiple instances of dw_mci_card_workqueue
  mmc: queue: remove redundant memsets
  mmc: queue: rename mmc_request function
  mmc: core: skip card initialization if power class selection fails
  mmc: core: fix the signaling 1.8V for HS200
  mmc: core: fix the decision of HS200/DDR card-type
  ...
parents 603d6637 0caaa953

Documentation/devicetree/bindings/mmc/mmci.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* ARM PrimeCell MultiMedia Card Interface (MMCI) PL180/1



The ARM PrimeCell MMCI PL180 and PL181 provides and interface for

reading and writing to MultiMedia and SD cards alike.



Required properties:

- compatible             : contains "arm,pl18x", "arm,primecell".

- reg                    : contains pl18x registers and length.

- interrupts             : contains the device IRQ(s).

- arm,primecell-periphid : contains the PrimeCell Peripheral ID.



Optional properties:

- wp-gpios               : contains any write protect (ro) gpios

- cd-gpios               : contains any card detection gpios

- cd-inverted            : indicates whether the cd gpio is inverted

- max-frequency          : contains the maximum operating frequency

- bus-width              : number of data lines, can be <1>, <4>, or <8>

- mmc-cap-mmc-highspeed  : indicates whether MMC is high speed capable

- mmc-cap-sd-highspeed   : indicates whether SD is high speed capable

Documentation/feature-removal-schedule.txt

+11 −0
Original line number Diff line number Diff line
@@ -595,3 +595,14 @@ Why: KVM tracepoints provide mostly equivalent information in a much more 
        flexible fashion.



----------------------------



What:	at91-mci driver ("CONFIG_MMC_AT91")

When:	3.7

Why:	There are two mci drivers: at91-mci and atmel-mci. The PDC support

	was added to atmel-mci as a first step to support more chips.

	Then at91-mci was kept only for old IP versions (on at91rm9200 and

	at91sam9261). The support of these IP versions has just been added

	to atmel-mci, so atmel-mci can be used for all chips.

Who:	Ludovic Desroches <ludovic.desroches@atmel.com>



----------------------------

drivers/mmc/card/block.c

+19 −3
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev, 
	md = mmc_blk_get(bdev->bd_disk);

	if (!md) {

		err = -EINVAL;

		goto cmd_done;

		goto cmd_err;

	}



	card = md->queue.card;
@@ -483,6 +483,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev, 


cmd_done:

	mmc_blk_put(md);

cmd_err:

	kfree(idata->buf);

	kfree(idata);

	return err;
@@ -1283,7 +1284,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 
	int ret = 1, disable_multi = 0, retry = 0, type;

	enum mmc_blk_status status;

	struct mmc_queue_req *mq_rq;

	struct request *req;

	struct request *req = rqc;

	struct mmc_async_req *areq;



	if (!rqc && !mq->mqrq_prev->req)
@@ -1291,6 +1292,16 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 


	do {

		if (rqc) {

			/*

			 * When 4KB native sector is enabled, only 8 blocks

			 * multiple read or write is allowed

			 */

			if ((brq->data.blocks & 0x07) &&

			    (card->ext_csd.data_sector_size == 4096)) {

				pr_err("%s: Transfer size is not 4KB sector size aligned\n",

					req->rq_disk->disk_name);

				goto cmd_abort;

			}

			mmc_blk_rw_rq_prep(mq->mqrq_cur, card, 0, mq);

			areq = &mq->mqrq_cur->mmc_active;

		} else
@@ -1538,7 +1549,12 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, 
	snprintf(md->disk->disk_name, sizeof(md->disk->disk_name),

		 "mmcblk%d%s", md->name_idx, subname ? subname : "");



	if (mmc_card_mmc(card))

		blk_queue_logical_block_size(md->queue.queue,

					     card->ext_csd.data_sector_size);

	else

		blk_queue_logical_block_size(md->queue.queue, 512);



	set_capacity(md->disk, size);



	if (mmc_host_cmd23(card->host)) {

drivers/mmc/card/queue.c

+2 −4
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int mmc_queue_thread(void *d) 
 * on any queue on this host, and attempt to issue it.  This may

 * not be the queue we were asked to process.

 */

static void mmc_request(struct request_queue *q)

static void mmc_request_fn(struct request_queue *q)

{

	struct mmc_queue *mq = q->queuedata;

	struct request *req;
@@ -171,12 +171,10 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, 
		limit = *mmc_dev(host)->dma_mask;



	mq->card = card;

	mq->queue = blk_init_queue(mmc_request, lock);

	mq->queue = blk_init_queue(mmc_request_fn, lock);

	if (!mq->queue)

		return -ENOMEM;



	memset(&mq->mqrq_cur, 0, sizeof(mq->mqrq_cur));

	memset(&mq->mqrq_prev, 0, sizeof(mq->mqrq_prev));

	mq->mqrq_cur = mqrq_cur;

	mq->mqrq_prev = mqrq_prev;

	mq->queue->queuedata = mq;

drivers/mmc/core/bus.c

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ static int mmc_bus_remove(struct device *dev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int mmc_bus_suspend(struct device *dev)

{

	struct mmc_driver *drv = to_mmc_driver(dev->driver);
@@ -143,6 +144,7 @@ static int mmc_bus_resume(struct device *dev) 
		ret = drv->resume(card);

	return ret;

}

#endif



#ifdef CONFIG_PM_RUNTIME