dm: Remove spi_init() from board_r.c when using driver model
authorSimon Glass <sjg@chromium.org>
Tue, 14 Oct 2014 05:41:54 +0000 (23:41 -0600)
committerSimon Glass <sjg@chromium.org>
Wed, 22 Oct 2014 16:36:47 +0000 (10:36 -0600)
Driver model does its own init, so we don't need this.

There is still a call in board_f.c but it is only enabled by CONFIG_HARD_SPI.
It is easy enough to disable that option when converting boards which use
it to driver model.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
common/board_r.c

index 7e1a76d97f73be5d2eb3d347dffbb82d301b7522..3affb6362f4531ebd3f313248df1fbd7c588e7bf 100644 (file)
@@ -354,7 +354,7 @@ static int initr_flash(void)
 }
 #endif
 
-#ifdef CONFIG_PPC
+#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI)
 static int initr_spi(void)
 {
        /* PPC does this here */