From patchwork Sun Apr 15 22:29:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 898321 X-Patchwork-Delegate: marek.vasut@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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="igzPwg3p"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40PR5B2gQ3z9s0p for ; Mon, 16 Apr 2018 08:29:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1475FC21E07; Sun, 15 Apr 2018 22:29:17 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 E29E2C21E18; Sun, 15 Apr 2018 22:29:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DE303C21E18; Sun, 15 Apr 2018 22:29:08 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 71053C21EDE for ; Sun, 15 Apr 2018 22:29:08 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id y7so20900472wrh.10 for ; Sun, 15 Apr 2018 15:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=YLCWUL+u4B0mjKAJ2K224XjSMX/fNFV3k61edkXxZjA=; b=igzPwg3pflmuOrdATkQts8vOz7/987Nkq1jI4pVxZGjrVFl/YRLrMFg0Mmxqw8KvNI 1nklEVCFeEHqzxWqOtoZAjH98vqQ1u9KCDRNdy6WPodYv+u1m8g4MCeQe6RUU3QHR1jq p9g+f8nVQHaI5k/Y6x86aoJH6gfoYRXsFxCgexCwNxVDceYdSQBPgH4vVceK+l5rYEsT YTNCmQD75Hg5W1UVBctU0WcTkUrEAovortmPifjucPqfkTdPLQcz1dLJaiSvipoBaFYV 2WbXAhgolkXz/m0+6b1E1RLZFF1dhBfo+eCieuX/d+IFnbvpRiiVjcLz9us9BCLxfn9F YrOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YLCWUL+u4B0mjKAJ2K224XjSMX/fNFV3k61edkXxZjA=; b=rm0MPwu56d9Gq4kKCKI4Yf+KitKr0MsZskcAx/5veAM7SV/l/Dj+HBvBQYVk+NhlXp lpehtRd0PwoKkFKKVHmE8ETULK6QmjUkn1hU1F2aGbBFvZHV3LIAEC0QwEmalWfkZGMp s1DxKYJ5k3ozwzDwrobaEZ11y5fE6gLKYNeQrbC7+IDAU9/1m0+hTk8RSHqWuE9p19pF FTzrShd6+pnp/adrnSoj/CRTbIYO1j6xTog2/4SL7S3hCjV1oSR/mwhWCtTBIQocm4NW uimZ86ph/FmpHLL9lHyC7hwHvqg5q8vuk88XEaDD2l0w22UV9tpP+jCYMy1fjkfzv0yZ H/3Q== X-Gm-Message-State: ALQs6tCw+9eUvYdpYZznAaRUMURa4TgwlHXLr7cowWtm3z2vYZNzLhb1 g0mR2mZ7D5Mf/VEpDht0jb38Q+jJ X-Google-Smtp-Source: AIpwx49NCeGv9F3tcYkrfRMb2KRA/V5WaOTABnqhyS02HhBM/qyxYZ1ZtmzyTpJ4O5URF4fYSbk5Eg== X-Received: by 10.28.34.7 with SMTP id i7mr8191408wmi.97.1523831347867; Sun, 15 Apr 2018 15:29:07 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id f54sm11595025wra.80.2018.04.15.15.29.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 15:29:07 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Mon, 16 Apr 2018 00:29:02 +0200 Message-Id: <20180415222902.5500-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.16.2 Cc: Marek Vasut Subject: [U-Boot] [PATCH] ARM: rmobile: Enable RPC QSPI on R8A77970 V3M Eagle 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" Enable the RPC QSPI driver on R8A77970 V3M Eagle and configure the environment layout to match that used by old U-Boot. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- arch/arm/dts/r8a77970-eagle.dts | 20 ++++++++++++++++++++ configs/r8a77970_eagle_defconfig | 9 +++++++++ include/configs/eagle.h | 6 ++++++ 3 files changed, 35 insertions(+) diff --git a/arch/arm/dts/r8a77970-eagle.dts b/arch/arm/dts/r8a77970-eagle.dts index cb76c89b57..c051cddb25 100644 --- a/arch/arm/dts/r8a77970-eagle.dts +++ b/arch/arm/dts/r8a77970-eagle.dts @@ -17,6 +17,7 @@ aliases { serial0 = &scif0; ethernet0 = &avb; + spi0 = &rpc; }; chosen { @@ -59,6 +60,25 @@ }; }; +&rpc { + num-cs = <1>; + status = "okay"; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <0>; + + flash0: spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "s25fs512s", "spi-flash", "jedec,spi-nor"; + spi-max-frequency = <50000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + reg = <0>; + status = "okay"; + }; +}; + &scif0 { pinctrl-0 = <&scif0_pins>; pinctrl-names = "default"; diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index eb8666abca..65cfc91c80 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -18,6 +18,8 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y @@ -28,6 +30,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y @@ -41,6 +44,10 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_RENESAS_SDHI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y @@ -52,6 +59,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_DM_SPI=y +CONFIG_RENESAS_RPC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/include/configs/eagle.h b/include/configs/eagle.h index 2ef0c7a777..d2edd56130 100644 --- a/include/configs/eagle.h +++ b/include/configs/eagle.h @@ -19,6 +19,12 @@ #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI +/* Environment compatibility */ +#undef CONFIG_ENV_SIZE_REDUND +#undef CONFIG_ENV_SECT_SIZE +#define CONFIG_ENV_SECT_SIZE (256 * 1024) +#define CONFIG_ENV_OFFSET 0x700000 + /* Board Clock */ /* XTAL_CLK : 33.33MHz */ #define CONFIG_SYS_CLK_FREQ 33333333u