From patchwork Mon Sep 29 19:35:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 394590 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 545A4140111 for ; Tue, 30 Sep 2014 05:38:22 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D059BA745F; Mon, 29 Sep 2014 21:38:05 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nuT2jENGWcR4; Mon, 29 Sep 2014 21:38:05 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5E378A7422; Mon, 29 Sep 2014 21:37:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7F89A4B627 for ; Mon, 29 Sep 2014 21:37:32 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CXhW4aJtzfDx for ; Mon, 29 Sep 2014 21:37:32 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-oi0-f74.google.com (mail-oi0-f74.google.com [209.85.218.74]) by theia.denx.de (Postfix) with ESMTPS id 1989E4B5FD for ; Mon, 29 Sep 2014 21:37:28 +0200 (CEST) Received: by mail-oi0-f74.google.com with SMTP id u20so3586853oif.5 for ; Mon, 29 Sep 2014 12:37:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eNBYlmC6hXrwchqWZjltkP6Lxh11y2Or/QJdhTvJ1dU=; b=I+WftFhhCtDcY2v6cF2N3Y2WvaeZ9B5TpqQP5wsSg0IugEe08v3hRcva0Rc9hT7zLQ d0r8dS5rosG+SCysVYJ0+Xmt8Xb5xDRtH2pxHclhUU23UelF5zPMkdPwdQBp6Xc/6rg8 tgBXPOGaA7JZ7cKbZJt87RoBsk+gUCA3lcukRJ0sIaQV8BHfWUzVuk5sjkR4XYl/aCL3 Enqi5fg4/VHYPRRqLSCHLKjzyvz/7lGgFBEtoZ+XaYk4jSHO+3Fkg8s+2TXMZ489+ldh FS0yuMmh1UXWc4D/jkoZdL075ShjLMmfkWtCZi11z8ZgiD4T2Rfb/NfNeu0DwvAubn0S P9hA== X-Gm-Message-State: ALoCoQlJnrJwBCwsdrNzUwpBpFj8vQfYywHrWDgSjvZdzTN0RZ9V0NfwOP+RVV7GkWx6Jh4ycPeP X-Received: by 10.42.211.4 with SMTP id gm4mr37732444icb.25.1412019447574; Mon, 29 Sep 2014 12:37:27 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id f102si767999yhp.7.2014.09.29.12.37.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Sep 2014 12:37:27 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id CovNAppS.1; Mon, 29 Sep 2014 12:37:27 -0700 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 0F767221195; Mon, 29 Sep 2014 13:37:26 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 29 Sep 2014 13:35:04 -0600 Message-Id: <1412019326-6721-8-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1412019326-6721-1-git-send-email-sjg@chromium.org> References: <1412019326-6721-1-git-send-email-sjg@chromium.org> Cc: u-boot-review@google.com, Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH v3 07/29] dm: Remove spi_init() from board_r.c when using driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- 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(-) diff --git a/common/board_r.c b/common/board_r.c index 231c6d6..cd92288 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 */