On 15 July 2016 at 03:54, Jaehoon Chung <jh80.chung@xxxxxxxxxxx> 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@xxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
