1 files changed, 7 insertions, 10 deletions
diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
index 7e1e9dc2c8fc..275c8589d797 100644
--- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
@@ -26,20 +26,16 @@
 #include <linux/spi/ads7846.h>
 #include <linux/backlight.h>
 #include <video/platform_lcd.h>
-#include <linux/input/matrix_keypad.h>
 #include <asm/mach/arch.h>
 #include <mach/common.h>
 #include <mach/iomux-mx27.h>
-#include <mach/imxfb.h>
 #include <mach/hardware.h>
-#include <mach/mmc.h>
 #include <mach/spi.h>
 #include <mach/audmux.h>
 #include "devices-imx27.h"
-#include "devices.h"
 static const int eukrea_mbimx27_pins[] __initconst = {
        /* UART2 */
@@ -111,7 +107,8 @@ static const uint32_t eukrea_mbimx27_keymap[] = {
        KEY(1, 1, KEY_LEFT),
 };
-static struct matrix_keymap_data eukrea_mbimx27_keymap_data = {
+static const struct matrix_keymap_data
+eukrea_mbimx27_keymap_data __initconst = {
        .keymap         = eukrea_mbimx27_keymap,
        .keymap_size    = ARRAY_SIZE(eukrea_mbimx27_keymap),
 };
@@ -196,7 +193,7 @@ static struct imx_fb_videomode eukrea_mbimx27_modes[] = {
        },
 };
-static struct imx_fb_platform_data eukrea_mbimx27_fb_data = {
+static const struct imx_fb_platform_data eukrea_mbimx27_fb_data __initconst = {
        .mode = eukrea_mbimx27_modes,
        .num_modes = ARRAY_SIZE(eukrea_mbimx27_modes),
@@ -300,7 +297,7 @@ static struct platform_device *platform_devices[] __initdata = {
        &leds_gpio,
 };
-static struct imxmmc_platform_data sdhc_pdata = {
+static const struct imxmmc_platform_data sdhc_pdata __initconst = {
        .dat3_card_detect = 1,
 };
@@ -345,8 +342,8 @@ void __init eukrea_mbimx27_baseboard_init(void)
        imx27_add_imx_uart3(&uart_pdata);
 #endif
-        mxc_register_device(&mxc_fb_device, &eukrea_mbimx27_fb_data);
+        imx27_add_imx_fb(&eukrea_mbimx27_fb_data);
-        mxc_register_device(&mxc_sdhc_device0, &sdhc_pdata);
+        imx27_add_mxc_mmc(0, &sdhc_pdata);
        i2c_register_board_info(0, eukrea_mbimx27_i2c_devices,
                                ARRAY_SIZE(eukrea_mbimx27_i2c_devices));
@@ -380,7 +377,7 @@ void __init eukrea_mbimx27_baseboard_init(void)
        gpio_request(GPIO_PORTA | 25, "lcd_enable");
        platform_device_register(&eukrea_mbimx27_lcd_powerdev);
-        mxc_register_device(&imx_kpp_device, &eukrea_mbimx27_keymap_data);
+        imx27_add_imx_keypad(&eukrea_mbimx27_keymap_data);
        platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
 }