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

Commit 93caf8e6 authored by Adrian Hunter's avatar Adrian Hunter Committed by Linus Torvalds
Browse files

omap_hsmmc: add erase capability 



Disable the data (busy) timeout for erases and set the MMC_CAP_ERASE
capability.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@nokia.com>
Acked-by: default avatarJens Axboe <axboe@kernel.dk>
Cc: Kyungmin Park <kmpark@infradead.org>
Cc: Madhusudhan Chikkature <madhu.cr@ti.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ben Gardiner <bengardiner@nanometrics.ca>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bd788c96

drivers/mmc/host/omap_hsmmc.c

+10 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/clk.h>

#include <linux/mmc/host.h>

#include <linux/mmc/core.h>

#include <linux/mmc/mmc.h>

#include <linux/io.h>

#include <linux/semaphore.h>

#include <linux/gpio.h>
@@ -78,6 +79,7 @@ 
#define INT_EN_MASK		0x307F0033

#define BWR_ENABLE		(1 << 4)

#define BRR_ENABLE		(1 << 5)

#define DTO_ENABLE		(1 << 20)

#define INIT_STREAM		(1 << 1)

#define DP_SELECT		(1 << 21)

#define DDIR			(1 << 4)
@@ -523,7 +525,8 @@ static void omap_hsmmc_stop_clock(struct omap_hsmmc_host *host) 
		dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stoped\n");

}



static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host)

static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host,

				  struct mmc_command *cmd)

{

	unsigned int irq_mask;
@@ -532,6 +535,10 @@ static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host) 
	else

		irq_mask = INT_EN_MASK;



	/* Disable timeout for erases */

	if (cmd->opcode == MMC_ERASE)

		irq_mask &= ~DTO_ENABLE;



	OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);

	OMAP_HSMMC_WRITE(host->base, ISE, irq_mask);

	OMAP_HSMMC_WRITE(host->base, IE, irq_mask);
@@ -782,7 +789,7 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd, 
		mmc_hostname(host->mmc), cmd->opcode, cmd->arg);

	host->cmd = cmd;



	omap_hsmmc_enable_irq(host);

	omap_hsmmc_enable_irq(host, cmd);



	host->response_busy = 0;

	if (cmd->flags & MMC_RSP_PRESENT) {
@@ -2107,7 +2114,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) 
	mmc->max_seg_size = mmc->max_req_size;



	mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |

		     MMC_CAP_WAIT_WHILE_BUSY;

		     MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_ERASE;



	switch (mmc_slot(host).wires) {

	case 8: