| Message ID | 1402633867-25155-2-git-send-email-jh80.chung@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 13 June 2014 06:31, Jaehoon Chung <jh80.chung@samsung.com> wrote: > Replaced the "disable-wp" into host's quirks. > (Because the slot-node is removed at dt-file.) > > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Thanks! Applied for next. Kind regards Uffe > --- > Changelog V6/V7: > -None > Changelog V5: > - Modify comment. > Changelog V4: > - Rename Subject > "[PATCHv3 2/4] mmc: dw_mmc: use the __mmc_of_parse to parse the slot node" > - Replace the "disable-wp" into host's quirks, according to remove the slot-node at dt-file. > Changelog V3: > - Fix typo. > - Maintained the dw_mci_of_quirks(). > Changelog V2: > - None > > drivers/mmc/host/dw_mmc.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index 1ac227c..99fc939 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -2006,12 +2006,7 @@ static struct device_node *dw_mci_of_find_slot_node(struct device *dev, u8 slot) > static struct dw_mci_of_slot_quirks { > char *quirk; > int id; > -} of_slot_quirks[] = { > - { > - .quirk = "disable-wp", > - .id = DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT, > - }, > -}; > +} of_slot_quirks[] = {}; > > static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot) > { > @@ -2238,6 +2233,9 @@ static struct dw_mci_of_quirks { > { > .quirk = "broken-cd", > .id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION, > + }, { > + .quirk = "disable-wp", > + .id = DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT, > }, > }; > > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 1ac227c..99fc939 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2006,12 +2006,7 @@ static struct device_node *dw_mci_of_find_slot_node(struct device *dev, u8 slot) static struct dw_mci_of_slot_quirks { char *quirk; int id; -} of_slot_quirks[] = { - { - .quirk = "disable-wp", - .id = DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT, - }, -}; +} of_slot_quirks[] = {}; static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot) { @@ -2238,6 +2233,9 @@ static struct dw_mci_of_quirks { { .quirk = "broken-cd", .id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION, + }, { + .quirk = "disable-wp", + .id = DW_MCI_SLOT_QUIRK_NO_WRITE_PROTECT, }, };
Replaced the "disable-wp" into host's quirks. (Because the slot-node is removed at dt-file.) Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> --- Changelog V6/V7: -None Changelog V5: - Modify comment. Changelog V4: - Rename Subject "[PATCHv3 2/4] mmc: dw_mmc: use the __mmc_of_parse to parse the slot node" - Replace the "disable-wp" into host's quirks, according to remove the slot-node at dt-file. Changelog V3: - Fix typo. - Maintained the dw_mci_of_quirks(). Changelog V2: - None drivers/mmc/host/dw_mmc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)