mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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:
parent
55a6ceb2d5
commit
9640639b09
2 changed files with 1 additions and 14 deletions
|
@ -831,13 +831,7 @@ static int dw_mci_get_ro(struct mmc_host *mmc)
|
||||||
struct dw_mci_board *brd = slot->host->pdata;
|
struct dw_mci_board *brd = slot->host->pdata;
|
||||||
|
|
||||||
/* Use platform get_ro function, else try on board write protect */
|
/* Use platform get_ro function, else try on board write protect */
|
||||||
|
if (slot->quirks & DW_MCI_SLOT_QUIRK_NO_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))
|
|
||||||
read_only = 0;
|
read_only = 0;
|
||||||
else if (brd->get_ro)
|
else if (brd->get_ro)
|
||||||
read_only = brd->get_ro(slot->id);
|
read_only = brd->get_ro(slot->id);
|
||||||
|
|
|
@ -210,13 +210,6 @@ struct dw_mci_dma_ops {
|
||||||
/* Unreliable card detection */
|
/* Unreliable card detection */
|
||||||
#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3)
|
#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 */
|
/* Slot level quirks */
|
||||||
/* This slot has no write protect */
|
/* This slot has no write protect */
|
||||||
#define DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT BIT(0)
|
#define DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT BIT(0)
|
||||||
|
|
Loading…
Reference in a new issue