From 47b1e48e858f17a7d9d2cc57385b3a3a83d57462 Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Wed, 10 Dec 2014 19:24:11 +0800 Subject: [PATCH] mmc: rockchip: covert dsb() to dsb(sy) --- drivers/mmc/host/rk_sdmmc.c | 4 ++-- include/linux/mmc/rk_mmc.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c index 83a00a984bd5..a61fadf2b066 100755 --- a/drivers/mmc/host/rk_sdmmc.c +++ b/drivers/mmc/host/rk_sdmmc.c @@ -1684,12 +1684,12 @@ static void dw_mci_hw_reset(struct mmc_host *mmc) */ mci_writel(slot->host, PWREN, 0x0); mci_writel(slot->host, RST_N, 0x0); - dsb(); + dsb(sy); udelay(10); /* 10us for bad quality eMMc. */ mci_writel(slot->host, PWREN, 0x1); mci_writel(slot->host, RST_N, 0x1); - dsb(); + dsb(sy); usleep_range(500, 1000); /* at least 500(> 200us) */ } diff --git a/include/linux/mmc/rk_mmc.h b/include/linux/mmc/rk_mmc.h index a8127dda1f8c..1eb5d455ad88 100755 --- a/include/linux/mmc/rk_mmc.h +++ b/include/linux/mmc/rk_mmc.h @@ -293,7 +293,7 @@ struct dw_mci_board { struct block_settings *blk_settings; }; #define grf_writel(v, offset) do \ - { writel_relaxed(v, RK_GRF_VIRT + offset); dsb(); } \ + { writel_relaxed(v, RK_GRF_VIRT + offset); dsb(sy); } \ while (0) #endif /* LINUX_MMC_DW_MMC_H */ -- 2.34.1