summaryrefslogtreecommitdiffstats
path: root/common/board_r.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-13 23:41:54 -0600
committerSimon Glass <sjg@chromium.org>2014-10-22 10:36:47 -0600
commitebe76a2df9f6b82f41ec61d36d45bce56d556f17 (patch)
tree78a2dac725e175f0e18310fcb5648134d872224e /common/board_r.c
parentc60e1f254747ac650f8290e5debcf8ad1567584b (diff)
downloadtalos-obmc-uboot-ebe76a2df9f6b82f41ec61d36d45bce56d556f17.tar.gz
talos-obmc-uboot-ebe76a2df9f6b82f41ec61d36d45bce56d556f17.zip
dm: Remove spi_init() from board_r.c when using driver model
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>
Diffstat (limited to 'common/board_r.c')
-rw-r--r--common/board_r.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 7e1a76d97f..3affb6362f 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -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 */
OpenPOWER on IntegriCloud