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

Commit 996bc8ae authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball
Browse files

mmc: sh_mobile_sdhi: do not manage PM clocks manually 



On sh-mobile platforms the MMC clock frequency for the TMIO MMC unit is
obtained from the same clock, as the one, that runtime power-manages the
controller. The SDHI glue code has to access that clock directly,
bypassing the runtime PM framework, to get its frequency, but it
shouldn't enable or disable it.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 5bd99c37

drivers/mmc/host/sh_mobile_sdhi.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -117,8 +117,6 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev) 
		goto eclkget;

		goto eclkget;

	}

	}





	clk_enable(priv->clk);



	mmc_data->hclk = clk_get_rate(priv->clk);

	mmc_data->hclk = clk_get_rate(priv->clk);

	mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;

	mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;

	mmc_data->get_cd = sh_mobile_sdhi_get_cd;

	mmc_data->get_cd = sh_mobile_sdhi_get_cd;
@@ -233,7 +231,6 @@ eirq_sdio: 
eirq_card_detect:

eirq_card_detect:

	tmio_mmc_host_remove(host);

	tmio_mmc_host_remove(host);

eprobe:

eprobe:

	clk_disable(priv->clk);

	clk_put(priv->clk);

	clk_put(priv->clk);

eclkget:

eclkget:

	kfree(priv);

	kfree(priv);
@@ -259,7 +256,6 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev) 
		free_irq(irq, host);

		free_irq(irq, host);

	}

	}





	clk_disable(priv->clk);

	clk_put(priv->clk);

	clk_put(priv->clk);

	kfree(priv);

	kfree(priv);