diff options
author | Tony Lindgren <tony@atomide.com> | 2012-04-23 18:56:36 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 19:35:12 -0400 |
commit | 5ff391d8ac555486de8af083068b94a66d32f4c2 (patch) | |
tree | c4dc8f0215f3f1fef233af7c1487269c97e35e4e /arch/arm/mach-omap1/devices.c | |
parent | 2fdad5c971ad7991d1798866ae0cb25846155423 (diff) |
ARM: OMAP: Move omap_mmc_add() to mach-omap1
Now that omap2420 is using hwmod for MMC, this code is omap1
only used on omap1.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/devices.c')
-rw-r--r-- | arch/arm/mach-omap1/devices.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index b853f6110a44..21926765b16d 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -144,6 +144,49 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller, | |||
144 | } | 144 | } |
145 | } | 145 | } |
146 | 146 | ||
147 | #define OMAP_MMC_NR_RES 2 | ||
148 | |||
149 | /* | ||
150 | * Register MMC devices. | ||
151 | */ | ||
152 | static int __init omap_mmc_add(const char *name, int id, unsigned long base, | ||
153 | unsigned long size, unsigned int irq, | ||
154 | struct omap_mmc_platform_data *data) | ||
155 | { | ||
156 | struct platform_device *pdev; | ||
157 | struct resource res[OMAP_MMC_NR_RES]; | ||
158 | int ret; | ||
159 | |||
160 | pdev = platform_device_alloc(name, id); | ||
161 | if (!pdev) | ||
162 | return -ENOMEM; | ||
163 | |||
164 | memset(res, 0, OMAP_MMC_NR_RES * sizeof(struct resource)); | ||
165 | res[0].start = base; | ||
166 | res[0].end = base + size - 1; | ||
167 | res[0].flags = IORESOURCE_MEM; | ||
168 | res[1].start = res[1].end = irq; | ||
169 | res[1].flags = IORESOURCE_IRQ; | ||
170 | |||
171 | ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); | ||
172 | if (ret == 0) | ||
173 | ret = platform_device_add_data(pdev, data, sizeof(*data)); | ||
174 | if (ret) | ||
175 | goto fail; | ||
176 | |||
177 | ret = platform_device_add(pdev); | ||
178 | if (ret) | ||
179 | goto fail; | ||
180 | |||
181 | /* return device handle to board setup code */ | ||
182 | data->dev = &pdev->dev; | ||
183 | return 0; | ||
184 | |||
185 | fail: | ||
186 | platform_device_put(pdev); | ||
187 | return ret; | ||
188 | } | ||
189 | |||
147 | void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, | 190 | void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, |
148 | int nr_controllers) | 191 | int nr_controllers) |
149 | { | 192 | { |