Commit 500156a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-mmc 

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Pass -DDEBUG on compiler command line if MMC_DEBUG selected
  [MMC] Add OMAP MMC host driver
parents 5b67e8dd c6563178

drivers/mmc/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -60,6 +60,17 @@ config MMC_SDHCI 


	  If unsure, say N.



config MMC_OMAP

	tristate "TI OMAP Multimedia Card Interface support"

	depends on ARCH_OMAP && MMC

	select TPS65010 if MACH_OMAP_H2

	help

	  This selects the TI OMAP Multimedia card Interface.

	  If you have an OMAP board with a Multimedia Card slot,

	  say Y or M here.



	  If unsure, say N.



config MMC_WBSD

	tristate "Winbond W83L51xD SD/MMC Card Interface support"

	depends on MMC && ISA_DMA_API

drivers/mmc/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -20,5 +20,10 @@ obj-$(CONFIG_MMC_PXA) += pxamci.o 
obj-$(CONFIG_MMC_SDHCI)		+= sdhci.o

obj-$(CONFIG_MMC_WBSD)		+= wbsd.o

obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o

obj-$(CONFIG_MMC_OMAP)		+= omap.o



mmc_core-y := mmc.o mmc_queue.o mmc_sysfs.o



ifeq ($(CONFIG_MMC_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

endif

drivers/mmc/au1xmmc.c

+9 −10
Original line number Diff line number Diff line
@@ -56,12 +56,11 @@ 
#define DRIVER_NAME "au1xxx-mmc"



/* Set this to enable special debugging macros */

/* #define MMC_DEBUG */



#ifdef MMC_DEBUG

#define DEBUG(fmt, idx, args...) printk("au1xx(%d): DEBUG: " fmt, idx, ##args)

#ifdef DEBUG

#define DBG(fmt, idx, args...) printk("au1xx(%d): DEBUG: " fmt, idx, ##args)

#else

#define DEBUG(fmt, idx, args...)

#define DBG(fmt, idx, args...)

#endif



const struct {
@@ -424,18 +423,18 @@ static void au1xmmc_receive_pio(struct au1xmmc_host *host) 
			break;



		if (status & SD_STATUS_RC) {

			DEBUG("RX CRC Error [%d + %d].\n", host->id,

			DBG("RX CRC Error [%d + %d].\n", host->id,

					host->pio.len, count);

			break;

		}



		if (status & SD_STATUS_RO) {

			DEBUG("RX Overrun [%d + %d]\n", host->id,

			DBG("RX Overrun [%d + %d]\n", host->id,

					host->pio.len, count);

			break;

		}

		else if (status & SD_STATUS_RU) {

			DEBUG("RX Underrun [%d + %d]\n", host->id,

			DBG("RX Underrun [%d + %d]\n", host->id,

					host->pio.len,	count);

			break;

		}
@@ -721,7 +720,7 @@ static void au1xmmc_set_ios(struct mmc_host* mmc, struct mmc_ios* ios) 
{

	struct au1xmmc_host *host = mmc_priv(mmc);



	DEBUG("set_ios (power=%u, clock=%uHz, vdd=%u, mode=%u)\n",

	DBG("set_ios (power=%u, clock=%uHz, vdd=%u, mode=%u)\n",

	      host->id, ios->power_mode, ios->clock, ios->vdd,

	      ios->bus_mode);
@@ -810,7 +809,7 @@ static irqreturn_t au1xmmc_irq(int irq, void *dev_id, struct pt_regs *regs) 
				au1xmmc_receive_pio(host);

		}

		else if (status & 0x203FBC70) {

			DEBUG("Unhandled status %8.8x\n", host->id, status);

			DBG("Unhandled status %8.8x\n", host->id, status);

			handled = 0;

		}
@@ -839,7 +838,7 @@ static void au1xmmc_poll_event(unsigned long arg) 


	if (host->mrq != NULL) {

		u32 status = au_readl(HOST_STATUS(host));

		DEBUG("PENDING - %8.8x\n", host->id, status);

		DBG("PENDING - %8.8x\n", host->id, status);

	}



	mod_timer(&host->timer, jiffies + AU1XMMC_DETECT_TIMEOUT);

drivers/mmc/mmc.c

+7 −12
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ 


#include "mmc.h"



#ifdef CONFIG_MMC_DEBUG

#define DBG(x...)	printk(KERN_DEBUG x)

#else

#define DBG(x...)	do { } while (0)

#endif



#define CMD_RETRIES	3



/*
@@ -77,8 +71,9 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq) 
{

	struct mmc_command *cmd = mrq->cmd;

	int err = mrq->cmd->error;

	DBG("MMC: req done (%02x): %d: %08x %08x %08x %08x\n", cmd->opcode,

	    err, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);

	pr_debug("MMC: req done (%02x): %d: %08x %08x %08x %08x\n",

		 cmd->opcode, err, cmd->resp[0], cmd->resp[1],

		 cmd->resp[2], cmd->resp[3]);



	if (err && cmd->retries) {

		cmd->retries--;
@@ -102,7 +97,7 @@ EXPORT_SYMBOL(mmc_request_done); 
void

mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)

{

	DBG("MMC: starting cmd %02x arg %08x flags %08x\n",

	pr_debug("MMC: starting cmd %02x arg %08x flags %08x\n",

		 mrq->cmd->opcode, mrq->cmd->arg, mrq->cmd->flags);



	WARN_ON(host->card_busy == NULL);
@@ -976,7 +971,7 @@ static unsigned int mmc_calculate_clock(struct mmc_host *host) 
		if (!mmc_card_dead(card) && max_dtr > card->csd.max_dtr)

			max_dtr = card->csd.max_dtr;



	DBG("MMC: selected %d.%03dMHz transfer rate\n",

	pr_debug("MMC: selected %d.%03dMHz transfer rate\n",

		 max_dtr / 1000000, (max_dtr / 1000) % 1000);



	return max_dtr;

drivers/mmc/mmci.c

+0 −4
Original line number Diff line number Diff line
@@ -33,12 +33,8 @@ 


#define DRIVER_NAME "mmci-pl18x"



#ifdef CONFIG_MMC_DEBUG

#define DBG(host,fmt,args...)	\

	pr_debug("%s: %s: " fmt, mmc_hostname(host->mmc), __func__ , args)

#else

#define DBG(host,fmt,args...)	do { } while (0)

#endif



static unsigned int fmax = 515633;