diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
| commit | ed039cd72bfe7cf897fc195dd9cfec0bfa359222 (patch) | |
| tree | ff64b841e6245817d987be35c488fbf747560d95 /drivers/mci | |
| parent | 6d7fae1e97d67b635a972b0f1f5c6a140c596e95 (diff) | |
| parent | 03d601d58f4d6228bcb67e6035d4ede7b1d99ae3 (diff) | |
| download | barebox-ed039cd72bfe7cf897fc195dd9cfec0bfa359222.tar.gz barebox-ed039cd72bfe7cf897fc195dd9cfec0bfa359222.tar.xz | |
Merge branch 'for-next/omap-drivers'
Diffstat (limited to 'drivers/mci')
| -rw-r--r-- | drivers/mci/omap_hsmmc.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c index 357d99a0db..9cce916923 100644 --- a/drivers/mci/omap_hsmmc.c +++ b/drivers/mci/omap_hsmmc.c @@ -646,9 +646,22 @@ static struct platform_device_id omap_mmc_ids[] = { }, }; +static __maybe_unused struct of_device_id omap_mmc_dt_ids[] = { + { + .compatible = "ti,omap3-hsmmc", + .data = (unsigned long)&omap3_data, + }, { + .compatible = "ti,omap4-hsmmc", + .data = (unsigned long)&omap4_data, + }, { + /* sentinel */ + } +}; + static struct driver_d omap_mmc_driver = { .name = "omap-hsmmc", .probe = omap_mmc_probe, .id_table = omap_mmc_ids, + .of_compatible = DRV_OF_COMPAT(omap_mmc_dt_ids), }; device_platform_driver(omap_mmc_driver); |