aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/devices.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap1/devices.c')
-rw-r--r--arch/arm/mach-omap1/devices.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index d3fec92c54cb..645668e2b1d5 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -19,17 +19,19 @@
19 19
20#include <asm/mach/map.h> 20#include <asm/mach/map.h>
21 21
22#include <plat/tc.h> 22#include <mach/tc.h>
23#include <mach/mux.h> 23#include <mach/mux.h>
24#include <plat/dma.h>
25#include <plat/mmc.h>
26 24
27#include <mach/omap7xx.h> 25#include <mach/omap7xx.h>
28#include <mach/camera.h> 26#include <mach/camera.h>
29#include <mach/hardware.h> 27#include <mach/hardware.h>
30 28
29#include "../plat-omap/sram.h"
30
31#include "common.h" 31#include "common.h"
32#include "clock.h" 32#include "clock.h"
33#include "dma.h"
34#include "mmc.h"
33 35
34#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) 36#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
35 37
@@ -175,6 +177,13 @@ static int __init omap_mmc_add(const char *name, int id, unsigned long base,
175 res[3].name = "tx"; 177 res[3].name = "tx";
176 res[3].flags = IORESOURCE_DMA; 178 res[3].flags = IORESOURCE_DMA;
177 179
180 if (cpu_is_omap7xx())
181 data->slots[0].features = MMC_OMAP7XX;
182 if (cpu_is_omap15xx())
183 data->slots[0].features = MMC_OMAP15XX;
184 if (cpu_is_omap16xx())
185 data->slots[0].features = MMC_OMAP16XX;
186
178 ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); 187 ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));
179 if (ret == 0) 188 if (ret == 0)
180 ret = platform_device_add_data(pdev, data, sizeof(*data)); 189 ret = platform_device_add_data(pdev, data, sizeof(*data));