Commit 03d80e04 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

Revert "mmc: renesas_sdhi: workaround a regression when reinserting SD cards" 



This reverts commit db1af1e9. It was
only a workaround to hide a regression. We now have proper fixes.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20201106072549.1495-4-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 24ce2d7b

drivers/mmc/host/renesas_sdhi_core.c

+0 −13
Original line number Diff line number Diff line
@@ -572,17 +572,6 @@ static void renesas_sdhi_reset(struct tmio_mmc_host *host) 
					     TMIO_MASK_INIT_RCAR2);

}



/*

 * This is a temporary workaround! This driver used 'hw_reset' wrongly and the

 * fix for that showed a regression. So, we mimic the old behaviour until the

 * proper solution is found.

 */

static void renesas_sdhi_hw_reset(struct mmc_host *mmc)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);

	renesas_sdhi_reset(host);

}



#define SH_MOBILE_SDHI_MIN_TAP_ROW 3



static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host)
@@ -1020,8 +1009,6 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
		if (of_data && of_data->scc_offset) {

			priv->scc_ctl = host->ctl + of_data->scc_offset;

			host->reset = renesas_sdhi_reset;

			host->ops.hw_reset = renesas_sdhi_hw_reset;

			host->mmc->caps |= MMC_CAP_HW_RESET;

		}

	}