Skip to content

Commit

Permalink
Merge tag 'mmc-v4.8-rc7' of git://git.linaro.org/people/ulf.hansson/mmc
Browse files Browse the repository at this point in the history
Pull MMC fix from Ulf Hansson:
 "MMC host:

   - dw_mmc: fix the spamming log message"

* tag 'mmc-v4.8-rc7' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: dw_mmc: fix the spamming log message
  • Loading branch information
torvalds committed Sep 23, 2016
2 parents e47f2e5 + 005d675 commit e7c5412
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/mmc/host/dw_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1112,11 +1112,12 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)

div = (host->bus_hz != clock) ? DIV_ROUND_UP(div, 2) : 0;

dev_info(&slot->mmc->class_dev,
"Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n",
slot->id, host->bus_hz, clock,
div ? ((host->bus_hz / div) >> 1) :
host->bus_hz, div);
if (clock != slot->__clk_old || force_clkinit)
dev_info(&slot->mmc->class_dev,
"Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n",
slot->id, host->bus_hz, clock,
div ? ((host->bus_hz / div) >> 1) :
host->bus_hz, div);

/* disable clock */
mci_writel(host, CLKENA, 0);
Expand All @@ -1139,6 +1140,9 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)

/* inform CIU */
mci_send_cmd(slot, sdmmc_cmd_bits, 0);

/* keep the last clock value that was requested from core */
slot->__clk_old = clock;
}

host->current_speed = clock;
Expand Down
3 changes: 3 additions & 0 deletions drivers/mmc/host/dw_mmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ extern int dw_mci_resume(struct dw_mci *host);
* @queue_node: List node for placing this node in the @queue list of
* &struct dw_mci.
* @clock: Clock rate configured by set_ios(). Protected by host->lock.
* @__clk_old: The last clock value that was requested from core.
* Keeping track of this helps us to avoid spamming the console.
* @flags: Random state bits associated with the slot.
* @id: Number of this slot.
* @sdio_id: Number of this slot in the SDIO interrupt registers.
Expand All @@ -263,6 +265,7 @@ struct dw_mci_slot {
struct list_head queue_node;

unsigned int clock;
unsigned int __clk_old;

unsigned long flags;
#define DW_MMC_CARD_PRESENT 0
Expand Down

0 comments on commit e7c5412

Please sign in to comment.