Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5e4a2e4 authored by Sonic Zhang's avatar Sonic Zhang Committed by Chris Ball
Browse files

mmc: bfin_sdh: Remove redundant suspend and resume setting. 



mmc core suspend and resume functions had already called sdh_set_ios
with proper flags.

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 4ffdcf04

drivers/mmc/host/bfin_sdh.c

+0 −15
Original line number Diff line number Diff line
@@ -643,11 +643,6 @@ static int sdh_suspend(struct platform_device *dev, pm_message_t state) 
	if (mmc)

		ret = mmc_suspend_host(mmc);



#ifndef RSI_BLKSZ

	bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() & ~PWR_ON);

#else

	bfin_write_SDH_CFG(bfin_read_SDH_CFG() & ~PWR_ON);

#endif

	peripheral_free_list(drv_data->pin_req);



	return ret;
@@ -669,16 +664,6 @@ static int sdh_resume(struct platform_device *dev) 
	/* Secure Digital Host shares DMA with Nand controller */

	bfin_write_DMAC1_PERIMUX(bfin_read_DMAC1_PERIMUX() | 0x1);

#endif

#ifndef RSI_BLKSZ

	bfin_write_SDH_PWR_CTL(bfin_read_SDH_PWR_CTL() | PWR_ON);

	bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN);

#else

	bfin_write_SDH_CFG(bfin_read_SDH_CFG() | CLKS_EN | PWR_ON);

#endif

	SSYNC();



	bfin_write_SDH_CFG((bfin_read_SDH_CFG() & 0x1F) | (PUP_SDDAT | PUP_SDDAT3));

	SSYNC();



	if (mmc)

		ret = mmc_resume_host(mmc);