|
@@ -102,12 +102,15 @@ static int mxs_mmc_get_cd(struct mmc_host *mmc)
|
|
|
BM_SSP_STATUS_CARD_DETECT) ^ host->cd_inverted;
|
|
|
}
|
|
|
|
|
|
-static void mxs_mmc_reset(struct mxs_mmc_host *host)
|
|
|
+static int mxs_mmc_reset(struct mxs_mmc_host *host)
|
|
|
{
|
|
|
struct mxs_ssp *ssp = &host->ssp;
|
|
|
u32 ctrl0, ctrl1;
|
|
|
+ int ret;
|
|
|
|
|
|
- stmp_reset_block(ssp->base);
|
|
|
+ ret = stmp_reset_block(ssp->base);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
|
|
|
ctrl0 = BM_SSP_CTRL0_IGNORE_CRC;
|
|
|
ctrl1 = BF_SSP(0x3, CTRL1_SSP_MODE) |
|
|
@@ -132,6 +135,7 @@ static void mxs_mmc_reset(struct mxs_mmc_host *host)
|
|
|
|
|
|
writel(ctrl0, ssp->base + HW_SSP_CTRL0);
|
|
|
writel(ctrl1, ssp->base + HW_SSP_CTRL1(ssp));
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static void mxs_mmc_start_cmd(struct mxs_mmc_host *host,
|
|
@@ -625,7 +629,11 @@ static int mxs_mmc_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
clk_prepare_enable(ssp->clk);
|
|
|
|
|
|
- mxs_mmc_reset(host);
|
|
|
+ ret = mxs_mmc_reset(host);
|
|
|
+ if (ret) {
|
|
|
+ dev_err(&pdev->dev, "Failed to reset mmc: %d\n", ret);
|
|
|
+ goto out_clk_disable;
|
|
|
+ }
|
|
|
|
|
|
ssp->dmach = dma_request_slave_channel(&pdev->dev, "rx-tx");
|
|
|
if (!ssp->dmach) {
|