From patchwork Mon Nov 13 05:04:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 837358 X-Patchwork-Delegate: sr@denx.de 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yZzL85nKrz9s81 for ; Mon, 13 Nov 2017 16:13:04 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7987DC21E8C; Mon, 13 Nov 2017 05:08:05 +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=none 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 6E3D6C21E65; Mon, 13 Nov 2017 05:08:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 92DCEC21E24; Mon, 13 Nov 2017 05:04:58 +0000 (UTC) Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by lists.denx.de (Postfix) with ESMTPS id A9AFEC21E5A for ; Mon, 13 Nov 2017 05:04:57 +0000 (UTC) Received: from sapphire.lan (unknown [10.0.4.3]) by mx.tkos.co.il (Postfix) with ESMTPA id 6AEAA440533; Mon, 13 Nov 2017 07:04:56 +0200 (IST) From: Baruch Siach To: Stefan Roese Date: Mon, 13 Nov 2017 07:04:30 +0200 Message-Id: <40ecf7cac3dbd9ecd4c06a675212ae0072f6ceb6.1510549471.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.15.0 Cc: Jagan Teki , Baruch Siach , u-boot@lists.denx.de Subject: [U-Boot] [PATCH RESEND v2 1/2] arm: mvebu: clearfog: Fix SPI-NOR flash access 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Jon Nettleton The production variant of the SPI flash used by the clearfog devices are based on winbond chips. Additionally enable SPI_FLASH_BAR since some variants will have 16MB of flash that requires this to be enabled. Remove the default speed and mode; these values are taken from the device tree when CONFIG_DM_SPI_FLASH is enabled. Add default bus, so that 'sf' detects the SPI flash by default. Signed-off-by: Jon Nettleton [baruch: remove speed/mode; add bus; move winbond to defconfig] Signed-off-by: Baruch Siach --- v2: Move CONFIG_SPI_FLASH_WINBOND to defconfig (Jagan) --- configs/clearfog_defconfig | 3 +++ include/configs/clearfog.h | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 3de204346d88..5fa645a45e23 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -46,3 +46,6 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_MVEBU=y CONFIG_USB_STORAGE=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_MTD=y diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 5061f6c6fd16..bf87bac30021 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -33,9 +33,7 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* SPI NOR flash default params, used by sf commands */ -#define CONFIG_SF_DEFAULT_SPEED 1000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 -#define CONFIG_SPI_FLASH_STMICRO +#define CONFIG_SF_DEFAULT_BUS 1 /* * SDIO/MMC Card Configuration From patchwork Mon Nov 13 05:04:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 837360 X-Patchwork-Delegate: sr@denx.de 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yZzNc6NZfz9sNc for ; Mon, 13 Nov 2017 16:15:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 94336C21EA5; Mon, 13 Nov 2017 05:13:22 +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=none 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 B8D43C21DC5; Mon, 13 Nov 2017 05:13:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C993EC21EA2; Mon, 13 Nov 2017 05:04:57 +0000 (UTC) Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by lists.denx.de (Postfix) with ESMTPS id A0642C21E50 for ; Mon, 13 Nov 2017 05:04:57 +0000 (UTC) Received: from sapphire.lan (unknown [10.0.4.3]) by mx.tkos.co.il (Postfix) with ESMTPA id B1F6044059D; Mon, 13 Nov 2017 07:04:56 +0200 (IST) From: Baruch Siach To: Stefan Roese Date: Mon, 13 Nov 2017 07:04:31 +0200 Message-Id: <363040f4cc7631e6cab83e80657972c33a28b685.1510549471.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.15.0 In-Reply-To: <40ecf7cac3dbd9ecd4c06a675212ae0072f6ceb6.1510549471.git.baruch@tkos.co.il> References: <40ecf7cac3dbd9ecd4c06a675212ae0072f6ceb6.1510549471.git.baruch@tkos.co.il> Cc: Jagan Teki , Baruch Siach , u-boot@lists.denx.de Subject: [U-Boot] [PATCH RESEND v2 2/2] arm: mvebu: clearfog: update SPI flash DT description 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" All current ClearFog SOMs have the SPI flash populated. Enable SPI flash in the device tree. Add an alias to the SPI bus so that the 'sf' command can probe the flash on bus 1. Add the "spi-flash" compatible string to make the standard SPI flash driver probe the device. Reviewed-by: Jagan Teki Signed-off-by: Baruch Siach --- v2: Add Jagan's ack --- arch/arm/dts/armada-388-clearfog.dts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/dts/armada-388-clearfog.dts b/arch/arm/dts/armada-388-clearfog.dts index b2dfd5643521..bc52bc0167d3 100644 --- a/arch/arm/dts/armada-388-clearfog.dts +++ b/arch/arm/dts/armada-388-clearfog.dts @@ -61,6 +61,7 @@ ethernet1 = ð0; ethernet2 = ð1; ethernet3 = ð2; + spi1 = &spi1; }; chosen { @@ -330,11 +331,9 @@ status = "okay"; }; - spi@10680 { + spi1: spi@10680 { /* - * We don't seem to have the W25Q32 on the - * A1 Rev 2.0 boards, so disable SPI. - * CS0: W25Q32 (doesn't appear to be present) + * CS0: W25Q32 * CS1: * CS2: mikrobus */ @@ -345,10 +344,9 @@ spi-flash@0 { #address-cells = <1>; #size-cells = <0>; - compatible = "w25q32", "jedec,spi-nor"; + compatible = "w25q32", "jedec,spi-nor", "spi-flash"; reg = <0>; /* Chip select 0 */ spi-max-frequency = <3000000>; - status = "disabled"; }; };