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

Commit 26375b5c authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Ulf Hansson
Browse files

mmc: dw_mmc: Slot quirk "disable-wp" is deprecated. 



Slot quirks "disable-wp" is deprecated.
Instead, use the host quirk "disable-wp".
(Because the slot-node is removed in dt-file.)

Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Tested-by: default avatarSachin Kamat <sachin.kamat@samsung.com>
Acked-by: default avatarSeungwon Jeon <tgih.jun@samsung.com>
Reviewed-by: default avatarDoug Anderson <dianders@chromium.org>
Tested-by: default avatarDoug Anderson <dianders@chromium.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 7878289b

drivers/mmc/host/dw_mmc.c

+9 −2
Original line number Diff line number Diff line
@@ -996,7 +996,8 @@ static int dw_mci_get_ro(struct mmc_host *mmc) 
	int gpio_ro = mmc_gpio_get_ro(mmc);



	/* Use platform get_ro function, else try on board write protect */

	if (slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT)

	if ((slot->quirks & DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT) ||

			(slot->host->quirks & DW_MCI_QUIRK_NO_WRITE_PROTECT))

		read_only = 0;

	else if (!IS_ERR_VALUE(gpio_ro))

		read_only = gpio_ro;
@@ -2014,8 +2015,11 @@ static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot) 


	/* get quirks */

	for (idx = 0; idx < ARRAY_SIZE(of_slot_quirks); idx++)

		if (of_get_property(np, of_slot_quirks[idx].quirk, NULL))

		if (of_get_property(np, of_slot_quirks[idx].quirk, NULL)) {

			dev_warn(dev, "Slot quirk %s is deprecated\n",

					of_slot_quirks[idx].quirk);

			quirks |= of_slot_quirks[idx].id;

		}



	return quirks;

}
@@ -2279,6 +2283,9 @@ static struct dw_mci_of_quirks { 
	{

		.quirk	= "broken-cd",

		.id	= DW_MCI_QUIRK_BROKEN_CARD_DETECTION,

	}, {

		.quirk	= "disable-wp",

		.id	= DW_MCI_QUIRK_NO_WRITE_PROTECT,

	},

};

include/linux/mmc/dw_mmc.h

+2 −0
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ struct dw_mci_dma_ops { 
#define DW_MCI_QUIRK_HIGHSPEED			BIT(2)

/* Unreliable card detection */

#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION	BIT(3)

/* No write protect */

#define DW_MCI_QUIRK_NO_WRITE_PROTECT		BIT(4)



/* Slot level quirks */

/* This slot has no write protect */