From patchwork Tue Sep 23 15:07:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 37737 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7CF9720970 for ; Tue, 23 Sep 2014 15:08:16 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf3008704eek.5 for ; Tue, 23 Sep 2014 08:08:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=ob/qCITDo9LmIpW+21whUU79psW9rvujLwArQBWWrvw=; b=Cdlf1Z1zLC4cwcjNVxlzUcshAhyjMCzmmQOk4ps6voYOKiIuMboe7axajWWleNXO0n D13piVRSYxxIw8XgoUvVlxYI1zBcUpUqFvPGWuaSn54JA/e8elZQXVIQ7bj3zRrUTwPJ 4+KFW33POGsOe0GScYtaM5ABcXwRWcEpbza5txaHx29jAm7/LN7N61QnypwMLAa75abO iFm8z351UkWGMwLKHyrpa1a40R7t5lqU1lH1sRV8zcLqPovFenDsJ1s37xGcK9uA7+Il LS2rxHkeb9y0pFpMuXUKz1cJBnyiJy3UsWJdHnOtrzpUfOHdFblhYFqq2mE23hHxj/z5 GyeQ== X-Gm-Message-State: ALoCoQmmPhcQjCtKC0aLUWhy1s0QgIzZQ8/X9Isp6WWW0Zgl8+UdTMrR88xr4/qTjqYDE3Lr5bsD X-Received: by 10.180.24.225 with SMTP id x1mr552978wif.2.1411484895376; Tue, 23 Sep 2014 08:08:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.72 with SMTP id lm8ls61421lac.9.gmail; Tue, 23 Sep 2014 08:08:15 -0700 (PDT) X-Received: by 10.112.129.228 with SMTP id nz4mr162875lbb.9.1411484895191; Tue, 23 Sep 2014 08:08:15 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by mx.google.com with ESMTPS id kx10si18988684lac.130.2014.09.23.08.08.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Sep 2014 08:08:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id gi9so8926994lab.30 for ; Tue, 23 Sep 2014 08:08:15 -0700 (PDT) X-Received: by 10.112.200.134 with SMTP id js6mr348312lbc.0.1411484894885; Tue, 23 Sep 2014 08:08:14 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp428958lbb; Tue, 23 Sep 2014 08:08:14 -0700 (PDT) X-Received: by 10.194.161.231 with SMTP id xv7mr336622wjb.78.1411484894325; Tue, 23 Sep 2014 08:08:14 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id hl10si15460630wjb.17.2014.09.23.08.08.13 for ; Tue, 23 Sep 2014 08:08:14 -0700 (PDT) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AE296A73EA; Tue, 23 Sep 2014 17:07:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 fTB1D1HqzJdo; Tue, 23 Sep 2014 17:07:58 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BFB60A743D; Tue, 23 Sep 2014 17:07:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 91F49A7408 for ; Tue, 23 Sep 2014 17:07:31 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 jgcmgshXevyS for ; Tue, 23 Sep 2014 17:07:29 +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 comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by theia.denx.de (Postfix) with ESMTPS id C6870A73EB for ; Tue, 23 Sep 2014 17:07:23 +0200 (CEST) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s8NF7Fci031885; Tue, 23 Sep 2014 10:07:15 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8NF7FA6015418; Tue, 23 Sep 2014 10:07:15 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Tue, 23 Sep 2014 10:07:14 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s8NF76Tc017458; Tue, 23 Sep 2014 10:07:12 -0500 From: Roger Quadros To: Date: Tue, 23 Sep 2014 18:07:02 +0300 Message-ID: <1411484824-27265-3-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1411484824-27265-1-git-send-email-rogerq@ti.com> References: <1411484824-27265-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de, ijc@hellion.org.uk, Roger Quadros Subject: [U-Boot] [PATCH 2/4] OMAP5+: sata/scsi: Implement scsi_init() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 On OMAP platforms, SATA controller provides the SCSI subsystem so implement scsi_init(). Get rid of the unnecessary sata_init() call from dra7xx-evm and omap5-uevm board files. Signed-off-by: Roger Quadros --- arch/arm/cpu/armv7/omap-common/sata.c | 6 ++++++ board/ti/dra7xx/evm.c | 1 - board/ti/omap5_uevm/evm.c | 6 ------ include/configs/omap5_uevm.h | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/arm/cpu/armv7/omap-common/sata.c b/arch/arm/cpu/armv7/omap-common/sata.c index cad4fee..131d082 100644 --- a/arch/arm/cpu/armv7/omap-common/sata.c +++ b/arch/arm/cpu/armv7/omap-common/sata.c @@ -74,3 +74,9 @@ int init_sata(int dev) return ret; } + +/* On OMAP platforms SATA provides the SCSI subsystem */ +void scsi_init(void) +{ + init_sata(0); +} diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 5592fc5..37df7b2 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -93,7 +93,6 @@ int board_late_init(void) else setenv("board_name", "dra7xx"); #endif - init_sata(0); return 0; } diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 4666b38..833ffe9 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -69,12 +69,6 @@ int board_init(void) return 0; } -int board_late_init(void) -{ - init_sata(0); - return 0; -} - int board_eth_init(bd_t *bis) { return 0; diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 7e2ecd5..e8dc462 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -72,7 +72,6 @@ /* Max time to hold reset on this board, see doc/README.omap-reset-time */ #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296 -#define CONFIG_BOARD_LATE_INIT #define CONFIG_CMD_SCSI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI