Commit 9cb238c0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

mmc: omap: Fix I2C dependency and make driver usable with device tree 



Some features can be configured by the companion I2C chips,
which may not be available at the probe time. Fix the issue
by returning -EPROBE_DEFER when the MMC controller slots
are not configured.

While at it, let's also add minimal device tree support so
omap24xx platforms can use this driver without legacy mode
since we claim to support device tree for mach-omap2 based
systems.

Although adding the minimal device tree support is not strictly
a fix, it does remove one of the last blockers for dropping a
bunch of legacy platform data for mach-omap2.

Cc: linux-mmc@vger.kernel.org
Acked-by: default avatarChris Ball <cjb@laptop.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 31ee9181

Documentation/devicetree/bindings/mmc/ti-omap.txt

0 → 100644
+54 −0
Original line number Diff line number Diff line 
* TI MMC host controller for OMAP1 and 2420



The MMC Host Controller on TI OMAP1 and 2420 family provides

an interface for MMC, SD, and SDIO types of memory cards.



This file documents differences between the core properties described

by mmc.txt and the properties used by the omap mmc driver.



Note that this driver will not work with omap2430 or later omaps,

please see the omap hsmmc driver for the current omaps.



Required properties:

- compatible: Must be "ti,omap2420-mmc", for OMAP2420 controllers

- ti,hwmods: For 2420, must be "msdi<n>", where n is controller

  instance starting 1



Examples:



	msdi1: mmc@4809c000 {

		compatible = "ti,omap2420-mmc";

		ti,hwmods = "msdi1";

		reg = <0x4809c000 0x80>;

		interrupts = <83>;

		dmas = <&sdma 61 &sdma 62>;

		dma-names = "tx", "rx";

	};



* TI MMC host controller for OMAP1 and 2420



The MMC Host Controller on TI OMAP1 and 2420 family provides

an interface for MMC, SD, and SDIO types of memory cards.



This file documents differences between the core properties described

by mmc.txt and the properties used by the omap mmc driver.



Note that this driver will not work with omap2430 or later omaps,

please see the omap hsmmc driver for the current omaps.



Required properties:

- compatible: Must be "ti,omap2420-mmc", for OMAP2420 controllers

- ti,hwmods: For 2420, must be "msdi<n>", where n is controller

  instance starting 1



Examples:



	msdi1: mmc@4809c000 {

		compatible = "ti,omap2420-mmc";

		ti,hwmods = "msdi1";

		reg = <0x4809c000 0x80>;

		interrupts = <83>;

		dmas = <&sdma 61 &sdma 62>;

		dma-names = "tx", "rx";

	};

drivers/mmc/host/omap.c

+10 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/delay.h>

#include <linux/spinlock.h>

#include <linux/timer.h>

#include <linux/of.h>

#include <linux/omap-dma.h>

#include <linux/mmc/host.h>

#include <linux/mmc/card.h>
@@ -1329,7 +1330,7 @@ static int mmc_omap_probe(struct platform_device *pdev) 
	}

	if (pdata->nr_slots == 0) {

		dev_err(&pdev->dev, "no slots\n");

		return -ENXIO;

		return -EPROBE_DEFER;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1502,12 +1503,20 @@ static int mmc_omap_remove(struct platform_device *pdev) 
	return 0;

}



#if IS_BUILTIN(CONFIG_OF)

static const struct of_device_id mmc_omap_match[] = {

	{ .compatible = "ti,omap2420-mmc", },

	{ },

};

#endif



static struct platform_driver mmc_omap_driver = {

	.probe		= mmc_omap_probe,

	.remove		= mmc_omap_remove,

	.driver		= {

		.name	= DRIVER_NAME,

		.owner	= THIS_MODULE,

		.of_match_table = of_match_ptr(mmc_omap_match),

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE