Merge tag 'davinci-for-v3.9/soc' of git://gitorious.org/linux-davinci/linux-davinci...

[linux-beck.git] / arch / arm / mach-davinci / board-mityomapl138.c

diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index b0df578bf744c8c88ffc4a1e687270fc9a91f5c7..9549d53aa63f0489f741a6a7f43b83b9a2505a05 100644 (file)
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -529,8 +529,13 @@ static void __init mityomapl138_init(void)
 
        mityomapl138_setup_nand();
 
-       ret = da8xx_register_spi(1, mityomapl138_spi_flash_info,
-                              ARRAY_SIZE(mityomapl138_spi_flash_info));
+       ret = spi_register_board_info(mityomapl138_spi_flash_info,
+                                     ARRAY_SIZE(mityomapl138_spi_flash_info));
+       if (ret)
+               pr_warn("spi info registration failed: %d\n", ret);
+
+       ret = da8xx_register_spi_bus(1,
+                                    ARRAY_SIZE(mityomapl138_spi_flash_info));
        if (ret)
                pr_warning("spi 1 registration failed: %d\n", ret);