Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-cleanup

1 files changed, 8 insertions, 15 deletions

diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
index 474fc6e4c6df..10f0562c3c48 100644
--- a/arch/arm/mach-mx5/board-mx51_efikasb.c
+++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
@@ -42,7 +42,6 @@
 #include <asm/mach/time.h>
 
 #include "devices-imx51.h"
-#include "devices.h"
 #include "efika.h"
 
 #define EFIKASB_USBH2_STP       IMX_GPIO_NR(2, 20)
@@ -119,7 +118,7 @@ static int initialize_usbh2_port(struct platform_device *pdev)
         return mx51_initialize_usb_hw(pdev->id, MXC_EHCI_ITC_NO_THRESHOLD);
 }
 
-static struct mxc_usbh_platform_data usbh2_config = {
+static struct mxc_usbh_platform_data usbh2_config __initdata = {
         .init   = initialize_usbh2_port,
         .portsc = MXC_EHCI_MODE_ULPI,
 };
@@ -129,10 +128,10 @@ static void __init mx51_efikasb_usb(void)
         usbh2_config.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
                         ULPI_OTG_DRVVBUS_EXT | ULPI_OTG_EXTVBUSIND);
         if (usbh2_config.otg)
-                mxc_register_device(&mxc_usbh2_device, &usbh2_config);
+                imx51_add_mxc_ehci_hs(2, &usbh2_config);
 }
 
-static struct gpio_led mx51_efikasb_leds[] = {
+static const struct gpio_led mx51_efikasb_leds[] __initconst = {
         {
                 .name = "efikasb:green",
                 .default_trigger = "default-on",
@@ -146,19 +145,12 @@ static struct gpio_led mx51_efikasb_leds[] = {
         },
 };
 
-static struct gpio_led_platform_data mx51_efikasb_leds_data = {
+static const struct gpio_led_platform_data
+                mx51_efikasb_leds_data __initconst = {
         .leds = mx51_efikasb_leds,
         .num_leds = ARRAY_SIZE(mx51_efikasb_leds),
 };
 
-static struct platform_device mx51_efikasb_leds_device = {
-        .name = "leds-gpio",
-        .id = -1,
-        .dev = {
-                .platform_data = &mx51_efikasb_leds_data,
-        },
-};
-
 static struct gpio_keys_button mx51_efikasb_keys[] = {
         {
                 .code = KEY_POWER,
@@ -248,6 +240,8 @@ static void __init mx51_efikasb_board_id(void)
 
 static void __init efikasb_board_init(void)
 {
+        imx51_soc_init();
+
         mxc_iomux_v3_setup_multiple_pads(mx51efikasb_pads,
                                         ARRAY_SIZE(mx51efikasb_pads));
         efika_board_common_init();
@@ -256,9 +250,8 @@ static void __init efikasb_board_init(void)
         mx51_efikasb_usb();
         imx51_add_sdhci_esdhc_imx(1, NULL);
 
-        platform_device_register(&mx51_efikasb_leds_device);
+        gpio_led_register_device(-1, &mx51_efikasb_leds_data);
         imx_add_gpio_keys(&mx51_efikasb_keys_data);
-
 }
 
 static void __init mx51_efikasb_timer_init(void)