mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mmc: dw_mmc: Remove DW_MCI_QUIRK_NO_WRITE_PROTECT 

The original quirk was added in the change 'mmc: dw_mmc: add quirk to
indicate missing write protect line'.  The original quirk was added at
a controller level even though each slot has its own write protect (so
the quirk should be at the slot level).  A recent change (mmc: dw_mmc:
Add "disable-wp" device tree property) added a slot-level quirk and
support for the quirk directly to dw_mmc.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Will Newton <will.newton@imgtec.com>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Doug Anderson 2013-01-11 17:03:54 +00:00 committed by Chris Ball
parent 55a6ceb2d5
commit 9640639b09
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/host/dw_mmc.c
View File

@ -831,13 +831,7 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
struct dw_mci_board *brd = slot->host->pdata;
/* Use platform get_ro function, else try on board write protect */
/*
* NOTE: DW_MCI_QUIRK_NO_WRITE_PROTECT will be removed in a future
* patch in the series once reference to it is removed.
*/
if ((brd->quirks & DW_MCI_QUIRK_NO_WRITE_PROTECT) ||
(slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT))
if (slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT)
read_only = 0;
else if (brd->get_ro)
read_only = brd->get_ro(slot->id);

7
include/linux/mmc/dw_mmc.h
View File

@ -210,13 +210,6 @@ struct dw_mci_dma_ops {
/* Unreliable card detection */
#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3)
/* Write Protect detection not available */
/*
* NOTE: DW_MCI_QUIRK_NO_WRITE_PROTECT will be removed in a future
* patch in the series once reference to it is removed.
*/
#define DW_MCI_QUIRK_NO_WRITE_PROTECT BIT(4)
/* Slot level quirks */
/* This slot has no write protect */
#define DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT BIT(0)