diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-15 12:10:33 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-15 12:10:33 -0700 |
| commit | 53db20d123f7a1bf44e46b727775403672655fde (patch) | |
| tree | 5fc1d05f02eff332a4c45f7e6d38c38611c36f3b /arch/arm/mach-omap1 | |
| parent | 68f39e74fbc3e58ad52d008072bddacc9eee1c7e (diff) | |
| download | op-kernel-dev-53db20d123f7a1bf44e46b727775403672655fde.zip op-kernel-dev-53db20d123f7a1bf44e46b727775403672655fde.tar.gz | |
mmc: omap: Remove cpu_is_omap usage from the driver
This is needed for the ARM common zImage support.
We can use the existing slot features to pass omap1
specific options to the driver. For omap2 we don't
want to pass anything new as that will be eventually
moved to use device tree based init.
Note that this patch depends on earlier patch that
moves plat/mmc.h into include/linux/platform_data.
Cc: linux-mmc@vger.kernel.org
Cc: Venkatraman S <svenkatr@ti.com>
Acked-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/devices.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index f85836a..d807d94 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -175,6 +175,13 @@ static int __init omap_mmc_add(const char *name, int id, unsigned long base, res[3].name = "tx"; res[3].flags = IORESOURCE_DMA; + if (cpu_is_omap7xx()) + data->slots[0].features = MMC_OMAP7XX; + if (cpu_is_omap15xx()) + data->slots[0].features = MMC_OMAP15XX; + if (cpu_is_omap16xx()) + data->slots[0].features = MMC_OMAP16XX; + ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); if (ret == 0) ret = platform_device_add_data(pdev, data, sizeof(*data)); |
