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

Commit 4b711cb1 authored by Wolfram Sang's avatar Wolfram Sang Committed by Chris Ball
Browse files

mmc: sdhci-pltfm: Add structure for host-specific data 



We need to carry some information per host, e.g. the clock. Add a
structure for it and initialize it in the generic part. Also improve
the check for a parent.

Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Cc: Richard Röjfors <richard.rojfors.ext@mocean-labs.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 9ffca830

drivers/mmc/host/sdhci-pltfm.c

+7 −3
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev) 
	struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;

	const struct platform_device_id *platid = platform_get_device_id(pdev);

	struct sdhci_host *host;

	struct sdhci_pltfm_host *pltfm_host;

	struct resource *iomem;

	int ret;
@@ -71,16 +72,19 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "Invalid iomem size. You may "

			"experience problems.\n");



	if (pdev->dev.parent)

		host = sdhci_alloc_host(pdev->dev.parent, 0);

	/* Some PCI-based MFD need the parent here */

	if (pdev->dev.parent != &platform_bus)

		host = sdhci_alloc_host(pdev->dev.parent, sizeof(*pltfm_host));

	else

		host = sdhci_alloc_host(&pdev->dev, 0);

		host = sdhci_alloc_host(&pdev->dev, sizeof(*pltfm_host));



	if (IS_ERR(host)) {

		ret = PTR_ERR(host);

		goto err;

	}



	pltfm_host = sdhci_priv(host);



	host->hw_name = "platform";

	if (pdata && pdata->ops)

		host->ops = pdata->ops;

drivers/mmc/host/sdhci-pltfm.h

+7 −0
Original line number Diff line number Diff line
@@ -11,8 +11,15 @@ 
#ifndef _DRIVERS_MMC_SDHCI_PLTFM_H

#define _DRIVERS_MMC_SDHCI_PLTFM_H



#include <linux/clk.h>

#include <linux/types.h>

#include <linux/sdhci-pltfm.h>



struct sdhci_pltfm_host {

	struct clk *clk;

	u32 scratchpad; /* to handle quirks across io-accessor calls */

};



extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata;



#endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */