diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 20:13:42 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 20:13:42 +0200 |
| commit | 46cddc01aa6a017193ae7320ef8bfc8242782a66 (patch) | |
| tree | da67a2fb45e512689bf909b4f832a8daea57e140 /arch/arm/mach-omap1/devices.c | |
| parent | Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-... (diff) | |
| parent | mmc: omap: Remove cpu_is_omap usage from the driver (diff) | |
| download | linux-46cddc01aa6a017193ae7320ef8bfc8242782a66.tar.xz linux-46cddc01aa6a017193ae7320ef8bfc8242782a66.zip | |
Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
drivers/mmc/host/omap.c
Diffstat (limited to 'arch/arm/mach-omap1/devices.c')
| -rw-r--r-- | arch/arm/mach-omap1/devices.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 894e7c9b57f9..8e32d50d275b 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -21,7 +21,6 @@ #include <plat/tc.h> #include <mach/mux.h> -#include <plat/mmc.h> #include <mach/omap7xx.h> #include <mach/camera.h> @@ -30,6 +29,7 @@ #include "common.h" #include "clock.h" #include "dma.h" +#include "mmc.h" #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) @@ -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)); |