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

Commit 30b87c60 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Chris Ball
Browse files

mmc: sdhci-dove: Prepare for common clock framework 



As mach-dove is moving towards common clock framework prepare
the sdhci driver to grab its clock.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent a9ca1d54

drivers/mmc/host/sdhci-dove.c

+47 −1
Original line number Diff line number Diff line
@@ -20,11 +20,17 @@ 
 */



#include <linux/io.h>

#include <linux/clk.h>

#include <linux/err.h>

#include <linux/module.h>

#include <linux/mmc/host.h>



#include "sdhci-pltfm.h"



struct sdhci_dove_priv {

	struct clk *clk;

};



static u16 sdhci_dove_readw(struct sdhci_host *host, int reg)

{

	u16 ret;
@@ -72,11 +78,51 @@ static struct sdhci_pltfm_data sdhci_dove_pdata = { 


static int __devinit sdhci_dove_probe(struct platform_device *pdev)

{

	return sdhci_pltfm_register(pdev, &sdhci_dove_pdata);

	struct sdhci_host *host;

	struct sdhci_pltfm_host *pltfm_host;

	struct sdhci_dove_priv *priv;

	int ret;



	ret = sdhci_pltfm_register(pdev, &sdhci_dove_pdata);

	if (ret)

		goto sdhci_dove_register_fail;



	priv = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_dove_priv),

			    GFP_KERNEL);

	if (!priv) {

		dev_err(&pdev->dev, "unable to allocate private data");

		ret = -ENOMEM;

		goto sdhci_dove_allocate_fail;

	}



	host = platform_get_drvdata(pdev);

	pltfm_host = sdhci_priv(host);

	pltfm_host->priv = priv;



	priv->clk = clk_get(&pdev->dev, NULL);

	if (!IS_ERR(priv->clk))

		clk_prepare_enable(priv->clk);

	return 0;



sdhci_dove_allocate_fail:

	sdhci_pltfm_unregister(pdev);

sdhci_dove_register_fail:

	return ret;

}



static int __devexit sdhci_dove_remove(struct platform_device *pdev)

{

	struct sdhci_host *host = platform_get_drvdata(pdev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_dove_priv *priv = pltfm_host->priv;



	if (priv->clk) {

		if (!IS_ERR(priv->clk)) {

			clk_disable_unprepare(priv->clk);

			clk_put(priv->clk);

		}

		devm_kfree(&pdev->dev, priv->clk);

	}

	return sdhci_pltfm_unregister(pdev);

}