From: Eric Miao Date: Sat, 9 Aug 2008 09:54:22 +0000 (-0400) Subject: [ARM] pxa/poodle: move scoop/locomo device registration earlier X-Git-Tag: v2.6.28-rc1~293^2~6^2~17^2~4^8~23 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2b0defd4c17f65fcfef758b8f3a811287eba73de;p=linux-2.6-omap-h63xx.git [ARM] pxa/poodle: move scoop/locomo device registration earlier Signed-off-by: Eric Miao Cc: Richard Purdie Signed-off-by: Russell King --- diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 3f5f484549b..e85eba3e362 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c @@ -381,6 +381,13 @@ static void __init poodle_init(void) GPSR1 = 0x00000000; GPSR2 = 0x00000000; + platform_scoop_config = &poodle_pcmcia_config; + corgi_ssp_set_machinfo(&poodle_ssp_machinfo); + + ret = platform_add_devices(devices, ARRAY_SIZE(devices)); + if (ret) + pr_warning("poodle: Unable to register LoCoMo device\n"); + set_pxa_fb_parent(&poodle_locomo_device.dev); set_pxa_fb_info(&poodle_fb_info); pxa_gpio_mode(POODLE_GPIO_USB_PULLUP | GPIO_OUT); @@ -389,14 +396,6 @@ static void __init poodle_init(void) pxa_set_mci_info(&poodle_mci_platform_data); pxa_set_ficp_info(&poodle_ficp_platform_data); pxa_set_i2c_info(NULL); - - platform_scoop_config = &poodle_pcmcia_config; - - ret = platform_add_devices(devices, ARRAY_SIZE(devices)); - if (ret) { - printk(KERN_WARNING "poodle: Unable to register LoCoMo device\n"); - } - corgi_ssp_set_machinfo(&poodle_ssp_machinfo); } static void __init fixup_poodle(struct machine_desc *desc,