From patchwork Mon Dec 10 10:52:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick DELAUNAY X-Patchwork-Id: 1010367 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=st.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43D0Pj3vkLz9s55 for ; Mon, 10 Dec 2018 21:56:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 17D86C227AA; Mon, 10 Dec 2018 10:54:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DC318C21F21; Mon, 10 Dec 2018 10:53:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 16B62C21F21; Mon, 10 Dec 2018 10:53:31 +0000 (UTC) Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [62.209.51.94]) by lists.denx.de (Postfix) with ESMTPS id F2509C224AE for ; Mon, 10 Dec 2018 10:53:27 +0000 (UTC) Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id wBAAoxVJ012657; Mon, 10 Dec 2018 11:53:26 +0100 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2p84kx9xbv-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 10 Dec 2018 11:53:26 +0100 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 89FB238; Mon, 10 Dec 2018 10:53:25 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas21.st.com [10.75.90.44]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 72C7027D6; Mon, 10 Dec 2018 10:53:25 +0000 (GMT) Received: from SAFEX1HUBCAS22.st.com (10.75.90.92) by SAFEX1HUBCAS21.st.com (10.75.90.44) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 10 Dec 2018 11:53:24 +0100 Received: from localhost (10.201.23.85) by Webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 10 Dec 2018 11:53:27 +0100 From: Patrick Delaunay To: Date: Mon, 10 Dec 2018 11:52:43 +0100 Message-ID: <1544439166-5749-5-git-send-email-patrick.delaunay@st.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544439166-5749-1-git-send-email-patrick.delaunay@st.com> References: <1544439166-5749-1-git-send-email-patrick.delaunay@st.com> MIME-Version: 1.0 X-Originating-IP: [10.201.23.85] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-12-10_03:, , signatures=0 Cc: U-Boot STM32 Subject: [U-Boot] [PATCH 4/7] dfu: sf: Read default speed and mode values from DT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In case of DT boot, don't read default speed and mode for SPI from CONFIG_*, instead read from DT node. Signed-off-by: Patrick Delaunay Reviewed-by: Lukasz Majewski Reviewed-by: Petr Vorel --- drivers/dfu/dfu_sf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c index 066e767..5e32f80 100644 --- a/drivers/dfu/dfu_sf.c +++ b/drivers/dfu/dfu_sf.c @@ -69,11 +69,17 @@ static struct spi_flash *parse_dev(char *devstr) { unsigned int bus; unsigned int cs; - unsigned int speed = CONFIG_SF_DEFAULT_SPEED; - unsigned int mode = CONFIG_SF_DEFAULT_MODE; + /* In DM mode, defaults will be taken from DT */ + unsigned int speed = 0; + unsigned int mode = 0; char *s, *endp; struct spi_flash *dev; +#ifndef CONFIG_DM_SPI_FLASH + speed = CONFIG_SF_DEFAULT_SPEED; + mode = CONFIG_SF_DEFAULT_MODE; +#endif + s = strsep(&devstr, ":"); if (!s || !*s || (bus = simple_strtoul(s, &endp, 0), *endp)) { printf("Invalid SPI bus %s\n", s);