[PATCH] mach-u300: do away with MMC config files

On Fri, Jan 20, 2012 at 12:09 PM, Russell King - ARM Linux
[off-list ref] wrote:

On Fri, Jan 20, 2012 at 12:00:20PM +0100, Linus Walleij wrote:

quoted

?static struct amba_device mmcsd_device = {
? ? ? .dev = {
? ? ? ? ? ? ? .init_name = "mmci", /* Fast device at 0x1000 offset */
- ? ? ? ? ? ? .platform_data = NULL, /* Added later */
+ ? ? ? ? ? ? .platform_data = &mmcsd_platform_data,

This will certainly conflict with the set of AMBA/Primecell patches
I've just posted... the equivalent change is:

?static AMBA_APB_DEVICE(mmcsd, "mmci", 0, U300_MMCSD_BASE,
- ? ? ? U300_MMCSD_IRQS, NULL);
+ ? ? ? U300_MMCSD_IRQS, &mmcsd_platform_data);

OK I will wait for your stuff to hit -next and then rebase it and
put it in the patch tracker for a conflict-free path to mainline.

Yours,
Linus Walleij