[U-Boot,V5,23/31] mmc: fsl_esdhc: support i.MX8M

Message ID	20180110052048.4425-24-peng.fan@nxp.com
State	Awaiting Upstream
Delegated to:	Stefano Babic
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Peng Fan <peng.fan@nxp.com> To: sbabic@denx.de, fabio.estevam@nxp.com Date: Wed, 10 Jan 2018 13:20:40 +0800 Message-Id: <20180110052048.4425-24-peng.fan@nxp.com> In-Reply-To: <20180110052048.4425-1-peng.fan@nxp.com> References: <20180110052048.4425-1-peng.fan@nxp.com> MIME-Version: 1.0 Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR04MB3221; 23:iiP3z7sTZzFsgkh1xuBaAtcel55s015QB/oeSZy3S?= ZADpsXCssMEMKEYn5Y9zHZg9n4uvF54xecloZ5RvLQ5sZS8qT/+49hM7DjuVKG9uKVBjEmyGcECNYHZemf5WUZN8yoBxbZY09aSZH0FTZincl+5SVKJkGuswapFTmNfNkFVYFfQy7pA7bsdQs9rtFFgNr1soEijf8qr4FnNDzxZhA2yLM6HqmoBOXGYckOHjfDiCMDAWl8rS1UwU7zHEXipLKDs+uxeEBwnGlLf059iRVjC3YPetvoYCkv58FyT9LcA8rS24I0s5rD2mYJOsNCT/0tQmkwJ9KlyTB/No3/NI56bOk4H9WetXFdl2P8PyaQgcwBjvUMzCImEVU52B8h+2Kxn1fZmqGiIdAum9yLD/L+Hjb4KMDrf9Wp7bKVppknBemEcwj/JbZoZGpEP2sYLI+tdswVGkMOiCZjiFaHj+eDbWbRBhOBqrCFf2iiu0M5z6TwGky+Jqj+xzYKbieLtMtFmCAaMHGIAOpTJfzzbsoQxmGcd+wMqbudTiksNm68ZYwdph1Nli4WJ4+I5ODSCr9ggESo0N766r1oAMWNA0b9nGppaMBNswGEUFeT8A/EtPG17TaXGuw5hriuW40lbicJg9BPuN4r9NfaTITLaWe0p1UWxP3Rxc5KEpr8lGxF/akiyIKScE/TWUknQQCpSZy6Eiu25PwKfWPVRZGs88MkC/WQxlfIjY4rZNVD0I0TrWukn2P/oEiGpO0roQGOgBy2rl2fAvo0TwjwzWu1vHmf8IDJ98Ted6z4NlpV+xtL0fCKrNBSUKjNUe2QgmM06dhBR0xj6dGv2VFfU8M9W5eXtUUFZDH7VOHpyuRxVAc0Hr09IiVe2g6NY8vlTWFEm80iQttJ3IABmmCrKVDr4xks2YfcV1itolxIUBUYCo3Dgx7sOYjF0J2h87FCXC1prS8zl4HPtY6D7AJaozHTSozqwk4q7OKOUwx4NwiQk7/y0eHY4D9usic3X5OeTn/PmFn7hLmk5b9n753EWW+w9ZF9WF3FIUK2XyvSBnUyZV/VycM+BSMRvHboQWCk7u4bFcML0hAZDmdVR9xxaOKjNfsdGs4rQOfFccMnpP03dx3g= X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3221; 6:oXw5xX6jam4gkH2L+RieRpw/ITzJSJpzYKkTxMwWLhdiybhFjWPh3rEOAxEdXz2clg9tkzzsMg5QON1YpLbKKlP4jF7B5kWyaXEfDDgWvWqHTedgkabsZDjpIO1Fs9AW2Hqd1l4aY19Hgxjh6A0wnihQd41YyUt3onfV0IahLy5BUBtKIxOd/Yq3A3JivZRHuV1gwMAdpm/IyqTxX9JPaJ8phYyMpYCcq/QzfFGszZz/WGIKD5lZvSIBRtyyN5QLW5rIC+cHqV4tCD16DSgXkiT9WgUa2txYAFz0RG5/D1+ETKoPs6ZEVOmEKBHjD9MtjCuwEvu9VoIb0r4YYt10x9R35M5OQlyGTY8JFNA4UIo=; 5:1GU9UxWVWG7pziz96YWVSHcKSzAGDWe4REG78s6MuASClXh2k5j+VqUgCl2njbtPDWVb1/3+9FdK4NTm4Nj6UhTqT9Kmz0EpZ8lhrPjGcv998nQBAbqhBQZsVVA0GxgUYD+zkHAki7dBBhsGE7/S1Hh/8hbgJ21kQcCRbOUCkOI=; 24:KiJ98i4q2Jm0OI0OdsK7ewzV5lCtICiJapW67XREO6b7EwqXgu1pO0yyaze3ocLQcn/4hF4odqLaMqQE+pAq0YTlvCAZK3QbSX1jDvjNF+Y=; 7:Lkclww1WduFEtVZEXXPaeOkL60WKP7VVNSTwMu6h0QWAN86p8SzCLkMmzWOlPva26ILOMspuywfbBut2ksNtF23+rSf/AJhfnUopCnfJOsSSUEjIcMiTSgPtu0d5QLxd4DmygCQZ+dPNNu9Wi3FG45iloshsVpkgABOcHQSDYx/kSzNaEZWymRmF2wbwtQXU0nSXurAvECOhqepu+ZudhGZXWEA1cj2ppUYh7rk1S6rji2mB6n1OyZqLZUxMJWtQ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V5 23/31] mmc: fsl_esdhc: support i.MX8M Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	imx: add i.MX8M support and i.MX8MQ EVK \| expand [U-Boot,V5,00/31] imx: add i.MX8M support and i.MX8MQ EVK [U-Boot,V5,01/31] arm: imx: Rework i.MX specific commands to be excluded from SPL [U-Boot,V5,02/31] imx: add i.MX8M into Kconfig [U-Boot,V5,03/31] imx: mx8m: add register definition header file [U-Boot,V5,04/31] imx: mx8m: add pin header file [U-Boot,V5,05/31] imx: mx8m: add clock driver [U-Boot,V5,06/31] imx: add sip function [U-Boot,V5,07/31] imx: boot_mode: add USB_BOOT entry [U-Boot,V5,08/31] imx: cpu: update cpu file to support i.MX8M [U-Boot,V5,09/31] imx: spl: implement spl_boot_device for i.MX8M [U-Boot,V5,10/31] imx: add i.MX8MQ SoC Revision and is_mx8m helper [U-Boot,V5,11/31] imx: add pad settings bit definition for i.MX8M [U-Boot,V5,12/31] imx: cpu: move speed/temp to common cpu [U-Boot,V5,13/31] imx: cpu: add cpu speed/grade for i.MX8M [U-Boot,V5,14/31] imx: refactor imx_get_mac_from_fuse [U-Boot,V5,15/31] imx: cleanup bootaux [U-Boot,V5,16/31] imx: bootaux: support i.MX8M [U-Boot,V5,17/31] imx: mx7: move get_boot_device to cpu.c [U-Boot,V5,18/31] imx: cpu: support get_boot_device for i.MX8M [U-Boot,V5,19/31] imx: mx7: move mmc env code to mmc_env.c [U-Boot,V5,20/31] imx: mx8m: add soc related settings and files [U-Boot,V5,21/31] imx: makefile: compile files for i.MX8M [U-Boot,V5,22/31] misc: ocotp: add i.MX8M support [U-Boot,V5,23/31] mmc: fsl_esdhc: support i.MX8M [U-Boot,V5,24/31] imx: lcdif: include i.MX8M [U-Boot,V5,25/31] gpio: mxc: add i.MX8M support [U-Boot,V5,26/31] net: fec: do not access reserved register for i.MX8M [U-Boot,V5,27/31] net: fec: fix build warnings for 64bits support [U-Boot,V5,28/31] imx: imx8mq: add dtsi file [U-Boot,V5,29/31] power: pmic/regulator allow dm be omitted by SPL [U-Boot,V5,30/31] imx: mx8m: add ddr controller memory map [U-Boot,V5,31/31] imx: add i.MX8MQ EVK support

