ARM: davinci: da8xx_register_spi() should not register SPI board info

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-davinci / board-da850-evm.c

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 0299915575a873b26b3a1499b1c5f91011d9eacf..709607427a80cce0afc9cdad6ab627f5c7d5d140 100644 (file)
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -1565,8 +1565,13 @@ static __init void da850_evm_init(void)
 
        da850_vpif_init();
 
-       ret = da8xx_register_spi(1, da850evm_spi_info,
-                                ARRAY_SIZE(da850evm_spi_info));
+       ret = spi_register_board_info(da850evm_spi_info,
+                                     ARRAY_SIZE(da850evm_spi_info));
+       if (ret)
+               pr_warn("%s: spi info registration failed: %d\n", __func__,
+                       ret);
+
+       ret = da8xx_register_spi_bus(1, ARRAY_SIZE(da850evm_spi_info));
        if (ret)
                pr_warning("da850_evm_init: spi 1 registration failed: %d\n",
                                ret);