| Message ID | 1468547691-4525-2-git-send-email-jh80.chung@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
在 2016/7/15 9:54, Jaehoon Chung 写道: > In dw_mmc.c, it's enabled by default. > It doesn't need to set MMC_CAP_ERASE in rockchip anymore. Nice to hear that. Acked-by: Shawn Lin <shawn.lin@rock-chips.com> > > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> > --- > drivers/mmc/host/dw_mmc-rockchip.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c > index d3cf1f1..25eae35 100644 > --- a/drivers/mmc/host/dw_mmc-rockchip.c > +++ b/drivers/mmc/host/dw_mmc-rockchip.c > @@ -294,10 +294,10 @@ static int dw_mci_rockchip_init(struct dw_mci *host) > > /* Common capabilities of RK3288 SoC */ > static unsigned long dw_mci_rk3288_dwmmc_caps[4] = { > - MMC_CAP_ERASE | MMC_CAP_CMD23, > - MMC_CAP_ERASE | MMC_CAP_CMD23, > - MMC_CAP_ERASE | MMC_CAP_CMD23, > - MMC_CAP_ERASE | MMC_CAP_CMD23, > + MMC_CAP_CMD23, > + MMC_CAP_CMD23, > + MMC_CAP_CMD23, > + MMC_CAP_CMD23, > }; > > static const struct dw_mci_drv_data rk2928_drv_data = { >
On 15 July 2016 at 03:54, Jaehoon Chung <jh80.chung@samsung.com> wrote: > In dw_mmc.c, it's enabled by default. > It doesn't need to set MMC_CAP_ERASE in rockchip anymore. > > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> As we are close to the merge window, I picked this up directly instead of you having to send me a PR. Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/dw_mmc-rockchip.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c > index d3cf1f1..25eae35 100644 > --- a/drivers/mmc/host/dw_mmc-rockchip.c > +++ b/drivers/mmc/host/dw_mmc-rockchip.c > @@ -294,10 +294,10 @@ static int dw_mci_rockchip_init(struct dw_mci *host) > > /* Common capabilities of RK3288 SoC */ > static unsigned long dw_mci_rk3288_dwmmc_caps[4] = { > - MMC_CAP_ERASE | MMC_CAP_CMD23, > - MMC_CAP_ERASE | MMC_CAP_CMD23, > - MMC_CAP_ERASE | MMC_CAP_CMD23, > - MMC_CAP_ERASE | MMC_CAP_CMD23, > + MMC_CAP_CMD23, > + MMC_CAP_CMD23, > + MMC_CAP_CMD23, > + MMC_CAP_CMD23, > }; > > static const struct dw_mci_drv_data rk2928_drv_data = { > -- > 1.9.1 > -- 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-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index d3cf1f1..25eae35 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -294,10 +294,10 @@ static int dw_mci_rockchip_init(struct dw_mci *host) /* Common capabilities of RK3288 SoC */ static unsigned long dw_mci_rk3288_dwmmc_caps[4] = { - MMC_CAP_ERASE | MMC_CAP_CMD23, - MMC_CAP_ERASE | MMC_CAP_CMD23, - MMC_CAP_ERASE | MMC_CAP_CMD23, - MMC_CAP_ERASE | MMC_CAP_CMD23, + MMC_CAP_CMD23, + MMC_CAP_CMD23, + MMC_CAP_CMD23, + MMC_CAP_CMD23, }; static const struct dw_mci_drv_data rk2928_drv_data = {
In dw_mmc.c, it's enabled by default. It doesn't need to set MMC_CAP_ERASE in rockchip anymore. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> --- drivers/mmc/host/dw_mmc-rockchip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)