| Message ID | 1406784907-26349-2-git-send-email-jh80.chung@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Jaehoon On Wed, Jul 30, 2014 at 10:35 PM, Jaehoon Chung <jh80.chung@samsung.com> wrote: > 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: Jaehoon Chung <jh80.chung@samsung.com> > Tested-by: Sachin Kamat <sachin.kamat@samsung.com> > Acked-by: Seungwon Jeon <tgih.jun@samsung.com> > --- > drivers/mmc/host/dw_mmc.c | 11 +++++++++-- > include/linux/mmc/dw_mmc.h | 2 ++ > 2 files changed, 11 insertions(+), 2 deletions(-) Thanks for taking my suggestion and making it backward compatible. This looks great to me. It tested this in both the backward compatible way (with the warning) and the non-backward compatible way. I think we should land and patch #2 ASAP and then we can land the rest of the series as SoC maintainers see fit. Reviewed-by: Doug Anderson <dianders@chromium.org> Tested-by: Doug Anderson <dianders@chromium.org>
On 08/01/14 01:02, Doug Anderson wrote: > Jaehoon > > On Wed, Jul 30, 2014 at 10:35 PM, Jaehoon Chung<jh80.chung@samsung.com> wrote: >> 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: Jaehoon Chung<jh80.chung@samsung.com> >> Tested-by: Sachin Kamat<sachin.kamat@samsung.com> >> Acked-by: Seungwon Jeon<tgih.jun@samsung.com> >> --- >> drivers/mmc/host/dw_mmc.c | 11 +++++++++-- >> include/linux/mmc/dw_mmc.h | 2 ++ >> 2 files changed, 11 insertions(+), 2 deletions(-) > > Thanks for taking my suggestion and making it backward compatible. > This looks great to me. It tested this in both the backward > compatible way (with the warning) and the non-backward compatible way. > I think we should land and patch #2 ASAP and then we can land the rest > of the series as SoC maintainers see fit. > Yes, right if we don't want to see useless merge conflicts... - Kukjin > Reviewed-by: Doug Anderson<dianders@chromium.org> > Tested-by: Doug Anderson<dianders@chromium.org>
On 08/01/14 01:02, Doug Anderson wrote: > Jaehoon > > On Wed, Jul 30, 2014 at 10:35 PM, Jaehoon Chung<jh80.chung@samsung.com> wrote: >> 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: Jaehoon Chung<jh80.chung@samsung.com> >> Tested-by: Sachin Kamat<sachin.kamat@samsung.com> >> Acked-by: Seungwon Jeon<tgih.jun@samsung.com> >> --- >> drivers/mmc/host/dw_mmc.c | 11 +++++++++-- >> include/linux/mmc/dw_mmc.h | 2 ++ >> 2 files changed, 11 insertions(+), 2 deletions(-) > > Thanks for taking my suggestion and making it backward compatible. > This looks great to me. It tested this in both the backward > compatible way (with the warning) and the non-backward compatible way. > I think we should land and patch #2 ASAP and then we can land the rest > of the series as SoC maintainers see fit. > Yes, right if we don't want to see useless merge conflicts... When I sent ack on exynos stuff, there was no conflict with my tree but happens it now. - Kukjin > Reviewed-by: Doug Anderson<dianders@chromium.org> > Tested-by: Doug Anderson<dianders@chromium.org>
Hi, All. It seems too late that this patch-set is merged into linux-3.16. Also there are some conflicts in device-tree. (I will remove the conflicts) So if everybody is ok, I will rebase on linux-next after released linux-3.16. At that time, i will send this patch-set to stable kernel, too. how about? And I want to know who can apply this patch-set(#3~#5). Best Regards, Jaehoon Chung On 08/01/2014 03:36 AM, Kukjin Kim wrote: > On 08/01/14 01:02, Doug Anderson wrote: >> Jaehoon >> >> On Wed, Jul 30, 2014 at 10:35 PM, Jaehoon Chung<jh80.chung@samsung.com> wrote: >>> 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: Jaehoon Chung<jh80.chung@samsung.com> >>> Tested-by: Sachin Kamat<sachin.kamat@samsung.com> >>> Acked-by: Seungwon Jeon<tgih.jun@samsung.com> >>> --- >>> drivers/mmc/host/dw_mmc.c | 11 +++++++++-- >>> include/linux/mmc/dw_mmc.h | 2 ++ >>> 2 files changed, 11 insertions(+), 2 deletions(-) >> >> Thanks for taking my suggestion and making it backward compatible. >> This looks great to me. It tested this in both the backward >> compatible way (with the warning) and the non-backward compatible way. >> I think we should land and patch #2 ASAP and then we can land the rest >> of the series as SoC maintainers see fit. >> > Yes, right if we don't want to see useless merge conflicts... > > When I sent ack on exynos stuff, there was no conflict with my tree but happens it now. > > - Kukjin > > >> Reviewed-by: Doug Anderson<dianders@chromium.org> >> Tested-by: Doug Anderson<dianders@chromium.org> >
Am Freitag, 1. August 2014, 13:26:43 schrieb Jaehoon Chung: > Hi, All. > > It seems too late that this patch-set is merged into linux-3.16. > Also there are some conflicts in device-tree. (I will remove the conflicts) > So if everybody is ok, I will rebase on linux-next after released > linux-3.16. At that time, i will send this patch-set to stable kernel, too. > how about? > And I want to know who can apply this patch-set(#3~#5). I guess each SoC maintainer could take the changes to their work-area, once the core changes have landed in the mmc tree. So I would take the Rockchip patch, Kukjin the Exynos one and Dinh the socfpga patch. Heiko > > Best Regards, > Jaehoon Chung > > On 08/01/2014 03:36 AM, Kukjin Kim wrote: > > On 08/01/14 01:02, Doug Anderson wrote: > >> Jaehoon > >> > >> On Wed, Jul 30, 2014 at 10:35 PM, Jaehoon Chung<jh80.chung@samsung.com> wrote: > >>> 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: Jaehoon Chung<jh80.chung@samsung.com> > >>> Tested-by: Sachin Kamat<sachin.kamat@samsung.com> > >>> Acked-by: Seungwon Jeon<tgih.jun@samsung.com> > >>> --- > >>> > >>> drivers/mmc/host/dw_mmc.c | 11 +++++++++-- > >>> include/linux/mmc/dw_mmc.h | 2 ++ > >>> 2 files changed, 11 insertions(+), 2 deletions(-) > >> > >> Thanks for taking my suggestion and making it backward compatible. > >> This looks great to me. It tested this in both the backward > >> compatible way (with the warning) and the non-backward compatible way. > >> I think we should land and patch #2 ASAP and then we can land the rest > >> of the series as SoC maintainers see fit. > > > > Yes, right if we don't want to see useless merge conflicts... > > > > When I sent ack on exynos stuff, there was no conflict with my tree but > > happens it now. > > > > - Kukjin > > > >> Reviewed-by: Doug Anderson<dianders@chromium.org> > >> Tested-by: Doug Anderson<dianders@chromium.org>
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 1ac227c..47b52cc 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -997,7 +997,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; @@ -2021,8 +2022,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; } @@ -2238,6 +2242,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, }, }; diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index babaea9..29ce014 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -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 */