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

Commit 9640639b authored by Doug Anderson's avatar Doug Anderson Committed by Chris Ball
Browse files

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: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarWill Newton <will.newton@imgtec.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 55a6ceb2

drivers/mmc/host/dw_mmc.c

+1 −7
Original line number Diff line number Diff line
@@ -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);

include/linux/mmc/dw_mmc.h

+0 −7
Original line number Diff line number Diff line
@@ -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)