diff mbox

[U-Boot,v4,07/29] dm: Remove spi_init() from board_r.c when using driver model

Message ID 1413265336-9571-8-git-send-email-sjg@chromium.org
State Awaiting Upstream
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Oct. 14, 2014, 5:41 a.m. UTC 
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>
---

Changes in v4: None
Changes in v3: None
Changes in v2:
- Fix a typo in the commit message

 common/board_r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Glass Oct. 23, 2014, 3:03 a.m. UTC | #1 
On 13 October 2014 23:41, Simon Glass <sjg@chromium.org> wrote:
> 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>
> ---
>
> Changes in v4: None
> Changes in v3: None
> Changes in v2:
> - Fix a typo in the commit message
>
>  common/board_r.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Applied to u-boot-dm/master.
diff mbox

Patch

diff --git a/common/board_r.c b/common/board_r.c
index 7e1a76d..3affb63 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 */