1 files changed, 12 insertions, 13 deletions

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 84333440008c..5279e35a8aec 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -160,12 +160,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
 static struct omap_alsa_codec_config alsa_config = {
         .name                   = "OSK AIC23",
         .mcbsp_regs_alsa        = &mcbsp_regs,
-        .codec_configure_dev    = NULL, // aic23_configure,
-        .codec_set_samplerate   = NULL, // aic23_set_samplerate,
-        .codec_clock_setup      = NULL, // aic23_clock_setup,
-        .codec_clock_on         = NULL, // aic23_clock_on,
-        .codec_clock_off        = NULL, // aic23_clock_off,
-        .get_default_samplerate = NULL, // aic23_get_default_samplerate,
+        .codec_configure_dev    = NULL, /* aic23_configure, */
+        .codec_set_samplerate   = NULL, /* aic23_set_samplerate, */
+        .codec_clock_setup      = NULL, /* aic23_clock_setup, */
+        .codec_clock_on         = NULL, /* aic23_clock_on, */
+        .codec_clock_off        = NULL, /* aic23_clock_off, */
+        .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */
 };
 
 static struct platform_device osk5912_mcbsp1_device = {
@@ -253,7 +253,7 @@ static struct omap_lcd_config osk_lcd_config __initdata = {
 };
 #endif
 
-static struct omap_board_config_kernel osk_config[] = {
+static struct omap_board_config_kernel osk_config[] __initdata = {
         { OMAP_TAG_USB,           &osk_usb_config },
         { OMAP_TAG_UART,                &osk_uart_config },
 #ifdef  CONFIG_OMAP_OSK_MISTRAL
@@ -392,7 +392,7 @@ static void __init osk_mistral_init(void)
         omap_cfg_reg(W13_1610_CCP_CLKM);
         omap_cfg_reg(Y12_1610_CCP_CLKP);
         /* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */
-        // omap_cfg_reg(Y14_1610_CCP_DATAM);
+        /* omap_cfg_reg(Y14_1610_CCP_DATAM); */
         omap_cfg_reg(W14_1610_CCP_DATAP);
 
         /* CAM_PWDN */
@@ -404,8 +404,8 @@ static void __init osk_mistral_init(void)
                 pr_debug("OSK+Mistral: CAM_PWDN is awol\n");
 
 
-        // omap_cfg_reg(P19_1610_GPIO6);        // BUSY
-        omap_cfg_reg(P20_1610_GPIO4);   // PENIRQ
+        /* omap_cfg_reg(P19_1610_GPIO6); */     /* BUSY */
+        omap_cfg_reg(P20_1610_GPIO4);   /* PENIRQ */
         set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING);
         spi_register_board_info(mistral_boardinfo,
                         ARRAY_SIZE(mistral_boardinfo));
@@ -473,10 +473,9 @@ static void __init osk_init(void)
         if (gpio_request(OMAP_MPUIO(1), "tps65010") == 0)
                 gpio_direction_input(OMAP_MPUIO(1));
 
-        i2c_register_board_info(1, osk_i2c_board_info,
-                        ARRAY_SIZE(osk_i2c_board_info));
-
         omap_serial_init();
+        omap_register_i2c_bus(1, 400, osk_i2c_board_info,
+                              ARRAY_SIZE(osk_i2c_board_info));
         osk_mistral_init();
 }