Message ID

20180110052048.4425-24-peng.fan@nxp.com

State

Awaiting Upstream

Delegated to:

Stefano Babic

Headers

From: Peng Fan <peng.fan@nxp.com>
To: sbabic@denx.de,
	fabio.estevam@nxp.com
Date: Wed, 10 Jan 2018 13:20:40 +0800
Message-Id: <20180110052048.4425-24-peng.fan@nxp.com>
In-Reply-To: <20180110052048.4425-1-peng.fan@nxp.com>
References: <20180110052048.4425-1-peng.fan@nxp.com>
MIME-Version: 1.0
Received-SPF: None (protection.outlook.com: nxp.com does not designate
	permitted sender hosts)
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 05:22:10.2948
	(UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: effbe08a-e75f-4098-2d5e-08d557ea1acf
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3221
Cc: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH V5 23/31] mmc: fsl_esdhc: support i.MX8M
X-BeenThere: u-boot@lists.denx.de
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: U-Boot discussion <u-boot.lists.denx.de>
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
	<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
List-Post: <mailto:u-boot@lists.denx.de>
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
	<mailto:u-boot-request@lists.denx.de?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

imx: add i.MX8M support and i.MX8MQ EVK | expand

Commit Message

Peng Fan Jan. 10, 2018, 5:20 a.m. UTC

Support i.MX8M in fsl esdhc driver.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 drivers/mmc/fsl_esdhc.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 499d622c6d..3a56f7c2bc 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -228,7 +228,8 @@  static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
 {
 	int timeout;
 	struct fsl_esdhc *regs = priv->esdhc_regs;
-#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234)
+#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \
+	defined(CONFIG_MX8M)
 	dma_addr_t addr;
 #endif
 	uint wml_value;
@@ -241,7 +242,8 @@  static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
 
 		esdhc_clrsetbits32(&regs->wml, WML_RD_WML_MASK, wml_value);
 #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
-#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234)
+#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \
+	defined(CONFIG_MX8M)
 		addr = virt_to_phys((void *)(data->dest));
 		if (upper_32_bits(addr))
 			printf("Error found for upper 32 bits\n");
@@ -270,7 +272,8 @@  static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
 		esdhc_clrsetbits32(&regs->wml, WML_WR_WML_MASK,
 					wml_value << 16);
 #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
-#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234)
+#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \
+	defined(CONFIG_MX8M)
 		addr = virt_to_phys((void *)(data->src));
 		if (upper_32_bits(addr))
 			printf("Error found for upper 32 bits\n");
@@ -335,7 +338,8 @@  static void check_and_invalidate_dcache_range
 	unsigned end = 0;
 	unsigned size = roundup(ARCH_DMA_MINALIGN,
 				data->blocks*data->blocksize);
-#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234)
+#if defined(CONFIG_FSL_LAYERSCAPE) || defined(CONFIG_S32V234) || \
+	defined(CONFIG_MX8M)
 	dma_addr_t addr;
 
 	addr = virt_to_phys((void *)(data->dest));

[U-Boot,V5,23/31] mmc: fsl_esdhc: support i.MX8M

Commit Message

Patch