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

Commit bbd7f0a2 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: sdhci-spear: Simplify by adding build dependency to CONFIG_OF 



This driver is used on SoCs which are using CONFIG_OF. By adding a
compile dependency in the Kconfig, it enables us to simplify some code.

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

drivers/mmc/host/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ config MMC_SDHCI_PXAV2 
config MMC_SDHCI_SPEAR

	tristate "SDHCI support on ST SPEAr platform"

	depends on MMC_SDHCI && PLAT_SPEAR

	depends on OF

	help

	  This selects the Secure Digital Host Controller Interface (SDHCI)

	  often referrered to as the HSMMC block in some of the ST SPEAR range

drivers/mmc/host/sdhci-spear.c

+4 −16
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ static const struct sdhci_ops sdhci_pltfm_ops = { 
	.set_uhs_signaling = sdhci_set_uhs_signaling,

};



#ifdef CONFIG_OF

static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;
@@ -66,16 +65,9 @@ static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pde 


	return pdata;

}

#else

static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pdev)

{

	return ERR_PTR(-ENOSYS);

}

#endif



static int sdhci_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct sdhci_host *host;

	struct resource *iomem;

	struct spear_sdhci *sdhci;
@@ -124,15 +116,11 @@ static int sdhci_probe(struct platform_device *pdev) 
		dev_dbg(&pdev->dev, "Error setting desired clk, clk=%lu\n",

				clk_get_rate(sdhci->clk));



	if (np) {

	sdhci->data = sdhci_probe_config_dt(pdev);

	if (IS_ERR(sdhci->data)) {

		dev_err(&pdev->dev, "DT: Failed to get pdata\n");

		goto disable_clk;

	}

	} else {

		sdhci->data = dev_get_platdata(&pdev->dev);

	}



	/*

	 * It is optional to use GPIOs for sdhci card detection. If