Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2...

[pandora-kernel.git] / arch / arm / mach-imx / mach-vpr200.c

diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c
index d74e347..5250283 100644 (file)
--- a/arch/arm/mach-imx/mach-vpr200.c
+++ b/arch/arm/mach-imx/mach-vpr200.c
@@ -162,7 +162,7 @@ static struct i2c_board_info vpr200_i2c_devices[] = {
        }, {
                I2C_BOARD_INFO("mc13892", 0x08),
                .platform_data = &vpr200_pmic,
-               .irq = gpio_to_irq(GPIO_PMIC_INT),
+               .irq = IMX_GPIO_TO_IRQ(GPIO_PMIC_INT),
        }
 };
 
@@ -267,6 +267,8 @@ static struct platform_device *devices[] __initdata = {
  */
 static void __init vpr200_board_init(void)
 {
+       imx35_soc_init();
+
        mxc_iomux_v3_setup_multiple_pads(vpr200_pads, ARRAY_SIZE(vpr200_pads));
 
        imx35_add_fec(NULL);