From patchwork Sat May 13 13:57:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 762015 X-Patchwork-Delegate: iwamatsu@nigauri.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wQ80j52GPz9s7r for ; Sun, 14 May 2017 00:11:49 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZfcAd6fY"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 2ED1DC22134; Sat, 13 May 2017 14:04:00 +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_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 840CFC22119; Sat, 13 May 2017 13:59:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6EF3CC22075; Sat, 13 May 2017 13:59:17 +0000 (UTC) Received: from mail-oi0-f66.google.com (mail-oi0-f66.google.com [209.85.218.66]) by lists.denx.de (Postfix) with ESMTPS id 93E3DC22087 for ; Sat, 13 May 2017 13:58:36 +0000 (UTC) Received: by mail-oi0-f66.google.com with SMTP id h4so12773503oib.0 for ; Sat, 13 May 2017 06:58:36 -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:in-reply-to:references; bh=Wbe3hlulK7YkWQ+cLzFyHKmkcRiOZCBFFNkvjpsi3Sk=; b=ZfcAd6fYFdp+Y+A6M2KCC7/1XFXVXY7au2NBiU4PF7p9m7A9LW6doEwklncn0WGDEu jhJPo1hop5W/pgTYsmH0m1Av36bsIerWZR//TyWV7MN+CEUunVxxbXcKjm/dj/kUjg5f iW1XvH+dABHsLeVoBZYXhP7+9tMhdvLm3konIo4HK61fZNYeMqUjZObXK0Xox17deXlv YADNe78bKv0r7j10hgpHcS1SgSja2D+Ofcuw+RulE/p3k5MQcCp2jytM4XhraOPf6vfc nYb/+C4LT/oTYmcW9nfk5pzpi/6C8n4zgSICbDtMR42KaPrrxPi7tLoHDVOPCcWS8+HH ATwQ== 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:in-reply-to :references; bh=Wbe3hlulK7YkWQ+cLzFyHKmkcRiOZCBFFNkvjpsi3Sk=; b=l/+Ryj7CsCN5Wg7xK+XCBERiZ7ZppwXs08smKBmXTB+N+UPEtSTUBWCyt3lR/GVrBL 76XBsAxNiuJjrNLErRjSJy+cKPS+uiZ9T1yhm4egv15P0MKHfY8sdTHujBuzx5dE/BR7 om6OzqGDQpB6cTQvIJbEuzzijL/y0nzg9mG7iURrrlPQ8sNh/AuwWM8cKjGHmtCprySf wEimK38465NWBjiJwyKU4ezS48lqT97/z5vX3ctm01WeeliD9aFKhLtjJNUr7RqHBKM4 rjOPGGKyRm7DJr9tTFrIiR10o0lCcmVK5cE/3NS+w3LleRX53XmxMPD2GesgHlLPHgp9 t3Hg== X-Gm-Message-State: AODbwcCtTAxw2HynW9sLQifTlZa4mHWw/+YgtJRopa33z+8LOh2aIjar zBG+eO0C0lKNsA== X-Received: by 10.157.53.69 with SMTP id l5mr4048962ote.155.1494683915476; Sat, 13 May 2017 06:58:35 -0700 (PDT) Received: from kurokawa.lan ([195.140.253.167]) by smtp.gmail.com with ESMTPSA id r203sm2946858oif.15.2017.05.13.06.58.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 May 2017 06:58:34 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Sat, 13 May 2017 15:57:46 +0200 Message-Id: <20170513135753.8478-16-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170513135753.8478-1-marek.vasut+renesas@gmail.com> References: <20170513135753.8478-1-marek.vasut+renesas@gmail.com> Cc: Hiroyuki Yokoyama , Marek Vasut Subject: [U-Boot] [PATCH 16/23] ARM: rmobile: salvator-x: Add SD support 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" Add support for the SD card slots on the Salvator-X board. Signed-off-by: Marek Vasut Cc: Hiroyuki Yokoyama Cc: Nobuhiro Iwamatsu --- board/renesas/salvator-x/salvator-x.c | 89 ++++++++++++++++++++++++++++++++++- configs/salvator-x_defconfig | 8 ++-- include/configs/salvator-x.h | 10 +++- 3 files changed, 102 insertions(+), 5 deletions(-) diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index 3f2bebf74f..1ee5cf1051 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -2,7 +2,7 @@ * board/renesas/salvator-x/salvator-x.c * This file is Salvator-X board support. * - * Copyright (C) 2015 Renesas Electronics Corporation + * Copyright (C) 2015-2017 Renesas Electronics Corporation * Copyright (C) 2015 Nobuhiro Iwamatsu * * SPDX-License-Identifier: GPL-2.0+ @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -48,6 +49,15 @@ void s_init(void) #define TMU0_MSTP125 BIT(25) /* secure */ #define TMU1_MSTP124 BIT(24) /* non-secure */ #define SCIF2_MSTP310 BIT(10) /* SCIF2 */ +#define SD0_MSTP314 BIT(14) +#define SD1_MSTP313 BIT(13) +#define SD2_MSTP312 BIT(12) /* either MMC0 */ +#define SD3_MSTP311 BIT(11) /* either MMC1 */ + +#define SD0CKCR 0xE6150074 +#define SD1CKCR 0xE6150078 +#define SD2CKCR 0xE6150268 +#define SD3CKCR 0xE615026C int board_early_init_f(void) { @@ -55,6 +65,15 @@ int board_early_init_f(void) mstp_clrbits_le32(MSTPSR1, SMSTPCR1, TMU0_MSTP125 | TMU1_MSTP124); /* SCIF2 */ mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SCIF2_MSTP310); + /* eMMC */ + mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SD1_MSTP313 | SD2_MSTP312); + /* SDHI0, 3 */ + mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SD0_MSTP314 | SD3_MSTP311); + + writel(0, SD0CKCR); + writel(0, SD1CKCR); + writel(0, SD2CKCR); + writel(0, SD3CKCR); return 0; } @@ -83,6 +102,74 @@ int board_init(void) return 0; } +#ifdef CONFIG_SH_SDHI +int board_mmc_init(bd_t *bis) +{ + int ret = -ENODEV; + + /* SDHI0 */ + gpio_request(GPIO_GFN_SD0_DAT0, NULL); + gpio_request(GPIO_GFN_SD0_DAT1, NULL); + gpio_request(GPIO_GFN_SD0_DAT2, NULL); + gpio_request(GPIO_GFN_SD0_DAT3, NULL); + gpio_request(GPIO_GFN_SD0_CLK, NULL); + gpio_request(GPIO_GFN_SD0_CMD, NULL); + gpio_request(GPIO_GFN_SD0_CD, NULL); + gpio_request(GPIO_GFN_SD0_WP, NULL); + + gpio_request(GPIO_GP_5_2, NULL); + gpio_request(GPIO_GP_5_1, NULL); + gpio_direction_output(GPIO_GP_5_2, 1); /* power on */ + gpio_direction_output(GPIO_GP_5_1, 1); /* 1: 3.3V, 0: 1.8V */ + + ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI0_BASE, 0, + SH_SDHI_QUIRK_64BIT_BUF); + if (ret) + return ret; + + /* SDHI1/SDHI2 eMMC */ + gpio_request(GPIO_GFN_SD1_DAT0, NULL); + gpio_request(GPIO_GFN_SD1_DAT1, NULL); + gpio_request(GPIO_GFN_SD1_DAT2, NULL); + gpio_request(GPIO_GFN_SD1_DAT3, NULL); + gpio_request(GPIO_GFN_SD2_DAT0, NULL); + gpio_request(GPIO_GFN_SD2_DAT1, NULL); + gpio_request(GPIO_GFN_SD2_DAT2, NULL); + gpio_request(GPIO_GFN_SD2_DAT3, NULL); + gpio_request(GPIO_GFN_SD2_CLK, NULL); + gpio_request(GPIO_GFN_SD2_CMD, NULL); + gpio_request(GPIO_GP_5_3, NULL); + gpio_request(GPIO_GP_5_9, NULL); + gpio_direction_output(GPIO_GP_5_3, 0); /* 1: 3.3V, 0: 1.8V */ + gpio_direction_output(GPIO_GP_5_9, 0); /* 1: 3.3V, 0: 1.8V */ + + ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI2_BASE, 1, + SH_SDHI_QUIRK_64BIT_BUF); + if (ret) + return ret; + + /* SDHI3 */ + gpio_request(GPIO_GFN_SD3_DAT0, NULL); /* GP_4_9 */ + gpio_request(GPIO_GFN_SD3_DAT1, NULL); /* GP_4_10 */ + gpio_request(GPIO_GFN_SD3_DAT2, NULL); /* GP_4_11 */ + gpio_request(GPIO_GFN_SD3_DAT3, NULL); /* GP_4_12 */ + gpio_request(GPIO_GFN_SD3_CLK, NULL); /* GP_4_7 */ + gpio_request(GPIO_GFN_SD3_CMD, NULL); /* GP_4_8 */ + /* IPSR10 */ + gpio_request(GPIO_FN_SD3_CD, NULL); + gpio_request(GPIO_FN_SD3_WP, NULL); + + gpio_request(GPIO_GP_3_15, NULL); + gpio_request(GPIO_GP_3_14, NULL); + gpio_direction_output(GPIO_GP_3_15, 1); /* power on */ + gpio_direction_output(GPIO_GP_3_14, 1); /* 1: 3.3V, 0: 1.8V */ + + ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI3_BASE, 2, + SH_SDHI_QUIRK_64BIT_BUF); + return ret; +} +#endif + int dram_init(void) { gd->ram_size = CONFIG_SYS_SDRAM_SIZE; diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig index 8cef6075e9..1478b6ae3b 100644 --- a/configs/salvator-x_defconfig +++ b/configs/salvator-x_defconfig @@ -8,9 +8,11 @@ CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_FDT=y CONFIG_R8A7795=y -# CONFIG_CMD_IMI is not set +CONFIG_SH_SDHI=y # CONFIG_CMD_IMLS is not set -# CONFIG_CMD_XIMG is not set +CONFIG_CMD_EDITENV=y +CONFIG_CMD_SAVEENV=y CONFIG_DOS_PARTITION=y -# CONFIG_MMC is not set +CONFIG_MMC=y +CONFIG_GENERIC_MMC=y CONFIG_OF_LIBFDT=y diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 94f62a7358..91307eb353 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -24,7 +24,6 @@ /* [A] Hyper Flash */ /* use to RPC(SPI Multi I/O Bus Controller) */ -#define CONFIG_ENV_IS_NOWHERE /* Board Clock */ /* XTAL_CLK : 33.33MHz */ @@ -45,6 +44,15 @@ #define GICD_BASE 0xF1010000 #define GICC_BASE 0xF1020000 +/* SDHI */ +#define CONFIG_SH_SDHI_FREQ 200000000 + +/* Environment in eMMC, at the end of 2nd "boot sector" */ +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) +#define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_PART 2 + /* Module stop status bits */ /* MFIS, SCIF1 */ #define CONFIG_SMSTP2_ENA 0x00002040