| Message ID | 1357923834-31641-5-git-send-email-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 11, 2013 at 5:03 PM, Doug Anderson <dianders@chromium.org> wrote: > 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> > --- > Changes in v4: > - New for this version; addresses comments from Olof Johansson about > the fact that we shouldn't have both a slot and controller level > quirk for the same thing. > > drivers/mmc/host/dw_mmc.c | 8 +------- > include/linux/mmc/dw_mmc.h | 7 ------- > 2 files changed, 1 insertions(+), 14 deletions(-) Hi Doug, These changes look ok to me. I don't know if patch 4 made it to the list, I only got a copy via the cc and the only archive I can find of linux-mmc (gmane) seems to be missing a lot of messages besides this one. So for the dw_mmc parts: Acked-by: Will Newton <will.newton@imgtec.com> -- 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
Will, On Mon, Jan 14, 2013 at 2:47 AM, Will Newton <will.newton@gmail.com> wrote: > These changes look ok to me. I don't know if patch 4 made it to the > list, I only got a copy via the cc and the only archive I can find of > linux-mmc (gmane) seems to be missing a lot of messages besides this > one. It seems to have made it onto patchwork, in any case. Here's the link: https://patchwork.kernel.org/patch/1966771/ The whole bundle of all 5 patches at v4 is here: http://patchwork.kernel.org/bundle/dianders/mmc_wp/ > So for the dw_mmc parts: > > Acked-by: Will Newton <will.newton@imgtec.com> Thank you for your review and your ack. :) -Doug -- 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
On Fri, Jan 11, 2013 at 09:03:54AM -0800, Doug Anderson wrote: > 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: Olof Johansson <olof@lixom.net> -- 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
Hi Doug, On Mon, Jan 14 2013, Doug Anderson wrote: > The whole bundle of all 5 patches at v4 is here: > http://patchwork.kernel.org/bundle/dianders/mmc_wp/ Thanks, I've pushed all 5 to mmc-next for 3.9 now with the collected ACKs. - Chris.
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index df62079..60063cc 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -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); diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index de61de5..198f0fa 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -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)
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> --- Changes in v4: - New for this version; addresses comments from Olof Johansson about the fact that we shouldn't have both a slot and controller level quirk for the same thing. drivers/mmc/host/dw_mmc.c | 8 +------- include/linux/mmc/dw_mmc.h | 7 ------- 2 files changed, 1 insertions(+), 14 deletions(-)