From patchwork Fri Nov 12 19:15:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554532 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=g/fIRFbI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSx71VtRz9s0r for ; Sat, 13 Nov 2021 06:16:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27C4C8302D; Fri, 12 Nov 2021 20:15:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="g/fIRFbI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2696883025; Fri, 12 Nov 2021 20:15:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CA7EC83027 for ; Fri, 12 Nov 2021 20:15:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wr+K4mIXAYVITU466dZfbOZeFSGDYm8VetlY0vfrJlnuUwnDdqnrhSQmsfPttfq8UIkbECZZLq5pIpj3D6p/q8PUvRalZSQWE6m8JGyz6sV6FiCSoUHvmXiVxDjwodpxrU2MbujhCzMlf0TiqNMqFjRsI07AvVCfrFK5TFUOCy7A1RfTECOyu9MTV86cqGF4YfDm6a01dzlMstjmKx5YTtN5o7ZZjlRbzBcyV6ZiAoTD1Jw862iet0WeFvST8X0LhHgGrafzK+JzUco+AVehPpeH87fGZle8huf2jZbbYLRwg2/P6nMMGw+ciR33mWmNBoTC5r2xjbf+WnHnAvwZ7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jrtFUo6NQ8mlml3zqNrqNgo9+ha04ZFcA0bHk+LSwgw=; b=EG6khGQouzfPosW8motPV9KBQgnfM0y3LJSXFfmv3MaJOPFyXtpOzXLHj9oPKYC2uaK5Yi2MSHvujBesWFxy94WupKLZTPtC8+pxPFPlM3QPPeEQMHXGGXeNsxfO5ZUtSMhRW+f2mJg3LpYn4bd8bGYQyIpQ2XknR9nXKrPPFxekUrJRxE+p+9qoNEX+/zbqk/7dg7eWJCdTx4l+/O459wH8jIPdT1MdR4JdjPvXV5vqla5bkRHUzxVQLHY7lDNCqE6wf1ureM4JdDUtm488BGJ5iMb+U/U7rr/3jYVtSDExzZewsOqS85IhNImMMBAjJYe0+fmRooV9uP5cGHgbrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jrtFUo6NQ8mlml3zqNrqNgo9+ha04ZFcA0bHk+LSwgw=; b=g/fIRFbIR1eCDCauR9DnuHy+V/oPqSrOxV2NEmDSgnjga9rfhnHIbVtMTbY637hWYP2Oc776V/edfkuJZGwv7avM7ews23zB0S7umo02iTpPTwGYhJbvPleJCTkCaIgOBsI3PZ/5NIrnpHY3+wsgfYlGcdgFjZhfYvI5ec2ORaM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2629.eurprd03.prod.outlook.com (2603:10a6:4:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Fri, 12 Nov 2021 19:15:35 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:35 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 01/11] mmc: fsl_esdhc_imx: make BLK as hard requirement of DM_MMC Date: Fri, 12 Nov 2021 14:15:13 -0500 Message-Id: <20211112191523.1943825-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c4c2f44-abbc-42be-c137-08d9a610ce13 X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:218; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7q7KAaXihh7XEAOj5xnngkp+rkM9g1T+XRH7FewXlZ/3yokT2xy6B9xXMa8LDsoy2Ybud5JNIjIqqvSJxzTulvieKVDWLSfXqczuZVcY+oFBodAqzFBQ92n/6dojSmEqmnrEOE2/1DPvuPObls+dY8dd8whFGWo4gOWhIClkyAqSb8W4lsuKEAClfmnZD5HzmlTdpw1zK1zAHM/cRaONEsGqCCcCgXSdJoEpk3hXBXAE5KVFl399hFa1Yt/XVAu/ERg6KSMYDgIdJKb1xRSggHmxZK2skBqOnF2joMfq3KfpvcT6SBan9q+LvGMhrb8r5/WMny3B873LJMo1HtVbKWLiTwvgJ+UljRvrsmo/fT/xTDVxlw2Qb5+9BXzY1IgqjXSU4BwWqurm7Jv/NLR+tQOwdjWDbUYc/xuqc+/bKEcoEJOmiU+ozhHYF8EI2gxkXZS4M45ZJfBUE0+lIPyLoS4xmxKiEPqmrwF3jxOleubOkA+j2vC4hzmg0hTHol/lT+kH7FWxOLbnD/me/n/JdUoBDyjHOmmyPie+/ckhk9n4u2FG9kAiJl2vTSetcLUXHuRhZQ10SD4H/2otU6EJWRzc3DLpZ5hWYB42fe09mSmIsgwhmG1etTlk9XcKNJVV3KtZ8shDmpkOBJxLhIO5hMtXKK6OZ6Sxxmo/dx5bAb2pmqbU4bQdbJLYHe6F8hWbirEVv7Bs0AiFQ967DuedGQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(956004)(186003)(6486002)(26005)(66476007)(38100700002)(2906002)(66556008)(36756003)(2616005)(38350700002)(44832011)(52116002)(66946007)(8936002)(8676002)(6666004)(5660300002)(86362001)(508600001)(1076003)(6512007)(110136005)(6506007)(54906003)(107886003)(83380400001)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ovg+BK50z+AB+in08wE5xScG5hd3J/sF8r1vDnwTq89Jkc2eQb+DQCU4viFD1A2a8+Gyj0cgjCmEyEXVOvGNMal5T6DJJfIvO4mc9hd4YwUM1r0YhTmNX9nek7n87/Se7fLEbaH+nwKRM3cCUKFtlJriNwa0nF7Fvm+NZzCrpDcUOURSNKVedqVAq5pin/lpxhUEq/Mj1QpEktN5vkjZ/GNQO12OMNhLUlrDigymQqONkIvCbDTMUFxyCCnvlphNSpdKs9SS82cLgKn1KLvAuvqxYGK9eprlRFqbqIpFY+Ht5GWd5/PNpkyfGgY7JBrS8iRdwtfWj7ggeYukgvPXFf0ZqZdCI2R34V1gDeUR1zWkwRspSmhbZrHfRwyNVivt/Xi2iBKEq8U/lNYJiyCtHoATruGOIbXtD2CJx220EPACTa3LzrUkvpRX+qBNy3vs37oztV/ecAUkQx/KMv9+bTCYxTWJ5HS+gTNgnGDRg82n3ALYvsvUU2zX0PqYF+h8ZjCXEOPn+gTR1QejTvfIk+NOEMpaD8Ei/brPDjw16djMjmw4N04w0o/jf1lEDfQRiqlYgUzIjGUm1cyk3fBc7i4dGsRy8eXtXeYPIf0OGi0bE8FM5era57x0t6Xm5MaqfEUOSlNIMDg2MUstx8if1n9N2S0fhvBEM66c/PT5Bfxj3n9mnCjRVsVR4nzzX+/1JrRlZkroDCMSgbFKzTWjTdQI/zIazHNy3fjyOXT+viAAetXzusWz5lH/Enmvzp2g/i/S498yMUS0lsHn1DfOOFRR1gSvP7Yl1r9IzLQtyKLSEn/lQuc4l63hYA+8sggINuYA9G/1gqPNyHWplT/BCBWFxp8UnwGK0rMiaz4xvA/gLwd5np9Baf4/ms/jqm25ZgIIiHXZl7x5Vkv5/cOJn1JrFojSsjdpK5x6YDSc7SRdxhxk4jFRuHgwXLDllBTOTPM4bMjX6mc5gwCCbDcA8qwdb0GAgZpfm2YEQgxBA5zZAbJOHXOM41reooZ4GoSfFiFFwwyAIB2UIaNzvBPPo5lYNcQmHadHo+sZhHPRIcVwmNeHH5o1w45lNNs00EF+le20SqO1zyzXrZs2bOwASXy3M4AwO0hhb57yRKougxq1+ayhHmPVxD8yxXGUHuHLbHxUnCmuhauLtuj3+S+JgMJs6gEzkaVHh1m2lehsAVH+JbYiZ7T1LgMUG4Iu8NeqzmXDQiD/I3my44NIqa1b9ullsnLwL3pXXZ4cbtrHTMJy7gDGK7oWpkkJnxX/lIWbZiXHwfyrU6l6LNdknrPR3ijFcSgN3KUVQJxJ0IQG2Xb8C/TcKYid9g0ow5TgyWPb+OqAgzAtMwqzTWL3QyLo+KV/5NhqtDn73JW0EGl/5Py0BqmJl0TP4o34frjlIQVrIxVLfkAHEF6ATEk+9MBi5K3KaZXsOzG1C7k0ahAGoP9EviornJ4ldBAXust808w3djxS3iZGDqFRGIGqfeYGnbcgOnvtUgjmP6qP7IHh/tWIp/xE/uyGaQ8mSQJkRcUXSHW6edJu6B4cnG0KQb2IU+xXTxbSI2V8EPkJNFiBAjdnTf3tf4+H6E60I0z24Za0aUF2WJvHEGcGo/rHfW6qcwLqgeT3ABBa/QneuG4oIKI= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c4c2f44-abbc-42be-c137-08d9a610ce13 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:35.9055 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UAFRyQqchIuilcASbJoBHohRhUSeNYCYXTtJc5cukttbYZ23m7nNmWKuVstywMp2NjjBfXid9ZTulYvji223OQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2629 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit 41dec2fe99512e941261594f522b2e7d485c314b ] U-boot prefers DM_MMC + BLK for MMC. Now eSDHC driver has already support it, so let's force to use it. - Drop non-BLK support for DM_MMC introduced by below patch. 66fa035 mmc: fsl_esdhc: fix probe issue without CONFIG_BLK enabled - Support only DM_MMC + BLK (assuming BLK is always enabled for DM_MMC). - Use DM_MMC instead of BLK for conditional compile. Signed-off-by: Yangbo Lu Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/Kconfig | 2 ++ drivers/mmc/fsl_esdhc_imx.c | 33 +-------------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 1569e8c44a..313244682a 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -790,6 +790,7 @@ endif config FSL_ESDHC bool "Freescale/NXP eSDHC controller support" + depends on BLK help This selects support for the eSDHC (Enhanced Secure Digital Host Controller) found on numerous Freescale/NXP SoCs. @@ -826,6 +827,7 @@ config FSL_ESDHC_VS33_NOT_SUPPORT config FSL_ESDHC_IMX bool "Freescale/NXP i.MX eSDHC controller support" + depends on BLK help This selects support for the i.MX eSDHC (Enhanced Secure Digital Host Controller) found on numerous Freescale/NXP SoCs. diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index aabf39535f..0a7f7e61cb 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -39,10 +39,6 @@ #include #include -#if !CONFIG_IS_ENABLED(BLK) -#include "mmc_private.h" -#endif - #ifndef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #ifdef CONFIG_FSL_USDHC #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 1 @@ -58,7 +54,6 @@ DECLARE_GLOBAL_DATA_PTR; IRQSTATEN_DEBE | IRQSTATEN_BRR | IRQSTATEN_BWR | \ IRQSTATEN_DINT) #define MAX_TUNING_LOOP 40 -#define ESDHC_DRIVER_STAGE_VALUE 0xffffffff struct fsl_esdhc { uint dsaddr; /* SDMA system address register */ @@ -157,7 +152,7 @@ struct fsl_esdhc_priv { unsigned int clock; unsigned int mode; unsigned int bus_width; -#if !CONFIG_IS_ENABLED(BLK) +#if !CONFIG_IS_ENABLED(DM_MMC) struct mmc *mmc; #endif struct udevice *dev; @@ -1506,9 +1501,6 @@ static int fsl_esdhc_probe(struct udevice *dev) struct esdhc_soc_data *data = (struct esdhc_soc_data *)dev_get_driver_data(dev); struct mmc *mmc; -#if !CONFIG_IS_ENABLED(BLK) - struct blk_desc *bdesc; -#endif int ret; #if CONFIG_IS_ENABLED(OF_PLATDATA) @@ -1607,25 +1599,6 @@ static int fsl_esdhc_probe(struct udevice *dev) mmc = &plat->mmc; mmc->cfg = &plat->cfg; mmc->dev = dev; -#if !CONFIG_IS_ENABLED(BLK) - mmc->priv = priv; - - /* Setup dsr related values */ - mmc->dsr_imp = 0; - mmc->dsr = ESDHC_DRIVER_STAGE_VALUE; - /* Setup the universal parts of the block interface just once */ - bdesc = mmc_get_blk_desc(mmc); - bdesc->if_type = IF_TYPE_MMC; - bdesc->removable = 1; - bdesc->devnum = mmc_get_next_devnum(); - bdesc->block_read = mmc_bread; - bdesc->block_write = mmc_bwrite; - bdesc->block_erase = mmc_berase; - - /* setup initial part type */ - bdesc->part_type = mmc->cfg->part_type; - mmc_list_add(mmc); -#endif upriv->mmc = mmc; @@ -1730,14 +1703,12 @@ static const struct udevice_id fsl_esdhc_ids[] = { { /* sentinel */ } }; -#if CONFIG_IS_ENABLED(BLK) static int fsl_esdhc_bind(struct udevice *dev) { struct fsl_esdhc_plat *plat = dev_get_plat(dev); return mmc_bind(dev, &plat->mmc, &plat->cfg); } -#endif U_BOOT_DRIVER(fsl_esdhc) = { .name = "fsl_esdhc", @@ -1745,9 +1716,7 @@ U_BOOT_DRIVER(fsl_esdhc) = { .of_match = fsl_esdhc_ids, .of_to_plat = fsl_esdhc_of_to_plat, .ops = &fsl_esdhc_ops, -#if CONFIG_IS_ENABLED(BLK) .bind = fsl_esdhc_bind, -#endif .probe = fsl_esdhc_probe, .plat_auto = sizeof(struct fsl_esdhc_plat), .priv_auto = sizeof(struct fsl_esdhc_priv), From patchwork Fri Nov 12 19:15:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554533 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=WTkZIZ7r; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSx964gBz9s0r for ; Sat, 13 Nov 2021 06:16:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1A2FD83025; Fri, 12 Nov 2021 20:15:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="WTkZIZ7r"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE08D83039; Fri, 12 Nov 2021 20:15:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20611.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::611]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 83F428302D for ; Fri, 12 Nov 2021 20:15:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BloIWAf8DkGZ8oJibUKuK1E5Z1AWWQ5iEzy4aXL2xh0NI4ZxihmHpQSj5v1ZyCOhchvkLM1VkU12d2W1NpeE+qlAixmkSQgkEZjrtZpALMONhtsONAh1qWCcEB5VSKHSklVJENVXdx8zF51ZCH9lHmrG+fyXLekcCrcsvRp2YCCXA+9+BCRJAKHIe1hes64TQy2EgA9xuli3VObMnX44h1hcFx9ErWReEjqUWcXf/oSNrAh20MCZqldagZqdtQ+cKkkSoAydUqjKtdqodCfQaIOVDwg3/6QqtA3hd1/o5aGSsE+viTzTrnMygi0T+iGhNYIfEeKGU40MNDcN+33+3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TuV9B1hPyWpfEVSa14p9Pd2FnFugZxbqFAyWgk4uBc8=; b=nhW0ZVW+XEcAGTcPoEH9SWr5l6FblpUIlGOq58wXaV+oslafU+2yP2tijN0kRn/l61nUjrtBjCr4v1x5Aau1tOWqU4UN/LqPVcbO3s8l0+7WU/pQLU0VUnx/BIPWAyb4MASU3yxVBb9M8UETm2lgfhdCCbuoW45Il++744HSiWjnlCIzc3mZSS4s9dRiD8GBX0qojWsJ9bTCTOv61nM3fTYHnVmbhbbJZ1cNBh0sIKpghga4/lG5gSyISahiRU2kiQif79CmAqe/5MDy8uFlOu8sbI3uVDPKQuif1CxNWJFTFsRkka5kP/kUG9rp/t3E5yKc6uhbr6GVPMfPWF1PVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TuV9B1hPyWpfEVSa14p9Pd2FnFugZxbqFAyWgk4uBc8=; b=WTkZIZ7ra01Of6Az4GnXKlPj48NC5EViPyA7rkxdJ/5tGl6fB0SAmNIKrl+GH71ygfYao5ijLOcShEwzeM2T3RAdJmaZPQ0reUvTxuy54FeM2Px1U0DwOTylmAF5X0wv6+elrfAB0iAUbWBnwSfOO83kD6mjvAhOS+rA3fVIsy8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2629.eurprd03.prod.outlook.com (2603:10a6:4:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Fri, 12 Nov 2021 19:15:37 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:37 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 02/11] mmc: fsl_esdhc_imx: remove redundant DM_MMC checking Date: Fri, 12 Nov 2021 14:15:14 -0500 Message-Id: <20211112191523.1943825-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c054fb2-4926-4319-3fd2-08d9a610cefc X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:46; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3jo4Xnxk90N3XKCA2DwRt/jewdlKKifEEehBsyrvXJV3vkTOzWS/ZQvaIBfo2Q5JRJ2k9GygKIFN6MWOUkBbEEJsew1cGAK9L3OWIOGoNEK2Q9PUoX+i2vjEJ5uoCHogvwIyaFQttKlZYN2We0d/FS524iOs0+szna0usvgrMsR9VbNLAqWJSiFh4t9qHIBVlUplXw1DYoMkadYXqyLPyqWh1L5UpsmJi+cBZ05b+Ro6ud1Jp9FqoRNyNjsjDGvTqyU7FmtB1EOc+55IRjhHW2Uv8a6WxRM1Y1+uzwDDqm7dupBAXYJjGt9uBUvrn2x4lxPx+O7+w/YE9Lc5o7qWcg1TbIV4c1CJz3ahsGD8xs4nPJZHheYK93BOjVI83oWgbqXz9j//iDf4Fk4sSQvj1NM1OCvjsfGSwdnnwt+UbTFJh3Q7icV7MTKPWb+0Osz9bdrwrBTlL0gTsOhPMMscjSf2/fFDaBrMLo1QbPFoIsTqf7R1JsTgK+Fk1ZNFldtQ/ZFxGdkolE6pPOGTUbtzkZncO/bcuhGcm60Y362fk+EPgIvuLhyh4CeOqKp/GfPZ7M0nNqWwPgYjJ4RmT7e83tXt7OmwLTVqLjkYI+eJ00wwvyZsOlPJ5BOR7HTz+rVBmG4juM1QsQMgBpEp01J9+QZJNUPfzun+fkHT6m5adybqPUl15fZUpBnP25vcVS8k6aFgdL5xAXOHYi7nfqpkCQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(956004)(186003)(6486002)(26005)(66476007)(38100700002)(2906002)(66556008)(36756003)(2616005)(38350700002)(44832011)(52116002)(66946007)(8936002)(8676002)(6666004)(5660300002)(86362001)(508600001)(1076003)(4744005)(6512007)(110136005)(6506007)(54906003)(107886003)(83380400001)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DEbmX7xi35LzKDOjJlcmneKWPzzi7upG5FYPYHb09erxEwueEdDJvbb8kzjq8qIWK54sVVimch736Nwuy1HXBzU09uToLmZ0Q6dz3qXlDcUL0Fa751Xy+vU6l6yuGK8RdzDbnnBLGyf2GRnECPTEVwooMpT46ViRscXKfSn8yFVpynPq1JrTsrZMEADNKrzNO/hEQLtwSfNcTg4Qf3qCF9Je7fzAtRAq4k0cSJT5mr6FzV6a7TKYwARFf66n+o6GyMnRwqk99vg66xz65pM7BEMn5gYNkHP6RVm6k0e86GcOtU4kLnWM2wZg4lLn869En80w863yrfNIQOhl/JmnQbzD03D54rfnuR//lfm0lLlzTnHdD/Kprcy5yxsCu+8NhQbpW/zJgFClZvNW2CD5KWoBJTAw+VQVUrzusBO5mFE94p5bokySxod49XJdWSEmD/GCzOEOYJlWVczIfsDhAyVsOn9Ffox1xo+9Jjcasox3Ho9tzGhfGivrvmWPGZDbHWkohw0d83fWO+PhQ+FZGiHsi91yoynFshuICubaD68FvWjWl5rr7cQdumHqbbrnpXo4rwec/l+IgWdwIz0kOwzzikz6aJypF5d0Ki3qM5038VeFj+ebUD4J/Za/y0P/POzEhHq7WFDAtIAsqy84yE83EjvkMlA9i3jICSN8m3hp+Y5XTLYS/FUBYB0oTl7Nv60ngJEy4JwVh1WceMqBqUkt8VNHd0dZJeI1NUbKH+4i6EzR/AxIc+a3p3Azbapibm1v5eDYRDIpMBiQpGu3gVi+6At/Pgmld9TbrDDbywodsgM661quh3we0C6/g70832gOpKZguzXTViLn+6WXU/mLS4Bi92MISg4F/DRbO67nbfm0K+SyUJ0Mz+/FfysqeQNkBwqqiG9NEZLQepfkQUNXPi54hldxM8GTXA3iSyUxBfqwKV6QJelNnkuWSZfOtY/JcVzUQiklZq5TCjuQENK+wodxteYCMrdSjs0tUu7w5hmLeOUsGvxuRA3Y2Eq9PYbL2cYcjmB9wF57mgIpw0HKnzHXpxTKKpz3SybuJJn3fclesck/flAeQNubfRUPPNV6TGNixaS+1qNVbl28Q3Uv1osGhzuDY1ejTzFajFZWEJkZU32llWDIWGKnCsixgNqZXfJhcmvV0n6L8dilvmUfSQOVqwvX8R/ttWclWQAA3pdw06Xs7DpyQ+LbD6cjEdm/PlAJ/Dc1vQaXJ+jtyA65YwXh9chw/z0OEdkqZQrHxBszGsvCpMkRxiTTlWdLBwCCVyUq1Wp50s0MPhs5u0nFFoYWkRRABei6b/ZZRuL8xcURuAD0DfyqN7dCZNKM+J43alGEddoatesd7jGEccgaf3qJq9Mk4crb3xiYnxNbUaBcjqph5rfmBpVewet60b6HvSKQ87OnZRmEXS9quIhNKHrxyyhsAwy+u+v/KNwJejmWyvWnW/alU9t2G23qPlXaTKxoaGvvFkaA73HDp2VKTeIoQgZB3HIQl2QNcU9pTOgD73aeLG9NpQHT3OFtLk3ykD0jZNi+MHlaJjDrD5xb2mKoHYplcepY1iCfEzPXLX1kPJ7N8wYwfKpua0nqKtB2ZDQywVdZN34fLBHbGwwmiOaotofkUNWPGbb81k4= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c054fb2-4926-4319-3fd2-08d9a610cefc X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:37.4411 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: S1ZxxafFzyWMus6bZx95CmaTyeLQJ/GlROmmC/+JeRQEIqnPwej8nch/siBsf4hrBpRowN9b7aSO3MmKv3qAyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2629 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit 2913926f3b3dec282f8773e3c02377c9600d8267 ] Remove redundant DM_MMC checking which is already in DM_MMC conditional compile block. Signed-off-by: Yangbo Lu Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 0a7f7e61cb..40886f37aa 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1605,7 +1605,6 @@ static int fsl_esdhc_probe(struct udevice *dev) return esdhc_init_common(priv, mmc); } -#if CONFIG_IS_ENABLED(DM_MMC) static int fsl_esdhc_get_cd(struct udevice *dev) { struct fsl_esdhc_priv *priv = dev_get_priv(dev); @@ -1671,7 +1670,6 @@ static const struct dm_mmc_ops fsl_esdhc_ops = { #endif .wait_dat0 = fsl_esdhc_wait_dat0, }; -#endif static struct esdhc_soc_data usdhc_imx7d_data = { .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING From patchwork Fri Nov 12 19:15:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554535 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=kxYnGKQ3; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSxg4Ggwz9s0r for ; Sat, 13 Nov 2021 06:16:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4A2658304B; Fri, 12 Nov 2021 20:16:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="kxYnGKQ3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F0DE18303D; Fri, 12 Nov 2021 20:15:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C1ECB83023 for ; Fri, 12 Nov 2021 20:15:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PRo8xgybKH8rHzpWcYs7PnaTpiKG8R8gRv6Mp7eIwE1FvppYq0YJ7u2n4JDElDQFACTxxI89WQFu7OQUKQW444n0D4bAW545viLTuw1vueSdG1OpB9yMSoHIygb71reNV9COIlFKrveQDYV9szVqCb6QIu0mjiM9T7KTElH6I6lAcTSUy2MsB0OegiPT90vf9D8Y4fP+mWC8y6LTecM/iZL0GjHaAjMs6tVZwrn07uVXr7p5urJFd7FnxDz1fcXfp0lhEGLKfddF/VQey6GubLcjRpDQ5W1vKLdVyE8n350Irt4wHB6wadPAjdh5xtuL2J1k3rF9ZL0P/9T4YS8oUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H7bbuILpivJIOXVb4eTiMWfk+z78a1tpzXDtoBAi2js=; b=QODQW230Zw4tyICQZ/DHRwREVbK37uVs196UMhs1BrbB9dOObPmlEmZ8d6oec/qPEyBfO/wZOtKyOD0g2rcScMO5YUq7MB7zffEYruY2SoYQ0pgYfTuyvH2th3Mw4/LXE0UyMEaaycUaZF6rJYNSolraDoyAY9CIuIG9Xzx0mrgQK+vPFba8hUoTh21VXlQXqjuRAPOFQ1++/mlwHGAw6g19dV7LwG/Xc1To08J+4B+7ZKb5ye59zXZ/xbT9q2nOhX/rq83bqtQcuiUWULST5+3X/vzL7sgv3utfWA3gASW6+dw0KGBFP2fTu9HWk1+Oxb8Htiecks/G76dF8ydgmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H7bbuILpivJIOXVb4eTiMWfk+z78a1tpzXDtoBAi2js=; b=kxYnGKQ34lm+2i+jijyt+YwYwHYWajBuhKAK3rrMeKP6p8SFHF8xNx6iSfNO4C3fnwsHnOOt/PDqYMBM6On/ipjLKW88U2FkuQoKaxL5ZML9WnRs62ipCFpkNH0Z5yKFbIW+c7gS9CXGeZ6vD1zUSIIfsbraQIXhgyI3rMnCrtk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2629.eurprd03.prod.outlook.com (2603:10a6:4:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Fri, 12 Nov 2021 19:15:38 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:38 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 03/11] mmc: fsl_esdhc_imx: fix voltage validation Date: Fri, 12 Nov 2021 14:15:15 -0500 Message-Id: <20211112191523.1943825-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7314d724-29e7-4c40-a860-08d9a610cfe5 X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:114; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G/j2kM9qkNDc8yDFPgMLHNY19MwjVoJ0DNg6ucuKcBdbSbL+U45fba7QzPCC5mZarGd6VR6r6Gi/JZu3gnKWnWZdpmDoO+qhpVbG0r7+GwiGyApBP5OcqW+yCMvgnUJLvKEGeN1ES1gHwGU09bloAh37nizOMpS2Et+/lknKvFO8Y1rCvlO1XGZ1IvQ3ZS7KImK3wqtPok1W31h62+lWJTlKZ6/R9LmbwZhnNuYCW1fTqsGg64Z+2aYEx3srU6ymvt4Wschpaztk6WUHyszOBFwJ+EHrSA8DSii9AulWJ0Y2DJzayDYgbfmDaQyv64F9+lvsm3EGqHvGE91nTmIwXxvJz726wwrmYl4de0FkwjyAxBvO7QxEZP1YK4GF85rbVjGvTz6TzzDFzoEyC28pyT8IZOW+zRkVzBsVucsfecVCUB4OgnImG2A06180pmNOa8ot1dNVx5IoOASqeOeS2/rmqlYF6oXNvNF/Eeeu6Pz2AaNUneg07IUclfL6TfVYHzHJR7GX94pwZVK2hzP1cViTirFmt9/oko4KUmqDLP8ibBPZMO+xpIobO2n0As+Nc1IlmbzVz/v/X01bsCeGs2Bah+AY3jOHxebcg/1b+zXr2wqOPabwzGa3nwZeEx3xBsPqtq2ppEXigL8Ae8L5R5jEhEud2AokRwIBUf0HqWoh5mBND8kem6dx1wB0sIj7YA4Pd4tm1a0MDZbYr7quAw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(956004)(186003)(6486002)(26005)(66476007)(38100700002)(2906002)(66556008)(36756003)(2616005)(38350700002)(44832011)(52116002)(66946007)(8936002)(8676002)(6666004)(5660300002)(86362001)(508600001)(1076003)(6512007)(110136005)(6506007)(54906003)(107886003)(83380400001)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Pk/aA/KYrWskz/Cuu23DSEDW/4+3huzzzaJ+Ak1GUg2sG4NEGesJwaidd9ZG/Ea8orExtz+kzvHNFdNv1tCTDl+csRAUTnzOA37ekKgVy4OUWlhZU/GVSu3KdhZLdlAvRaAard8RKlrE+IPvAqPW3148/6Ejdfknr97wRhr0U429iS3HN9MxzRBKir802j3onPqEFvV8Rb21/j9lHk2XDmJhshliMR6WzSfvIvd2zGWPFyhYvMuwtcHDT6LwyZsymOPAbXB3zuDQFhOS7zNu6AIwXKUEOhwH+oKmqjAweMJPCk0mIBIUtu13/aZO/l20bLWhimW2HaUrn4ZD6YbDIV6XccDFABpwfQNKoLjGAzRKv/KZFMZYzF0fByj5Lhty1zBy+9T4YIYwFgbBFxrzRedvZi9DHZYR+dzKAMPzIzPBB+FQFBgujEV7rv1lvOWUcqEvuRt8gjwpGUGFbDWx3TlO15r/Zqup0wFNk2AxCs4azgXqaQiNdrPA1przozJQ8EuDeC99gS6IS4UPwA0alfv2Vq/g9IJMl6NfHiaIwBR2O/aHidHuJGUBt80XlA1F3mBNfNIm5y71z1qJF47MaESnHJcZkuRnS9g2Tlt/Iyy/9KOGa+PLsce2yohMVTfqZDjGXADQx0po3SCN1T1qJ69jLt95k4g88++Ktk2siR1zln/bXFA8c+F2OObiX5HcHvQ87Ymek+s+cjvlZ7BqKM+u71ucHfrzACV6mCoTJjCoP1xhoZGrnaOYDRuHuR1Lur8RwV4H8p00XxMHVR76+wbqkdT/vx5TT4YoocROThrThaysdeMxDNRXZohVEk+BVuv9shRoQAqatiNp2o3ipb9Bs7E0ygLhsfIJ7PGX+tlu1+vznegG8C7h3OHtsdeXMdkrtoXD/X6M2puBndhUfyE9VbF5cn2IORvd19BREWzUe6dWuXRTJh+2Z2P8RQOTSkg+pI3uaJtyS9XMuXx86Kl/4G/5vCqrYqpXXXihtwhvxK7/ELvKNvl8ShMNObu4WdsZB9lKC4jNhbjcwtjE+6GYRIJnsU7TRnREPYKP3NFmr6lLi1up5o+9m7En+HO6TjwaNcgxxQ0KhJ/OwDA2i4J4Fkasmfp49RZot0iAOuEJ1r5l7hPQc5+0xdJ/SvhUoa22bozxGBfLSM0nKjWLRirWLR9W3lqhHCv+sWXHIRWYrTS+BVp+i01dhQJKAGRumXNYYqFgpjHiR5DQsCYgtH53MTi1ydd/Pr/ztMepqLtcMvpa4TO+J4o4kJ9rH0HXxc3+cuWdLtBtCEbBa/6zpO/lnALMAtUy3cYvtIfwl828VyDtZUxpcSFrT9Ho1K3kPrO8NybwbGlIyrMit1diCYzME39RTVUrY++4nZU0OzeUE+Ij5AdEwtXH6WOW/MMe3gCPhhQpORMRbRX2BK40FoxSwn5GBa92qAgooWNkPcAfQK2GZBZDapiqoLaYf8ZjrVVn4A+IFObL9ENe43vbTOYK6HZJi/GaU+admf3Ihp7TfPeh1A/ToH4KRm4lguBqlh/Hg3oohX/bT9cVRS9ua8vOsmtuUy1tpSNMaiKIYykIkPhq8YUzKLoVuuI+W8rKlj7fK372fQphsOw1h7CgZpDSXCHvtEl1j1/rnf9gQ2Y= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7314d724-29e7-4c40-a860-08d9a610cfe5 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:38.8370 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WwYKitsQ3a8d3SNHyf/kBtDBCiRoI3i0LtUu2OpCM4UWTyBxRIIiL9oaZaFrzsbolRRFS8qoSBMWHH4Mr86JSQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2629 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit 5b05fc0310cd933acf76ee661577c6b07a95e684 ] Voltage validation should be done by CMD8. Current comparison between mmc_cfg voltages and host voltage capabilities is meaningless. So drop current comparison and let voltage validation is through CMD8. Signed-off-by: Yangbo Lu Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 35 +++++++++++++---------------------- include/fsl_esdhc_imx.h | 12 ++++++------ 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 40886f37aa..b91dda27f9 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1164,7 +1164,7 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, { struct mmc_config *cfg; struct fsl_esdhc *regs; - u32 caps, voltage_caps; + u32 caps; int ret; if (!priv) @@ -1203,9 +1203,7 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, memset(cfg, '\0', sizeof(*cfg)); #endif - voltage_caps = 0; caps = esdhc_read32(®s->hostcapblt); - #ifdef CONFIG_MCF5441x /* * MCF5441x RM declares in more points that sdhc clock speed must @@ -1216,31 +1214,24 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, #endif #ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC135 - caps = caps & ~(ESDHC_HOSTCAPBLT_SRS | - ESDHC_HOSTCAPBLT_VS18 | ESDHC_HOSTCAPBLT_VS30); + caps &= ~(HOSTCAPBLT_SRS | HOSTCAPBLT_VS18 | HOSTCAPBLT_VS30); #endif - if (caps & ESDHC_HOSTCAPBLT_VS18) - voltage_caps |= MMC_VDD_165_195; - if (caps & ESDHC_HOSTCAPBLT_VS30) - voltage_caps |= MMC_VDD_29_30 | MMC_VDD_30_31; - if (caps & ESDHC_HOSTCAPBLT_VS33) - voltage_caps |= MMC_VDD_32_33 | MMC_VDD_33_34; +#ifdef CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 + caps |= HOSTCAPBLT_VS33; +#endif + + if (caps & HOSTCAPBLT_VS18) + cfg->voltages |= MMC_VDD_165_195; + if (caps & HOSTCAPBLT_VS30) + cfg->voltages |= MMC_VDD_29_30 | MMC_VDD_30_31; + if (caps & HOSTCAPBLT_VS33) + cfg->voltages |= MMC_VDD_32_33 | MMC_VDD_33_34; cfg->name = "FSL_SDHC"; #if !CONFIG_IS_ENABLED(DM_MMC) cfg->ops = &esdhc_ops; #endif -#ifdef CONFIG_SYS_SD_VOLTAGE - cfg->voltages = CONFIG_SYS_SD_VOLTAGE; -#else - cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; -#endif - if ((cfg->voltages & voltage_caps) == 0) { - printf("voltage not supported by controller\n"); - return -1; - } - if (priv->bus_width == 8) cfg->host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT; else if (priv->bus_width == 4) @@ -1258,7 +1249,7 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, cfg->host_caps &= ~MMC_MODE_4BIT; } - if (caps & ESDHC_HOSTCAPBLT_HSS) + if (caps & HOSTCAPBLT_HSS) cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS; #ifdef CONFIG_ESDHC_DETECT_8_BIT_QUIRK diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h index 45ed635a77..1529b8bba3 100644 --- a/include/fsl_esdhc_imx.h +++ b/include/fsl_esdhc_imx.h @@ -164,12 +164,12 @@ #define BLKATTR_SIZE(x) (x & 0x1fff) #define MAX_BLK_CNT 0x7fff /* so malloc will have enough room with 32M */ -#define ESDHC_HOSTCAPBLT_VS18 0x04000000 -#define ESDHC_HOSTCAPBLT_VS30 0x02000000 -#define ESDHC_HOSTCAPBLT_VS33 0x01000000 -#define ESDHC_HOSTCAPBLT_SRS 0x00800000 -#define ESDHC_HOSTCAPBLT_DMAS 0x00400000 -#define ESDHC_HOSTCAPBLT_HSS 0x00200000 +#define HOSTCAPBLT_VS18 0x04000000 +#define HOSTCAPBLT_VS30 0x02000000 +#define HOSTCAPBLT_VS33 0x01000000 +#define HOSTCAPBLT_SRS 0x00800000 +#define HOSTCAPBLT_DMAS 0x00400000 +#define HOSTCAPBLT_HSS 0x00200000 #define ESDHC_VENDORSPEC_VSELECT 0x00000002 /* Use 1.8V */ From patchwork Fri Nov 12 19:15:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554534 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=pUbGufa/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSxN0dtQz9s0r for ; Sat, 13 Nov 2021 06:16:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DF1A983045; Fri, 12 Nov 2021 20:16:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="pUbGufa/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9DDD88302D; Fri, 12 Nov 2021 20:15:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1f::626]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4D6A983027 for ; Fri, 12 Nov 2021 20:15:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bfMg9uOcwhCsqjwCHZgwAguuLFy6vLnS8A29qdAIJ7rajXqXT9o5Lme8InAUaMNw4vCqQYSyY02bJYGnfB+WU6AWqbAS5WGPXZVHIySlp0/2EIbV69SXqMCCOWoyWRxJsDsBGi+ttmR0GGaHVa3/q95bxwHSFdWrUhh8aTrHqlvwxuMHpsXJXEvA8XuBMSL/WqRY5p8+AzGoJkVjo2gdrNFojLvgFARoBtrw2E9xegpi9yAFOFIgWH5AU1nvUqTzw84Kry4aK6N7XJXT+LyxEQKaldl2U+KDFRKOHWqeMmtr5Ky4Ip/aiHnTDPVDybpevKj8kUuC3nGFR8uW2835RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gjEdnqVttYodLmoFpGPBNihFmTam29Sb3DFMS4gAm7w=; b=Ik5yFG2QqgUI1CJRAyJyj0ohSfN2ULj6ZUQwmXI/xSR7lq5NCRx2s6KWpFw+GaIQVA8RIc/H3QR4iwu02OtimbSmYqg4BX3/nKrmmFNWNzaZ3BePiB0gwpIRVZFebUGqKxEYGgAiNrUETuiNc8UuM1sLpzSPfP8v38IYMkhf+xSb3NumGNATAs8kV6ehyGD7MvdOO/+rlDZBu2g2B+2P0/1vgRtaA/4VcFT5Z9ggY5Fq535FsD90XNZpRORynCqjlHZ13ZMWL9iX8Mf1kzPHuaJv6aLkpC0pUNWVFLIGW63bl6eoUOAwHBt+wxbpPd88wTT0JhUBjTXYTHMMR/2+pA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gjEdnqVttYodLmoFpGPBNihFmTam29Sb3DFMS4gAm7w=; b=pUbGufa/gDIdUr0knLf5jG673ZvmHQzFyHuk6pm7G5bqZ6/UykcMTIrsWOId04A8NG4WddL/z5JgYnZhe7062iGo73W8b8A3pXKG36LwLT3G6piX0gIR5lBPA90+VTKT1AB8RWqtz5IK32XSO/V3+NOjR7oZcmfxB0DMagUxs64= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2629.eurprd03.prod.outlook.com (2603:10a6:4:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Fri, 12 Nov 2021 19:15:40 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:40 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 04/11] mmc: fsl_esdhc_imx: clean up bus width configuration code Date: Fri, 12 Nov 2021 14:15:16 -0500 Message-Id: <20211112191523.1943825-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d6dcfa2-3824-4312-12fc-08d9a610d0bf X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:93; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g1eosMgG2YxMMhrFeVEZEl5wEd8BaVfQ7/+7rsX0cEVoYd3eBQoQ0dWk4D7ZCbjRXvWPU8Q6Iu0mAjwOouSPUYFZeAvDivqQ+62lD7+GnyS9zhv7OfN0LBccAMuPAErYcWHL9akxwgiLhAq4h7cfGgr5I8CCXkMcnXlgDDKk1p/oLnZRJRsMkwY9K7AsUmvvDBDDuruc6a4MdFvaAnSzVQhmmS14lIpL+ass1SizDj19ZK+BbrHBvrvrXVZkHgXGfeHnCZq0sPtCEL4bb8PqB7tJiPBcJ0DO+N5CPTsaKT6ZvnQW5xP2alP6iQYTkVIfPkwCUfMeZXHq3OYqzB8HTTyNecYTPMtmHZ/KRvBcoX6YPJ5cysFHBL3Yar/pzhQVdNtA1SeHbrCclk+T/un++j1attXFExjwdNe7KkCgQlOWjyRkPWHXEdariGNSQI/VCHzohA5VXAB1Sshj+aWKwyMyjZphwpLdEoG9tdxG5PkqO4eWxzoXmnrfFYn3skrpSD3CLLHl+/WhMY1Ije/J3dLC+7Bl9B7gkO4omA8Tj6aB+OjDSTfAENAf/NEKGKIyA3wwqI3gK8BZGkQLZdDSwqSwD21sWJviyeLOF496/OiYcI6vYgMfaoOeQk+lSUFizFn3L4sAM7zccP9WRRSgBkBWznVhP/beUtBJat2q8IxbcUNyTw6LXpmfwHOs4o3fLjR50nZDOW7Bwc3z1c4VCQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(956004)(186003)(6486002)(26005)(66476007)(38100700002)(2906002)(66556008)(36756003)(2616005)(38350700002)(44832011)(52116002)(66946007)(8936002)(8676002)(6666004)(5660300002)(86362001)(508600001)(1076003)(6512007)(110136005)(6506007)(54906003)(107886003)(83380400001)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m9pfHb8mPfDlxvl+GlhcVt5TN5CH/a7V4vIPMCADG+GjNE97dDnk7zSz/enmxgYTv1ZiYbtKc9TBaXC6GKyoea2WFfioua+YFMQZJLx0TnIo+lc1STRwE/JXQ8OKxpCWJOQ7SmZxO6UavUAdMzon5DathXPfDP0X6owwzUsiGQKIlTng3jAfq9G537wCbiF1AKvbUwKFLHggdiFB0F5YcuKj7WlhiB0TSN31vePYyZuk1/6mn+US5Y5vtb6Zc+/aVKUdHpEnGqslXXoIkzNeU/6JO7NYhruPkvMsRo8qcO0bBfTWy7bulW5TJpBCbaPZDMEfnlOo7GiNN3lOW42URW22Mic5kVCpyU8KytTCqXyYRkgxb39Tz2lLqsA4kXOLqRwTt9573Zx+U5x3VeFpj7vivIpUUJp0Z67l3JTOZXBSbkfBVa49DM3U/e4d1ApoMx6WaD3z7zHbJL3Gst/2UbXLSExSFHF7+6oiPVeODwSpJ2iBeihdXl4LhiM5VdWGn7ONvCGfRRzJl5Dl7nBwKxGPdUVxmDgJ2jpnICl07lMyJ5MSKv9fl4JZWWAiBGAIzv/CNKlMGzsUFbad++gLGGPr13JOTgmC0Xmz23kNLA/uKmYQhyPtEwNB70v9LfHX4jpK6w4fWFfAY12yk3mPhJJLe7h8mIJxgP0xrMt9w7v6Xdj6BAttDPvEzsNj1xAlBwE6Fb3OUQNVPg3KzoyLFofTLbNz1ufqVaus15lY9voZaOsxpVY+zORN/BkM/gIsrBPMBXdZdLJAMaFsOxubCq2IlL0RzVedGes+IEwVVmuqHL/O2156eeZ0brG8BVyksu6Jvc/tM18h7DhxjdStvUwQ1oiZf7t6KIvz96Kch1ofMM7pafJW6+GYQFIOMRThyNPROw6vvdlgv7qCQ/nS5dugqznvcsw6+IFnSidF2qKic9+7u4Cr4PhIXWBjReSGGCFtiC8I892/mp7o13LltJedM6mV4U6EqID0EZkv5m1FpyHPSHhZQwdLuu5BwfQsPxP+8qwqFh+PXMYXgBiD8BRUBq5bO35QPgvFAWc71awYF+E3yyU16kVmGe+Rfhwx52omQQyw18VjnxWLC6W4504vf3f8mGWzz0WSvtq+u97TJcsjtplfcRkRD0n+XydZhr7lXwuLXbBpDKBwr5lQGqY/Gq3fHngpwIVddBTL6VkBjCvfogmai925VAxHdNkoT1QTSSEcdxOXwiEUe90JWnF2+uRRgVz/4JM5zhXyMXBDcdbaeitiTO2lVaCjhl+PrwbFl9dh7qeQgTC6//wFnZxQi5/b6CZ2NaUgV/MYRPcLLavmhcZej64eOrOxJogKJ1q9p9Iu8AHg5U3hc/iRPr+1TpsU7qVgybxZTdwuR2FBVoG1UNAybLHYXjsQpI9uWT0C+Gx6/zL4w1QIPZxq7r+lahorGCg6ux+E9mqgau4Xq2KtDP/AoRoBLunuH5mx2U2ERso0FDvIQd+GL90YtwwMhz16eLepWmzkiWHpbLVbpvNkTdCtveXWeZAh2xIq43ErYU3wEjlTue7z/LswfDyAngOpihkEZY7nXshNE4RsVqzOHj4JL3mnS7zQTfPJHf1vtY4ieGM2iUqu/S2G3reGMVPiL0oXfe7PySU5qBY= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d6dcfa2-3824-4312-12fc-08d9a610d0bf X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:40.3153 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OGV97RZ54ad6gpGKuJgh5CGnbI7QzmlubCCa2Di68zL5fppafBWThOnC7jx9PXB6+1fngdMcoSM0DDVesISDQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2629 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit 07bae1de382723b94244096953b05225572728cd ] This patch is to clean up bus width setting code. - For DM_MMC, remove getting "bus-width" from device tree. This has been done in mmc_of_parse(). - For non-DM_MMC, move bus width configuration from fsl_esdhc_init() to fsl_esdhc_initialize() which is non-DM_MMC specific. And fix up bus width configuration to support only 1-bit, 4-bit, or 8-bit. Keep using 8-bit if it's not set because many platforms use driver without providing max bus width. - Remove bus_width member from fsl_esdhc_priv structure. Signed-off-by: Yangbo Lu [ converted if statement to switch ] Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- Changes in v2: - Use a switch statement instead of ifs for max_bus_width - Only default to 8 bit width when max_bus_width is not set drivers/mmc/fsl_esdhc_imx.c | 83 ++++++++++++------------------------- 1 file changed, 26 insertions(+), 57 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index b91dda27f9..b604729750 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -126,7 +126,6 @@ struct esdhc_soc_data { * * @esdhc_regs: registers of the sdhc controller * @sdhc_clk: Current clk of the sdhc controller - * @bus_width: bus width, 1bit, 4bit or 8bit * @cfg: mmc config * @mmc: mmc * Following is used when Driver Model is enabled for MMC @@ -151,7 +150,6 @@ struct fsl_esdhc_priv { struct clk per_clk; unsigned int clock; unsigned int mode; - unsigned int bus_width; #if !CONFIG_IS_ENABLED(DM_MMC) struct mmc *mmc; #endif @@ -1232,31 +1230,13 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, #if !CONFIG_IS_ENABLED(DM_MMC) cfg->ops = &esdhc_ops; #endif - if (priv->bus_width == 8) - cfg->host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT; - else if (priv->bus_width == 4) - cfg->host_caps = MMC_MODE_4BIT; - - cfg->host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT; #ifdef CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE cfg->host_caps |= MMC_MODE_DDR_52MHz; #endif - if (priv->bus_width > 0) { - if (priv->bus_width < 8) - cfg->host_caps &= ~MMC_MODE_8BIT; - if (priv->bus_width < 4) - cfg->host_caps &= ~MMC_MODE_4BIT; - } - if (caps & HOSTCAPBLT_HSS) cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS; -#ifdef CONFIG_ESDHC_DETECT_8_BIT_QUIRK - if (CONFIG_ESDHC_DETECT_8_BIT_QUIRK) - cfg->host_caps &= ~MMC_MODE_8BIT; -#endif - cfg->host_caps |= priv->caps; cfg->f_min = 400000; @@ -1294,25 +1274,11 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, } #if !CONFIG_IS_ENABLED(DM_MMC) -static int fsl_esdhc_cfg_to_priv(struct fsl_esdhc_cfg *cfg, - struct fsl_esdhc_priv *priv) -{ - if (!cfg || !priv) - return -EINVAL; - - priv->esdhc_regs = (struct fsl_esdhc *)(unsigned long)(cfg->esdhc_base); - priv->bus_width = cfg->max_bus_width; - priv->sdhc_clk = cfg->sdhc_clk; - priv->wp_enable = cfg->wp_enable; - priv->vs18_enable = cfg->vs18_enable; - - return 0; -}; - int fsl_esdhc_initialize(struct bd_info *bis, struct fsl_esdhc_cfg *cfg) { struct fsl_esdhc_plat *plat; struct fsl_esdhc_priv *priv; + struct mmc_config *mmc_cfg; struct mmc *mmc; int ret; @@ -1328,14 +1294,33 @@ int fsl_esdhc_initialize(struct bd_info *bis, struct fsl_esdhc_cfg *cfg) return -ENOMEM; } - ret = fsl_esdhc_cfg_to_priv(cfg, priv); - if (ret) { - debug("%s xlate failure\n", __func__); - free(plat); - free(priv); - return ret; + priv->esdhc_regs = (struct fsl_esdhc *)(unsigned long)(cfg->esdhc_base); + priv->sdhc_clk = cfg->sdhc_clk; + priv->wp_enable = cfg->wp_enable; + + mmc_cfg = &plat->cfg; + + switch (cfg->max_bus_width) { + case 0: /* Not set in config; assume everything is supported */ + case 8: + mmc_cfg->host_caps |= MMC_MODE_8BIT; + fallthrough; + case 4: + mmc_cfg->host_caps |= MMC_MODE_4BIT; + fallthrough; + case 1: + mmc_cfg->host_caps |= MMC_MODE_1BIT; + break; + default: + printf("invalid max bus width %u\n", cfg->max_bus_width); + return -EINVAL; } +#ifdef CONFIG_ESDHC_DETECT_8_BIT_QUIRK + if (CONFIG_ESDHC_DETECT_8_BIT_QUIRK) + mmc_cfg->host_caps &= ~MMC_MODE_8BIT; +#endif + ret = fsl_esdhc_init(priv, plat); if (ret) { debug("%s init failure\n", __func__); @@ -1416,14 +1401,6 @@ static int fsl_esdhc_of_to_plat(struct udevice *dev) priv->dev = dev; priv->mode = -1; - val = dev_read_u32_default(dev, "bus-width", -1); - if (val == 8) - priv->bus_width = 8; - else if (val == 4) - priv->bus_width = 4; - else - priv->bus_width = 1; - val = fdtdec_get_int(fdt, node, "fsl,tuning-step", 1); priv->tuning_step = val; val = fdtdec_get_int(fdt, node, "fsl,tuning-start-tap", @@ -1496,16 +1473,8 @@ static int fsl_esdhc_probe(struct udevice *dev) #if CONFIG_IS_ENABLED(OF_PLATDATA) struct dtd_fsl_esdhc *dtplat = &plat->dtplat; - unsigned int val; priv->esdhc_regs = map_sysmem(dtplat->reg[0], dtplat->reg[1]); - val = plat->dtplat.bus_width; - if (val == 8) - priv->bus_width = 8; - else if (val == 4) - priv->bus_width = 4; - else - priv->bus_width = 1; if (dtplat->non_removable) priv->non_removable = 1; From patchwork Fri Nov 12 19:15:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554537 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=uxXxZPoi; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSy76HF7z9s0r for ; Sat, 13 Nov 2021 06:17:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E933E8305B; Fri, 12 Nov 2021 20:16:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="uxXxZPoi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C91B83047; Fri, 12 Nov 2021 20:15:52 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20608.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::608]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A7D0583025 for ; Fri, 12 Nov 2021 20:15:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hmrYdiHy6scEsmncxcgsIuV+PsJ3shFZNA17jK55sMh6fOk+Nm5glDdiNTOtgiimPBe1IIn5a+C2Z183oaHLNAQYgW4ChC2uwQPbWnaqOZdOA8lBMoYJr/NSxUQ4sBRG/iiMNOdzbDuSUO5fYQbICZd8AFJ4oJW1QaugL7/vHEGy1D7fU6jLYnP9e8A3nq/Ukb7qxRJvAxA6f3sivQsgoGD56/EzinWwhoOFw4HUm0Yj1hVGyeqKk3xcXDAZnw6BIlJoOGTnFid1IL8D/dyUmWQsmpYQjSB/nxI1LaK0H90/muvaybrOStiAd99P1VGMVY4LqpD6Ak1tP2R95Jx+9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BJ8wFgvJ1eEpDP5FsUEdhW6ZMLjXwRXnMJ2xrpNzzSY=; b=XrgfAv/rd8N7U5yHYKcFT4a5jVI2q2sUcftXfAYyButmLwYlDtNDp4GoqUnaDo7uyWu/Wylr2CBdJPb4SqMuR8D7Er3JaPCTOpF/8RB5fFh5pysjfpFLQfQJ9PevWkiBbJdc8y/IAetxFNFAkRYaxRXn5xZ0we6v1Gg7/20jVxJwUAYGUKL8oIt5Hj6taOSoL+y8oZsvPHp5hSqYH3SVf393tPgPLRRDvn4sYSVHSrP3fE7hDpu5GE081nDLQ0C3BSYpdlfhYSo6dJbjBBtvvN6U3dAzeNPJBaz4+SZOuRyzU/Ex/qp4XzNRR4LkhtbfjJigHBcT1rwcUJr6Q8Ohrw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BJ8wFgvJ1eEpDP5FsUEdhW6ZMLjXwRXnMJ2xrpNzzSY=; b=uxXxZPoiKvCYAO8JGP/FC5Xh8Iu9Bjw/p6p9SDzXLIJZgQ/jRB6iZ9fj9NdvB6WexqeQduz2jiCblSQskMLBR791cm2Z1cfI+6cYa+Dp5M2MMudb6VOeFviQ/OzOzaN2L+3rCokxfAv+XMU0VFIaaZowZCjYUERL/3IoKzRWCzA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2629.eurprd03.prod.outlook.com (2603:10a6:4:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Fri, 12 Nov 2021 19:15:41 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:41 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 05/11] mmc: fsl_esdhc_imx: drop redundant code for non-removable feature Date: Fri, 12 Nov 2021 14:15:17 -0500 Message-Id: <20211112191523.1943825-6-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 334fd81e-6213-4886-6906-08d9a610d1a0 X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:313; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 220Nioea73ypsUjSjZjD805o5z23asti87nZTKywPWTdfqC8cq8fa0oEJD01GqyOP9tOXFzPzGu+Y2sF6YIJWlG8Rvm/srK1Up2WFj8DOpWtJAb9XZo8zEptv0IrO0QqRcV7Pa26QAKoFKzNo7coRGJebdv6wR63yP0J9mA+q67xAgluZl690Wg0dz/LvWrNGcfOKAK/gbrM+wfm0TgmIortbj/MfTr2zwUHVQ7QEdIomQF6dqIF0HsZrb33UQgAE08o5h7B7IG72wNE1McrZg/a4snMNqt0MYsVVIeVi1ywnzjpBco7lB7MB7jN5sOC8Dpq4w5tN8bz9U3eqsbsEqS6up3liHirtNlCaGHNIWUzMFpeihTUJkryMFdyhEcRVTQn1QQYd34+i2TIvkvh/+E1KdYGE9YpewCQI24cgafMmSdCwNkuqUTWQF4BULj4eb36u1UM3DanrxfR6dHYFi0+WmNtoTLDC4RDTkJupr2ulRK/6pnsRliMVvUW19BKvqihs86jLkr1gNjDijX7ijT0XXVIMf3nf4+SAkoRM7mmJxxDa0PfynEriS4qLqzREttsPxtfWZ0gzt3L1lHUD8hpqmj2C9fQcUAecR1KzarMwNcGpJQB8hW0hTPbuJoAeqlppmbSZ7DK++/fpWHr5ctHT83IXoZcXU+dpYfKQiB8IUrYvMChg20/KhoKLMnfCyMse8L0zlvxnWeeH65MQw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(956004)(186003)(6486002)(26005)(66476007)(38100700002)(2906002)(66556008)(36756003)(2616005)(38350700002)(44832011)(52116002)(66946007)(8936002)(8676002)(6666004)(5660300002)(86362001)(508600001)(1076003)(6512007)(110136005)(6506007)(54906003)(107886003)(83380400001)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pfpYWfyzuRC+ufaccDWeScA5EyOh+8NxjDM6/StM+1RexqajZ3KhVzrf3Qv9ZXySNovhNPWHm+q7sdNAZ3r7sQPUJf35tVm8jlyOQI9cyufwGWwynLZkDhCp87uPy07bT6AHv1QUOL2xhmNu+BS7u/MnO+8DEQocEWDzospDGWpqObm5DWBYbWRTZWEM7OCRTDJmQJ9dGQ51EYmOgzNs7j71QWnLlzJkd0GR1Ie7KJNs6wRvkA7X6IzclYRNv8asCFotiME4hQ4rdI8yor247SNhvzqxL1TTH2nPbhiyGkf0+Zbs1O9VVFNewx3thNiT5PkkFLSAqFFlgsEBqy7mo2mBeaC4fjzntW6wX80qemCg465NLuAcS4uRIB29sbH/cKRzQ/3viFMaFA1ATLlFkyGLfuAwNje3QUH/uGBwwb/uwIcgvUAEDMfRPeC6yFu/XArhZq6Ho1AeSKebBSkMrOAarMAD7VRwfIBl9e5pTSh+CxcamraqS320+w5ixZUufadyub/z9ZxIRW539Re3ZVH1YaYVuAkAuAd7KrHEpSmY/QK10UNH24+ONkjkv3FvZA6kuCp34MV7EggOv+lXjvnkLXD8hRHZY8/BHEngIoIahecJ+ugTiPUCbc/dH9or3UFvaRQtymQW2nUTS5nDdvwN12rc9kSqJrNeXJnnfzGWhaTwWKmZNPGl5VjhWOE7DechnQXN7wYw3NfLDTU9PricKwpP0m9P8p8Kvs3E0Q8ciNhvkSNKw3XdZhpTmasJoIm9Ye4NZOdziJNeor/i/dIdNu/d/Xg408NRTvho5ggBlcSjzI9bFKsiJsslcr7OBoSUE6njVxgn19yMcNF1QiurUtcTmhtoA+/vcMKom6/yCu4LWJVCDFXW4ChXUknm6Mgez8iNpnU+jUMOUVGckLg+GQcIFGfj6L5I6mwf4HWDQFYN6g42rv4W67/goDjy+Ztqf55fSx0UQEMSL08j5f7kMrFuDNPSH5LTr5R1SbTP5eDQsqbwvAXe7pZueLeRv0axGA5qkbfFc9zwTW4EVPJsCKf/xl3hv5A6Ks3NF/9A0EOpKlEjdaF4GhA4hYKk1Q94CLBI5HeowIa0PaQj8L+EVTdeVzUinaLocfgE0fRiuYTOKuwZcTlFV0kl5u3UjpOVVflymu+rzt4gePbqlyW5L17TIiiC66ilU1ofAvrdGr3uKMZSRixLtSsJdifZsjoJGHpTcAXn6HafvPFD4fTBNQkLFqaPZ0GwSkd+31zbYikfiucm7XGcvF7dx1il/Y4D4b3cZEiUP1I9Ce1p+kHIqwre0WHSZ8Xooa1T1lznIp0DfdM6qQrQCL8zkF5ahpYEbRGMELLfUl9g4J8Ksa/zCWSPJaM4du8X5idUI/vVUjpb+8FqLfxXUQAs1ziOQ4vPKNSzLCZkFS18BOiDQ1+VQpVPMiqVOm5+v/nDGM2rj4+BrPGwgCRxT4Nh7RYIgUuLQJuW+6jenn0KreLeGdjQM0jpqQK+uXeLYZBDj8FvdC5aUe3zIJgLHdeM1f/5qbmhyWZHDM/ASZSGevtDn4lpVsUVbHcBr7mtyLgcTsovCYAdM6DfXfyufjmF7QX8EJESR67qZU1Fd109zCKJ+BztUUVUpe7407VlwTylYRg= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 334fd81e-6213-4886-6906-08d9a610d1a0 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:41.7322 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: U70lVzwpal6IrwsTQoXI32jJEfgX6nCw4yUNz6WwvcxA3QwbPmj8KWyASEG/J5gfRJ3x7BhLRoQS+PK0FeSZkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2629 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit commit 08197cb8dff7cd097ab07a325093043c39d19bbd ] Drop redundant code for non-removable feature. "non-removable" property has been read in mmc_of_parse(). Signed-off-by: Yangbo Lu Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index b604729750..b2844d0a7b 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -130,7 +130,6 @@ struct esdhc_soc_data { * @mmc: mmc * Following is used when Driver Model is enabled for MMC * @dev: pointer for the device - * @non_removable: 0: removable; 1: non-removable * @broken_cd: 0: use GPIO for card detect; 1: Do not use GPIO for card detect * @wp_enable: 1: enable checking wp; 0: no check * @vs18_enable: 1: use 1.8V voltage; 0: use 3.3V @@ -154,7 +153,6 @@ struct fsl_esdhc_priv { struct mmc *mmc; #endif struct udevice *dev; - int non_removable; int broken_cd; int wp_enable; int vs18_enable; @@ -1083,9 +1081,6 @@ static int esdhc_getcd_common(struct fsl_esdhc_priv *priv) #endif #if CONFIG_IS_ENABLED(DM_MMC) - if (priv->non_removable) - return 1; - if (priv->broken_cd) return 1; #if CONFIG_IS_ENABLED(DM_GPIO) @@ -1415,25 +1410,18 @@ static int fsl_esdhc_of_to_plat(struct udevice *dev) if (dev_read_bool(dev, "broken-cd")) priv->broken_cd = 1; - if (dev_read_bool(dev, "non-removable")) { - priv->non_removable = 1; - } else { - priv->non_removable = 0; -#if CONFIG_IS_ENABLED(DM_GPIO) - gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, - GPIOD_IS_IN); -#endif - } - if (dev_read_prop(dev, "fsl,wp-controller", NULL)) { priv->wp_enable = 1; } else { priv->wp_enable = 0; + } + #if CONFIG_IS_ENABLED(DM_GPIO) - gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, - GPIOD_IS_IN); + gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, + GPIOD_IS_IN); + gpio_request_by_name(dev, "wp-gpios", 0, &priv->wp_gpio, + GPIOD_IS_IN); #endif - } priv->vs18_enable = 0; @@ -1567,8 +1555,12 @@ static int fsl_esdhc_probe(struct udevice *dev) static int fsl_esdhc_get_cd(struct udevice *dev) { + struct fsl_esdhc_plat *plat = dev_get_plat(dev); struct fsl_esdhc_priv *priv = dev_get_priv(dev); + if (plat->cfg.host_caps & MMC_CAP_NONREMOVABLE) + return 1; + return esdhc_getcd_common(priv); } From patchwork Fri Nov 12 19:15:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554536 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=Na1f2Hik; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSxx3hxrz9s0r for ; Sat, 13 Nov 2021 06:16:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B683883034; Fri, 12 Nov 2021 20:16:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="Na1f2Hik"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D4E483045; Fri, 12 Nov 2021 20:15:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20627.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::627]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3FDA18303F for ; Fri, 12 Nov 2021 20:15:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iSUjBdPnzXFvRSCvFHzxIu+KIBhi164J8vow7VCi5AzOuxtmNgAkiq+Ix53WCsGf5FrmUbCKC+0sdUNWJl1D7qiS8FvJNw2gDQc1Nkg3OmeHkI6Cpsxf3TPj1FfpqYUFDaKQR9aaviARx/XmR3jkLjjQglDAFYJIGROm49kfRb4YCzwM6C1jGe8R9oa5+KK9cJfLnJ5Tu/SLIu4wQWOre8d1rRhFcGNFxxICkWithOXM8w+3YvOLbeqpY+KVaF2rDtDIz67/arisnzr3bAvGVOd8d8EzEqJqZQ5P3pShBbY08DLwZCzY5SPwkK+EM+4gAsPkiPGxyExKFkNK1I4IYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yp8wUmclh7Qq/KOnvZ6CHfn8+5eRrWiDOXgcEzOGizQ=; b=Vnu2drZ4b3RxMMlpA8lKIgZjXONVbEqehlERDUOr4Mw1wXa1BDMLg+9F7h39H/HtmNyO/KWJMXzh+dghPZAIDJLjwxFqm6mp9Aj2Pm6setUxzRUrXQ7XEYLifVVtm0QYLHLFmkyiOFgtvHua5pPe0t7/yAcuTdfMPDSivMRML+eXFG+eGQEKMjrxC3x9mrtNEm7onQ0NI0IsDmo+q0iioe0QsxkgmrZgC81uGiUldqteT2ec2qeJloSpBII0/XktejEU8uDSGWQrPpTHrXxkJuqeGXvhvmLsATO4nRmGHau180w9zWAfQDYkpf5oxFuvOhGzHrzJ0TIX+esbY/vtsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yp8wUmclh7Qq/KOnvZ6CHfn8+5eRrWiDOXgcEzOGizQ=; b=Na1f2HikxfZtEQLqcFGGNWtSMCg8LS9F3qqMRUx7umZHZS+EtflKlhpfDoXLY1AFgxFqdP5+mtByNwxANAUKRhAV/JnIdvmiU/fk3m/glh/LtJX25Mx/Aezo4nqJx1NYJB03p3eAXFQ6jVsDxMnQnRX8fq1GLDr3slp6uIxYPO0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2629.eurprd03.prod.outlook.com (2603:10a6:4:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Fri, 12 Nov 2021 19:15:43 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:43 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 06/11] mmc: fsl_esdhc_imx: fix mmc->clock with actual clock Date: Fri, 12 Nov 2021 14:15:18 -0500 Message-Id: <20211112191523.1943825-7-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 083534a8-dade-4719-8fe7-08d9a610d275 X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:110; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /0wSEqBjwhhKnlK/CXy0+VH4inr+YBtUYeJY1W6EsZsjxDcMzMk/o9Ea6BJxEKbhUGkLs4wXsu6+ldevpvfuW+PIDurExSprWrYErIVXJobplHX9Z+OljEUlsjmVb/Dbg5/hTp5Cn3v4AVwbnyzX5cPbxr5dZ4hDO6mQVZVg2fAMGH1IG0Rk4XTRc+1SpDDyIWaElgIgzcCqMVsz/eTzv15bw8LpxSkvrAioOTWHtcDvDV8VgDownYj5JlETFrLyj1TbvMEv9+3MXhk/TGiJc1ATXYVpTAiakXiA+27pinMKPLYb4rXL4TrQ0ZBUvJznMFA38WeEa0sk39KYoPNSY84EoeGDp6SKcjfkoSYguND+PzgHi0VMlyKhsHuh3p0mwSVyFndMWLY7pliUksdynBDPMGCcFPF7V3ca8Rmf49qq0YYbw7CA8paPgTGsUF6oereBf3NO6/HBPgiGfYO/cLtv0vayVY81ndfmJYooi00hGV5MJz3TAnzTnIC8g4q+/yUWZlvhhZdkoGbtGEUYMQQ3Pm0YrGh8Z5+ZkbgCg2+srjtIi4CbwtAnx2tWEVPAl4lpS/6EAJHLZYrX+u8ZE2f9ga26E6vp7ctXAKeYf0ULnrBmuAwZ8nIlq+YYTbVM3G0YeNv84kdmPuyj49Jr7YIgt05b8St8wa3HPeZSfM8A7Fut9DBXaLlZTh+zz0BYOiCVVwXMJoiBzdjF2qKC/Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(956004)(186003)(6486002)(26005)(66476007)(38100700002)(2906002)(66556008)(36756003)(2616005)(38350700002)(44832011)(52116002)(66946007)(8936002)(8676002)(6666004)(5660300002)(86362001)(508600001)(1076003)(4744005)(6512007)(110136005)(6506007)(54906003)(107886003)(83380400001)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FtrV7NE5eEQNSZSeXhtVAXfUyxwTk6B57Zl+CvHO6KUzDUjyWckCOJ7DWVGkBkD6K4cJiU/v3tOu0/4A3taN21L9aOjNzPaCe94bETLqU9UFujnBNgouU3/gkpjshXXChuPE8bK7NFvHfkwAtVQEGKiS+yLSQyUTJrPZsXVJoIbrJ0xndmmQM9SSyDdCVp7Cvw9iSQ7OWRSnmJjzbXRrFu3F2JYFhlFPLgFPIKlhkXgb0e6xfAmbVC1ON/fPEIxl1TV9ozVgl7nAFX/56r6U3pn2UUQ/i19opzGrTouNYrgg2nJZ8EoEX4VseU7nswGbJSqyvOpsjp3Z4qEQCnP283+gKQhShJ6qyFiJT8H9BDJV9/bwxHUtj15SMgdxOW1qk73tA+RbbEOP7vvH0rc5+7Q4fM9o9uCSrUmKTamp7hqquw6JyB5qqUOlzFRtEaMMLMjtdkFe1cB54BBfTx4EtJ62cHlKMP7sSbWXoxljyqOiCeu96yUskzhTHVPUqkxHjMhj4+7BFPpUyJRdQaFXO9esgcdg8YGuLqw9VIsh5OgCbZhoLB/RLexE0XGxA0UPunxw1sZyPINHoa07FR0i6SFuHcb5yYCWW4/Z71c+Y9lDvw6zNIasuj/dHsfYWK5b7nBJe9xJoM9ixKsxskVTYfhlkrFn3h30tgjnxi3dFf/SS9OHtE4J/ZnnL0Wzo8lrWd4UxYXCbywpMCbkNIAaxDbwkuHWGojlo2bJylNCLS9KsW0BnJIqdwo7HmOxQ+B60AWV0wFi9mizySXcJjOeeJK7FRyZp+pVXs2lxhCgZ2SFrBw+KplCP92nSoHMm/hiPgecv/ZXviY705PSJbbV4E8U1orN3dfe45Osc7gYDoBEI7Pkv7h3eS5tnijs9sbJ/wZQtnl1pQ3QnVfBZj9fd8KoKaYfHAuHgir+WQOFziRrYzdHKe+tXsozOPFzJp7x3vUAb6sWIJ+HEep3p90x/Ig5ln19FigUQgSGN3pwttJ1k1bDsHoSguv+5G+MJMLKK0nLU6gb3oPjno/DPeyhl/WUhxRDPa9E4xumA3AulxDi6nkMb0M4cwGWB2CbzkNoUUvJIp1F2w3FCnBv2xaUEU4KrcpHjYQ/wcpcbuOV8y3/IV79RgKKHaoTnl8wHYqcj42Pk2gtp+5U6qmbwqtEel2dyGJzjIdQon1FoZIGn84WmToUwltR1Yt3sxp42UbYilqiQEpnXY66p5ARR2yEee+n/bKVCEAsonI52ExUWn3zpEEa1Av+To+SCN4BLiko4Oiw3femBgyZ97Tn94VQTWarHwUlhWIApGuqn4NBDem91qTkyf00vdO9y75pT5ZOp7s4/SJaw5fMf3uwG5YwJFbUODnLzRQK9jBz6K1n4KWafFjtieTcWs5MRfBR17Cqc4sXdIN+SByuswOrpS+eKR7Q4bA8mbMyLgvhWk29UrntVaQVRISTB8Kp0n29UT/JJd1wvoCv/lr0O+NNBK2OQGflub+1rT3RqPzI+L9KI2wwzzTAlIfbaNSztD3v3OxXGdv5qSTGnzDnAKkFAWMj1poGNlEwlyU3aN5B4eO/h5MwkCrQquAeR2f9H952ArEyuCyGDtF9r/6EVJwo7ye2yKtwIT5bW1r/9I5FlwLZnaY= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 083534a8-dade-4719-8fe7-08d9a610d275 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:43.2244 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: orktlr1vOBNPDemuyC9J+M2eCcwCREvjJiQeB+05gJQwctHLqNj3oKszuFSaoDqcAWtOzVGCQqw52HI8Bss/zA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2629 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit 30f6444d024a74ee48aa6969c1531aecd3c59deb ] Fix mmc->clock with actual clock which is divided by the controller, and record it with priv->clock. Signed-off-by: Yangbo Lu Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index b2844d0a7b..95cde9e410 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -665,6 +665,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN); #endif + mmc->clock = sdhc_clk / pre_div / div; priv->clock = clock; } From patchwork Fri Nov 12 19:15:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554538 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=wZjZKPeM; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSyL6LBnz9s0r for ; Sat, 13 Nov 2021 06:17:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 840AD83041; Fri, 12 Nov 2021 20:16:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="wZjZKPeM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 62DD48303F; Fri, 12 Nov 2021 20:15:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0E8E083023 for ; Fri, 12 Nov 2021 20:15:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FN1MI4AcczB5yx3XdIVNM6+Igpw3vT7f40AFsvoCgK5LeWRUndbKBnDQ1yyWrEsdyvawMR38yp8AA+HiGlst1+wQdEZ6G4vdcMGoiqqO9hasL9Aa0I9n/ubT5SnC6DvWPG6oEaXOnxLEYy+KzWBBknjcY7zDkRjqJbeg6krqFWEdoJt48nOW4CmfGeF1Sy0WWOQPEu/i6cXzDMBU9cFRYvD405S5mlFP1RWFY6481sAF7YsO0KI7fUHf2HemWUKKpBPhR5O1UcWlEHxVbs1NumB2uBfU9WaarAw4s11o5l+26WM14ojRrzotnNiTf0vZBxx0Murwv6noK55v582zUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RRh/qMADbWXVGLzJkyRYI6s0Rhx8Mb4eb9usfh2PmS4=; b=Ohs1NA7N2qnnP5zTsvyZe5/BQGy95IN9rKsXJcEWybkiZfVExtpK4fIX5G72lPzkSzQ1LRs9P6YtI9u4vRphTHafzPwokr7AfY63qtJWdMErhzpoDl2RTwgbGIhb017WP6BpnxDbtY/V+aPIqmgj/+K7lwJDtCuIoJY1D6Lv7QmcYZ5tNnlsIQt0TfHVcpPrTL5KWZgvKqLEpQ91cwGXppx4wtTKlNQ3Pn499wxspYIOPzHbXegfadX81PTolFMZ8xuVVAW/R5LTtrvXtOrLmwGzuUVqYMtace2EB8/L7IunQIWhT6JvdGvPUtnq0ZA+xcU66eaT8MQUKMGi2NldTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RRh/qMADbWXVGLzJkyRYI6s0Rhx8Mb4eb9usfh2PmS4=; b=wZjZKPeMR78Ny6Q45pi9iYMI7GUH6JbeGSztjmCeTRIZP3DNcvl9/1j99kRSGmb0M/gaj8fpM9OQiUVplgn1a00KLasdD8jUc4U9opwZ6Pz4h/cL+i5zbtgVC9GJXZahyvMlIfkhDuPYC7wBdW5VOHAk9Q6zIG9fy7J9eOJ+6WY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0302MB2629.eurprd03.prod.outlook.com (2603:10a6:4:aa::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Fri, 12 Nov 2021 19:15:44 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:44 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 07/11] mmc: fsl_esdhc_imx: simplify 64bit check for SDMA transfers Date: Fri, 12 Nov 2021 14:15:19 -0500 Message-Id: <20211112191523.1943825-8-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ac8eba6-f386-4efa-380f-08d9a610d35d X-MS-TrafficTypeDiagnostic: DB6PR0302MB2629: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2331; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s94lN+wUgvINtxAf/k30tQdtWr+QQN3ICCdLB8sUE2oNmTKcl7AoIrP/dmzPX5nkU5tXolznrKR4YEc98qHwEsoG1gUWmFvKbigfEyhRAtgERyoFQNu2LQyjklMY+XLeqBIPtSl0MhBq8j0HqRppbgC4goKiS6mf2XROLIENElAApkOCQozjxdNi407jD9l/MwcTYU6aV94GNQ+NGPdi4HP0Z2B9ERELuXD70KjdG0XqImNKLTs/n+NFY/5KOeWPDzo5cOfDdqje6v5A5clcPixjhqmSRBZIwHMxGfvoPp7exAgJI+vBy2JY9mCVj0Opw2EdeIjMBYskeOX2LY45NuMcINsBzduLiwbODsvTbsNmdboKtP9TPmtk5S3m+KPX2r2qRcYQ36a3vnjQK+Y8CW+K1XzAZpqNn8LvAJk/PoRRIIR0hOKj6wl9VMrQxYHmzqxHjejkBIcQ7t86JoAiV6lp4ghLHtlLtAtxQReFAL6xQ9Zn1K2eC6KVKzayAlb86/Zt9l1wOyn3+r7NOpPsyP6QP3OaOpLZ1JxvLBZ0AnHnUVZrwF8WOEyAnlP4oCkYQ0DuXs0Wnr99qQOCqLT2ok/zENilm4VU5DERRhx17BWjjf3ha92h0aUhwxSu51kU769SUDvLPjkb/Uvtlfo+ukuQ/Oku0mBEOPxYa66k4vBb70inNRTzfSh+z18MR8o7WmhFQiN1HZpXOAq3PLk5MQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(956004)(186003)(6486002)(26005)(66476007)(38100700002)(2906002)(66556008)(36756003)(2616005)(38350700002)(44832011)(52116002)(66946007)(8936002)(8676002)(6666004)(5660300002)(86362001)(508600001)(1076003)(6512007)(110136005)(6506007)(54906003)(107886003)(83380400001)(316002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VKCKOmMFMWerJImhSrBbH/An1LvAu7JQ2iWpWGnKi2OX0maVvWzA6knIkuvCRdufsrKjTMMj1ZG5pl8AV7OdIP35er479zCDY08qRcEQgmoSBl0HnBvlHg52Kx8U6y1Yy5+iBEZgMaHeaVmh8BXxk0J62h9J4rc9s0OJFbAY1+fg3q728jsOsm7YoAvtlLojZz69VFISY1ioygWwlPG+zwrUzD5Y0va++TRFRtplDUSLU4LUI+P51Pg7lxYdCpoFGlnjkqaRATKCU20FLGFg3QV0LiZJUmddasW31JvkpR0AFZRzYYEsp/c1IGvpttO1M81KMPbTg1bjiwwhRHFVP7maAqjx2Q++H8+XBT1IbACRRiKIkb6+DHBQTODK5L2b9GE/PgEkG8xdrD02aj8gRnjdel32lE+VRv63+Dd78VR4JKKtE6iq6lVWptHPViz+reo0GwjN3Cma0g7WYO1RlRMUrEv+DTCQkebTOkmWv7wb3L72Gz5QeUvtsCY8sT5AwDYRssMk52xCDdbj4M/A88YLkog6HF+VMpQkfM6FU0eanJDxBMen+jibXqnmzNABTqxiosJqPFJjY8KXvKSN96Tf7941QbdXZx4S/u96ycBepY5Dam2hwlmG/URNxlgGTMw5BlDyyOdQE6OD8TPsVgNLonyn1N6MBCjnjvmOk9Ae8wkgtxFEzxReZEQ0t4L9/2palONfWcMIG97AQuos43mxzKyrTX3zCLv/FrW1RmSTVXXPU9dg5mGC2WKv6bvm1/U9fWczJebeyKx+egkG6NBUxmaVn+P9FS7GbFHxTsi5J//XGVcmGGGhHQ5ok4v7kVhe5Qcz9ueCKQE3qNEMmCSDdID8MulhiPZWWO25gSeU0sfr+dQDyJReIjR+QMTDngqKRUkmd7g2uuYIiW8aDB5uuMVcqLE3Dywm8+0AR/SFCiRoCKRqQh7iozKuukMHkW4gMBjxNjwoBUeUSXwkyU47s+61Lu2k5YjPPEiUVmGLFil3Svthwp9uS4UuFnRAOiltS2p5t3TugDFB/R/rlbVak6cSKDjttwBTMVRmkuM3Y8wZxF4PRDND3tP1hiy1iI62ovCpfQlcybnH6equCnkMrU5AZSkN0sAbvrWVgg9PJZXv/mzIERzK0uJeaSMCvQgiXvX59yagj8YuFJf1nx5pU/3O0dWIT5tGFjmdBgSNSsSTsGblH+3VcZ6VxXZVF27qTbzOvIKtKguX2UiwbBoCvWYzHkUJggdfzvNrb9KOT3gqQUpf2IUy58PcHPL3jtZ6+y0mkLlWxz0YwIkvIPXqJcQz0uGViHHCHyYk9bq7jdEVb3i0YnL+SJ0o0rMjUl3UVmIXP/mvqUwWkvj20U85PyUi6O9qFrZOMyPibubKtUuVABsLLkgcN5sn9eJNzYlF1mR2UuaLMx2rSle7ILj0v/Ck12HDdWqc71PfQuUD1vS0cg18csptPrwJ9l2Ey8qtLLOHRfkHFb1oqekBmiCho03TdNnTDTpeKOMhO+WAHOfhJvh593juUs5L+FQFF0lWnTzZMVJGcZz7HwjWC/37RzT8UAXA/J9yCB3ccFfwLnCcc3x7TrObY05QzYSrd+ukrEOf/Abi5ONWS0itGM8vLhDh/aGCWPk6Zqs04oo= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ac8eba6-f386-4efa-380f-08d9a610d35d X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:44.8020 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jCMgotZ/CjwhWpRYfwvPjBqW1luAABWeX+CUN8WW0ubb0F01cN2/JL9vQ9Zc07X613W2H8brgXU1sNxkSALr3Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2629 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit da86e8cfcb03ed5c1d8e0718bc8bc8583e60ced8 ] SDMA can only do DMA with 32 bit addresses. This is true for all architectures (just doesn't apply to 32 bit ones). Simplify the code and remove unnecessary CONFIG_FSL_LAYERSCAPE. Also make the error message more concise. Signed-off-by: Michael Walle Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 95cde9e410..3588056759 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -282,10 +282,7 @@ 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_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_IMX8ULP) dma_addr_t addr; -#endif uint wml_value; wml_value = data->blocksize/4; @@ -296,16 +293,10 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml, WML_RD_WML_MASK, wml_value); #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_IMX8ULP) addr = virt_to_phys((void *)(data->dest)); if (upper_32_bits(addr)) - printf("Error found for upper 32 bits\n"); - else - esdhc_write32(®s->dsaddr, lower_32_bits(addr)); -#else - esdhc_write32(®s->dsaddr, (u32)data->dest); -#endif + printf("Cannot use 64 bit addresses with SDMA\n"); + esdhc_write32(®s->dsaddr, lower_32_bits(addr)); #endif } else { #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO @@ -334,16 +325,10 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml, WML_WR_WML_MASK, wml_value << 16); #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_IMX8ULP) addr = virt_to_phys((void *)(data->src)); if (upper_32_bits(addr)) - printf("Error found for upper 32 bits\n"); - else - esdhc_write32(®s->dsaddr, lower_32_bits(addr)); -#else - esdhc_write32(®s->dsaddr, (u32)data->src); -#endif + printf("Cannot use 64 bit addresses with SDMA\n"); + esdhc_write32(®s->dsaddr, lower_32_bits(addr)); #endif } @@ -400,18 +385,12 @@ static void check_and_invalidate_dcache_range unsigned end = 0; unsigned size = roundup(ARCH_DMA_MINALIGN, data->blocks*data->blocksize); -#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_IMX8ULP) dma_addr_t addr; addr = virt_to_phys((void *)(data->dest)); if (upper_32_bits(addr)) - printf("Error found for upper 32 bits\n"); - else - start = lower_32_bits(addr); -#else - start = (unsigned)data->dest; -#endif + printf("Cannot use 64 bit addresses with SDMA\n"); + start = lower_32_bits(addr); end = start + size; invalidate_dcache_range(start, end); } From patchwork Fri Nov 12 19:15:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554540 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=WbBzkTQT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSyl55Nyz9s0r for ; Sat, 13 Nov 2021 06:17:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0C5768304E; Fri, 12 Nov 2021 20:16:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="WbBzkTQT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CAD8D83023; Fri, 12 Nov 2021 20:15:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 25ADB8302C for ; Fri, 12 Nov 2021 20:15:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EkYS/JR9FjCOCAbC30S+sv96QcjWAQco9///rw2wWnxKIxP3b2zSsBFquLOlq2llxC8R31dMktAFylkQ24Sw+V3CFAhJiY29T8NGZ6UCZuYoMlbLuuA8kX3kABZaEj+KR9JV45k87q3u9MglY30nb73ckWBNVn0DjPrrISPl909LGGL7r4+j6Kd+vvgD1Yq4P0jbB0cEefKnTKxzSPQeL2TZQZEuxaZKEMk6fGCA25CWJi3Ln1zQxuW95GdnafCbK2QVuGcmqi1LaEHQBt5iy2KntGGAni4LOoWwGu0RxkDM0yJM/Q0kEReYiV1L1/651m2kbyzaL+1Tvt1Vzkso/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3RwtAw8fdEDYvGEiIVhc9rINKpltb1yyJ+f45CyLxQ4=; b=CC6Gpz9dAgvLaaSqMkCauhjsiwDX/XuJLV7AO8/TWJ5iLID27ZKE3DWcE+DMj8PQUw9LE978kZEGkVjBkC4xzBOzHjOM5uOWCrhnP2eTkzveHkz8eVfSRVjEQccRv6dXGjWX9EA5WkDx8WlVaXxreT/1t2QcvDykIRtityZuArgo+2ed//L2HZXZdk7s3OYi7OVJLX/6O1I7n3fPAQ/v4ILaNPgJyVORDlEyuod7ZSSxqEfFy5VLDmI3Hcp+g49XOxM37KJLMX4HGjqBuuJ6WjOa15fMEPkG/tj2pYtFBq74XxXa6kxucggTuTP7q2gxHkhbo9nGIPfOaFFbMJVIgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3RwtAw8fdEDYvGEiIVhc9rINKpltb1yyJ+f45CyLxQ4=; b=WbBzkTQT6ayOhmRtYu4bijKZ44/vcyMx2wWuet7nGg2DZu9KidRBoagarrohd0pNaqkeXxuceEa+4/OBJ11fDFmGOrI0Z7PZT3GgCjWSxPfq2VZpJsNlFkHugLhy/IgzDpnpo/3DimalECUCdwrvBqeLJVpP7/fhzqFVrvoDdyM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB7PR03MB3657.eurprd03.prod.outlook.com (2603:10a6:5:1::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Fri, 12 Nov 2021 19:15:46 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:46 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 08/11] mmc: fsl_esdhc_imx: use dma-mapping API Date: Fri, 12 Nov 2021 14:15:20 -0500 Message-Id: <20211112191523.1943825-9-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e908a54-4981-49cb-bfe8-08d9a610d449 X-MS-TrafficTypeDiagnostic: DB7PR03MB3657: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H+lRWy7xe3gPsu/SJR+F09ewBsdLDg81NiEQzX2jE6I8OBeSINUf6jA5XEojvWEd/8JM6I7X5kRThe/xl6CZ9t7jT9eHY+ttMYt70ohmevdYESaAr+HmAHK6hohAAmd/yWgXgTy84b4Pc7arf1v7ul/ZWpaQImKt3voj40e8CRTA+fIQrIpVnXgqdCg97rzgtLtzjHYmJEKXpH6gYTT9wO3XaMs5ZT0SJ7Bd+lnuCm372rFJbe4KT23Xyv7wenENjflnmcuw3uIkdhhh+GKpb0bCQTpfizT/d5LKzbH0n3E6S3eZXc3Ss+9gPYCf1xq6HnKDOl72uwSqaRRtWP3Wb/6EGtKPeLivmdbKgGcgZ4QHNaW2ymexFEcn7vcXGf5bVJ+nlgJ463HlxZnpXHpK6roTrMixClF3VS3AS7cg2gDVUfRkdJJIgPy8WNk0fzuD4D1v+sZCeLHj4BgxmEMZ3Cf2L5TlgrQ2zSR9cV2RPCzUfuBPI9nj1wYgP6VS3HWk+/ePh6mDtVcuC9DwwMNU2NyLQQgVpEuwMiZfHvyLJ6MW0hVP140J1lkt3tBXil4C5yX+LPLxOA17/0UP0Konyc4EXpZ06f+zz70cBLvs3uBtdRi1vTk7pwgdrPWHNjK/J7qSElKQPJg3maSQW9956D0wL9ylwjQXhgBbd3ZZ2DIkO6vjtvdbA5dggH8Ks2Sz X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(110136005)(52116002)(2906002)(2616005)(86362001)(5660300002)(508600001)(66556008)(66476007)(54906003)(6486002)(66946007)(316002)(83380400001)(38100700002)(4326008)(6506007)(956004)(186003)(1076003)(107886003)(6512007)(6666004)(8936002)(26005)(38350700002)(8676002)(36756003)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pOWCQXXxsfnqlt+OGJhbhz8xg/FHH+YuSYNrnlmf1HuyvGdbna9UH8u+IE/mRPv39VoWcLOiNrDY4GN4pwk7+y69juuNMQ9UotJv/bq6xHi/bFt1pFGMffbFcaJ16LNqQrLMFEUE7azVEvmV0S13csYgHMbNppx5OFfSfuoFXuGN99HJeRiBhlIjPoE8Rd1wFUU08VEKqAtzIloEzd0HZczlaEXHl0YD6cC4hLUm2Q4ahOLMCgcG6ZKFsN3/uAw0Cwnmx0xfVAn8bbZRVpfizUhcRk1xvEYgGgP9cpWoFhHORqDs7cHctDv+gJ6a0zxx+TATFVblO5IjpREp0WRYpnHjklYahGwtO9pvTcQTr8m9iL/XeFro1WCMR6YBMRzWulTtBU/WcPlwC48DynREvvsHhoBpm9DSny1vRjOu8457tOAG7zL0Kg/pOcEmf0hV6VoIox4OAHmJTkOlNK7sY1XgwcOQeLte7yNB9ci6KzC01SH0XlslZ7PXg4nzgJ3O8JCveODE0CuLVIlNnDRl7YJ2qYFdZAB3BMgurbmgkKebW740pZ27UnOl/jylYpcmWqDz8EDP9MbD2XB2zeb0+dZCdji3k/cFm3fu08/3KTf8jb4yiTfJ2x2JW8tN1KYnqcUdCyD7XEJqMokGlJaU+ebwBBVX2niwWOZEhMO3B5HbB++FzehlxD31gslMIgXbKZ808T9HgUit0AP068kJtEdisqHHaTcnbJENVSB2r8/8ZkDdu7BTPq0Af3C0gtQZlWFv+fTlQ001j/m6iW+m1y4IQZcF441NtIkUEuN64wabGDn0iJJbnrUS/864SKRKYyyCEls21lf04H+6HMm6THmZbliX5LK7iMNCcBZzZI3QOhB+7fzCFRoZ/K1Qk+JrDlTBJfUksxNtRNQuIKQ4oab32RDDjavwe3FLFoUJcVrprHPRa50uRSFEC5Uf64a8UpM2fsStOFO6UAPyouCw0n+lQo/dVOlWDHwMNVpYQr6zTsmiS+D7vBS8btMsuQdgvfbDEyCYgPBRsyD3fYU6XAjA8tseeVfbEpRKELoStc5+YgODsGT9L1YX8ekBM2rk8jEOvQjMZ+Nv6g4/oeZyAktsYn1NxA7NjAKY9gyyNoZ9Dw6rDyAiBASFpdVy4m5vcqfByyDEPp3P8kS6SGRVh5roLlEBpCbxXgeJP9znNQBlndvsWdgfZZ33NNH5J0r4TRLe+jZZjrGtX7y0VRzDy8ut4MHZpdaXLofxrWGMOZ3WARiu/BvUafFaL6aareJpcpZuqHYT9P7S74Dk7Ur6A2PhUbGwA6bbc4iyv0Qffg4uTFk4n57UG/OnTzjiwqvGjCkAaHRwHWwNtIZEZ7tEhTNTkc6Pi+26kgxzwhrSFQvF1CO7tPlVM23BQ90s7c2ZVxf3LDhQy3I7wuGE9X+L5ElOj+4nRWgOy844WrfatY15dHlVaP653N5iNDKN1VwGCggCw1eAanUC1WN6TVFgin7uUHSQPoB2w1NZQfo55ZZKGlMr3cnCbi1jBsFZRTGQQNbiVEItTPGyux+Gmg4WibaZdLcYZVdTZz4xizY6oETsOwHSyb0X/st1atcRk7Ap4zMZ7fFWxvz1hBg799/aMZ7IkvLB9QuM7ltknicj2E4= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e908a54-4981-49cb-bfe8-08d9a610d449 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:46.2268 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WVidnjEr2jRydWB6Dx9Ysc2b0GFfIIWrkWDH878eseraxf4Rs+dL9zBEmTaq6efwT4ThQ7CwHVP09KtKx84Gwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB3657 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit b1ba1460a445bcc67972a617625d0349e4f22b31 ] Use the dma_{map,unmap}_single() calls. These will take care of the flushing and invalidation of caches. Signed-off-by: Michael Walle Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 50 +++++++++++-------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 3588056759..afc8259323 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -38,6 +38,7 @@ #include #include #include +#include #ifndef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #ifdef CONFIG_FSL_USDHC @@ -171,6 +172,7 @@ struct fsl_esdhc_priv { struct gpio_desc cd_gpio; struct gpio_desc wp_gpio; #endif + dma_addr_t dma_addr; }; /* Return the XFERTYP flags for a given command and data packet */ @@ -281,8 +283,8 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, struct mmc_data *data) { int timeout; + uint trans_bytes = data->blocksize * data->blocks; struct fsl_esdhc *regs = priv->esdhc_regs; - dma_addr_t addr; uint wml_value; wml_value = data->blocksize/4; @@ -293,17 +295,13 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml, WML_RD_WML_MASK, wml_value); #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO - addr = virt_to_phys((void *)(data->dest)); - if (upper_32_bits(addr)) + priv->dma_addr = dma_map_single(data->dest, trans_bytes, + mmc_get_dma_dir(data)); + if (upper_32_bits(priv->dma_addr)) printf("Cannot use 64 bit addresses with SDMA\n"); - esdhc_write32(®s->dsaddr, lower_32_bits(addr)); + esdhc_write32(®s->dsaddr, lower_32_bits(priv->dma_addr)); #endif } else { -#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO - flush_dcache_range((ulong)data->src, - (ulong)data->src+data->blocks - *data->blocksize); -#endif if (wml_value > WML_WR_WML_MAX) wml_value = WML_WR_WML_MAX_VAL; if (priv->wp_enable) { @@ -325,10 +323,11 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml, WML_WR_WML_MASK, wml_value << 16); #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO - addr = virt_to_phys((void *)(data->src)); - if (upper_32_bits(addr)) + priv->dma_addr = dma_map_single((void *)data->src, trans_bytes, + mmc_get_dma_dir(data)); + if (upper_32_bits(priv->dma_addr)) printf("Cannot use 64 bit addresses with SDMA\n"); - esdhc_write32(®s->dsaddr, lower_32_bits(addr)); + esdhc_write32(®s->dsaddr, lower_32_bits(priv->dma_addr)); #endif } @@ -378,23 +377,6 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, return 0; } -static void check_and_invalidate_dcache_range - (struct mmc_cmd *cmd, - struct mmc_data *data) { - unsigned start = 0; - unsigned end = 0; - unsigned size = roundup(ARCH_DMA_MINALIGN, - data->blocks*data->blocksize); - dma_addr_t addr; - - addr = virt_to_phys((void *)(data->dest)); - if (upper_32_bits(addr)) - printf("Cannot use 64 bit addresses with SDMA\n"); - start = lower_32_bits(addr); - end = start + size; - invalidate_dcache_range(start, end); -} - #ifdef CONFIG_MCF5441x /* * Swaps 32-bit words to little-endian byte order. @@ -450,9 +432,6 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, err = esdhc_setup_data(priv, mmc, data); if(err) return err; - - if (data->flags & MMC_DATA_READ) - check_and_invalidate_dcache_range(cmd, data); } /* Figure out the transfer arguments */ @@ -560,12 +539,13 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, * cache-fill during the DMA operations such as the * speculative pre-fetching etc. */ - if (data->flags & MMC_DATA_READ) { - check_and_invalidate_dcache_range(cmd, data); + dma_unmap_single(priv->dma_addr, + data->blocks * data->blocksize, + mmc_get_dma_dir(data)); #ifdef CONFIG_MCF5441x + if (data->flags & MMC_DATA_READ) sd_swap_dma_buff(data); #endif - } #endif } From patchwork Fri Nov 12 19:15:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554539 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=QR2Pg072; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSyY1FwDz9s0r for ; Sat, 13 Nov 2021 06:17:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1455483065; Fri, 12 Nov 2021 20:16:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="QR2Pg072"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 33E948303D; Fri, 12 Nov 2021 20:15:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 75B4B8302F for ; Fri, 12 Nov 2021 20:15:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cg/7meiSbTtP4zEKqY0tBlbv8zB3KasNwlfLJHWs+Ou3dG+IYgR7LT9wtdvLXsYu2EkxyGpoN/L8ZffQq9hlHDvUqcDju03Sas2S6x+vsMFqamX/7IivqRpcjbGAUAYtBPFrI+OxBw0LQx/JbjuX5o79LApR7DIk6w6QzgVw5cxTTuCCPHio6Bzdlc2dTR5cFn/zW5KDl0h0xt2gS24aSwt6jTVbqxUYNNQ4mgINAUq6Aj36US1V9zvBA2+1Cfg6OOT75FbkNxYL7jaZZoFkFUASku68kMN3IBp6Dj+Kbbu0mX0YHkrH6ZUDU6NUdg1YZeAGHDvqHkG5MOJcNC/6Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=a8kzENLue36BafiiJ9AeEud0kcIGJPltvQcNdev03U4=; b=YitM2pecpypyDPRbiDaDpL2xtaVgUBAsb3SqzqXhLvUux99Bujhsal+tfelkGG27bpwZ+fiPIy1iV0MClS5+gBi2psmf+QEa0llwVYccQYvyJ1O56Bgr+j1EJXi4BBmru5gzV2h+IqJIE69LqLGfUeSeSzXk6KoJHA7fCbwK4xDIRbnkQQzj2WNYw6ct2zrvNaEHs001hoHQDerHWWPuQvq9sFOsyjGif51n1pWBBLSq7qP6UorKPyUoDLFJu/jow8EnAj/i1MQR/tn7mjZkr3eZ3wbUMRaz0CYPMkqagztfCkg7IzEIFnPSsY14DEvJBeRV1Bp1fo35f2J2QsQSDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a8kzENLue36BafiiJ9AeEud0kcIGJPltvQcNdev03U4=; b=QR2Pg072F1+o7NlI7hEKAm1y5d6S5OEf0VyCay06HTwcR+omFf6I7p9RvggZBjd/k+GzbjtCHASg3ziKXRsIC5Dc5n88fdO5UU8zBRpAypBzmIl0WuOTvQ64UWzTjn6MsdgzxaxKQR4jSWdVPqm4JNPs+QRZ+/aIyURdJaNppLw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB7PR03MB3657.eurprd03.prod.outlook.com (2603:10a6:5:1::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Fri, 12 Nov 2021 19:15:47 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:47 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 09/11] mmc: fsl_esdhc_imx: simplify esdhc_setup_data() Date: Fri, 12 Nov 2021 14:15:21 -0500 Message-Id: <20211112191523.1943825-10-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a994303-bb15-4c4e-0a29-08d9a610d528 X-MS-TrafficTypeDiagnostic: DB7PR03MB3657: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1468; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wr40Y+M5dazn5xoM22kugg3l9ZOqIJRwQBBkf38T8f63YuOzUE/5gpRs/GhhjogKnIxIn8cxmz11MScsIBnDQUrbdJTq/iyx/gsDp8ZBkXi874VuXzDIc22gyu9YQ+o8Pc2i2YR03iRnmIENlHlgGmklKYKK0zT+cnOC/nbMVZPg2hCvzFnlH2u4+Ej1/89hWWoA6h84dWtYXbPasQsn4d1yLRyJJ3qujQ3pUTXfq1Cze2yz6SZpzx8o/pLZm5Larh8xOSa1ckufTENusE/c4ZJx6DD7mnQxcFJa8t/jRJI9uOyI1Ds5uVIwWUg+2I6Y4sUYrPII56yLFJMrsrUqJi7njumhPcHNKTxRZSBV8lrL5lNFLnLJvipBj2tWqiMpsf8R4jTqPX6JsyT1Nx31QT1Ioo3nvm3LDoqfEKpZBxAnFIp7oVZyVMapTE7tgrVP1l5GZYH0lrwme6Q1N3rIg84ZI5S+EjmEMLcswTLlICeHO0Z2WfI2r2zH2IlSqHFNpNUFMjvbIib3WtgO3K571sHVZZmDdIdB1sZe5tDn9f2/sTBivaH7xsGcJzoM4V4uRfvbb0BRhcNLhZccGMzTrQmjuSnA2r3LIcPWTzRW2KrLIArfsHqCZTR1IKW5VOUC85rGDpNjtQqNrTdbaqrOfed1rtgTivbTeIzqXfmSyh7m5ib3c2j3vM7HpSCibVbqXXpRHNgGFLGV/7QjYWSUBmR//+ighpoyXMpejNCskEs= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(110136005)(52116002)(2906002)(2616005)(86362001)(5660300002)(508600001)(66556008)(66476007)(54906003)(6486002)(66946007)(316002)(83380400001)(38100700002)(4326008)(6506007)(956004)(186003)(1076003)(107886003)(6512007)(6666004)(8936002)(26005)(38350700002)(8676002)(36756003)(44832011)(393754008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Js6hblg7+drKSUPmMKwWnK0gsKVy9PeefCF2/QYHK3qb0joarv+r3y7o8jNTQ30qUmSSD0cPE4XJ6tHspELrIZ4+KAvmiBWIvDA5SbavEfmpSfaUGAakDkR1kqE8zNSDId05wlzzGfLN7Qsu9pmODnUWdHzyf+boxwKEb1B82evai02Rkv5oXfQkcT2k84LCmnnm6jrWb5+NT0DSwTaN+TfHOfWk3dkttFMQc+uKMh/GQtMgHcqsq8DrY1WO5R6F7KxsKAvdO2vq6tZkXODjg+mS29qkG79FQSGc3yNaPWQIFRT5ZxaekjGYqC2b60SOJweIf+oGOVeHm2WGwZT9AQaUIrkfdlT9PKcHFBAfYLkXFks0Xn00Xf+xK2GXq7XWGf/srYhbShmVO2uX94Ftci+Upz5fn6I0fu8+O1w3yEV0AoUEExzNaydKN8WMyqEiWHD+umi+Cer3fgWRDU2NqbO81RnQEKX1odsy3bo/fiOyCxcs142ueIYE7OdNIcmTpJu3rnsFXRRJOFXHmHYnpOmkZnX/MbBXYQJirKGLJuhJNbMqEZfr8daEOl749iN1LjewJ/vT85Xu/nfJ7KPUMTH0edpga/EPLKsSQl+ueJj5i2ArLtAzYrh0PrRaSZYMNVldcpRSx5RQHypaEaKGoFOTWbsZzQpoIqY1i0AbP/nrPuXaZzr36idhg6YPYB7oZahKqoUFfZFLjzGZe0YLxCsiZ86Tgjl42bvaLXrxzQt2DWOO0FNEOaQM0sJhDJ7TuIZhQEKXsVljSJBEmlAIN9nyb11Tk/FkfNmx93Gja/wqyfaH0KrzXNLW39+Iq+aE0VNXDAPTg+1mzM8dKWKOR0tmb9c5kKJYgK13/W33M7VxwgI6WsXgY15Z4KPq7bUzgtB6LAgvSjtkJsm3BhBU3bioAV4n+sGwvc8tzmsvDmWnH2k5mRl7goU++n6NZzpYjlN4/0WaodweSTRpq4EksSyDYzuAhbYdIkXvXxQNp1vgj/JMcS8tDrtrhPogKmqMjhkPqPBICMHuycB+96aUGibBfgJ1b8zaeiRcHwG/J25OiRxNeV6bXqtbbGgTyH1HNYxuuYxAf0RbM4HEr+GWkWrofG1QrblWGvUCWH4DSHh06Enwz942JoBedog1ESK6z3hV394ZHJV3AnMF/11ERT2OUyDlr+nf2W4ednQIEwp5L/bSXGzL8I8W5z0y2zufq/vxxMeRlh38UIdqDZkVftXJtQUn5h2EmWbPRwY1XMrCnoxmFWjugf09tuIFcBqECxsV3M9NFXkcs8aqxyTBPSGuoTpa+7e0zpw7tabgaNHeep2NRas8h6WOnhS/sVYUDO6zwu+Wn0kuOVrIPmM0rOUzBVU2bKn/bvkSjgbaSNJI2pMzEATOYeipAKW0WaBH04LGXCDeTRKFLbUeRqaFuOzjMdlEaBCcUs0/h2UFvRkndS2DhV5pTduQ8iDCwWffNw2yBs+v6WhiIuAMUB52r6/UGhPcgXT+RhE71wIzadDZoBDujEti14jzX4Od+0KaTKIm0+IPe9YpM7szz/D1ZeeRUa//rB8PGozzU9D/eBH8FqEfjisFEYV8qLK2n5yVFRaswNgOKy/LjXWdGu/R9xV9kaTGD6GELr+Ofc0sIrU= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a994303-bb15-4c4e-0a29-08d9a610d528 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:47.7076 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HCi3tOY1NhsxDB25xSF1BXHWaSFoN/coKEP3OjsI28LnH+69lT7ke2VtzoH8LfsuIFxhdAvftKps7XJicrc4VQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB3657 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit 7e48a028a42c111ba38a90b86e5f57dace980fa0 ] First, we need the waterlevel setting for PIO mode only. Secondy, both DMA setup code is identical for both directions, except for the data pointer. Thus, unify them. Signed-off-by: Michael Walle Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 89 ++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index afc8259323..aa3d0877cb 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -279,59 +279,74 @@ static void esdhc_pio_read_write(struct fsl_esdhc_priv *priv, } #endif -static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, - struct mmc_data *data) +#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO +static void esdhc_setup_watermark_level(struct fsl_esdhc_priv *priv, + struct mmc_data *data) { - int timeout; - uint trans_bytes = data->blocksize * data->blocks; struct fsl_esdhc *regs = priv->esdhc_regs; - uint wml_value; - - wml_value = data->blocksize/4; + uint wml_value = data->blocksize / 4; if (data->flags & MMC_DATA_READ) { if (wml_value > WML_RD_WML_MAX) wml_value = WML_RD_WML_MAX_VAL; esdhc_clrsetbits32(®s->wml, WML_RD_WML_MASK, wml_value); -#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO - priv->dma_addr = dma_map_single(data->dest, trans_bytes, - mmc_get_dma_dir(data)); - if (upper_32_bits(priv->dma_addr)) - printf("Cannot use 64 bit addresses with SDMA\n"); - esdhc_write32(®s->dsaddr, lower_32_bits(priv->dma_addr)); -#endif } else { if (wml_value > WML_WR_WML_MAX) wml_value = WML_WR_WML_MAX_VAL; - if (priv->wp_enable) { - if ((esdhc_read32(®s->prsstat) & - PRSSTAT_WPSPL) == 0) { - printf("\nThe SD card is locked. Can not write to a locked card.\n\n"); - return -ETIMEDOUT; - } - } else { -#if CONFIG_IS_ENABLED(DM_GPIO) - if (dm_gpio_is_valid(&priv->wp_gpio) && - dm_gpio_get_value(&priv->wp_gpio)) { - printf("\nThe SD card is locked. Can not write to a locked card.\n\n"); - return -ETIMEDOUT; - } -#endif - } esdhc_clrsetbits32(®s->wml, WML_WR_WML_MASK, - wml_value << 16); -#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO - priv->dma_addr = dma_map_single((void *)data->src, trans_bytes, - mmc_get_dma_dir(data)); - if (upper_32_bits(priv->dma_addr)) - printf("Cannot use 64 bit addresses with SDMA\n"); - esdhc_write32(®s->dsaddr, lower_32_bits(priv->dma_addr)); -#endif + wml_value << 16); } +} +#endif +static void esdhc_setup_dma(struct fsl_esdhc_priv *priv, struct mmc_data *data) +{ + uint trans_bytes = data->blocksize * data->blocks; + struct fsl_esdhc *regs = priv->esdhc_regs; + void *buf; + + if (data->flags & MMC_DATA_WRITE) + buf = (void *)data->src; + else + buf = data->dest; + + priv->dma_addr = dma_map_single(buf, trans_bytes, + mmc_get_dma_dir(data)); + if (upper_32_bits(priv->dma_addr)) + printf("Cannot use 64 bit addresses with SDMA\n"); + esdhc_write32(®s->dsaddr, lower_32_bits(priv->dma_addr)); esdhc_write32(®s->blkattr, data->blocks << 16 | data->blocksize); +} + +static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, + struct mmc_data *data) +{ + int timeout; + bool is_write = data->flags & MMC_DATA_WRITE; + struct fsl_esdhc *regs = priv->esdhc_regs; + + if (is_write) { + if (priv->wp_enable && !(esdhc_read32(®s->prsstat) & PRSSTAT_WPSPL)) { + printf("Cannot write to locked SD card.\n"); + return -EINVAL; + } else { +#if CONFIG_IS_ENABLED(DM_GPIO) + if (dm_gpio_is_valid(&priv->wp_gpio) && + dm_gpio_get_value(&priv->wp_gpio)) { + printf("Cannot write to locked SD card.\n"); + return -EINVAL; + } +#endif + } + } + +#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO + esdhc_setup_watermark_level(priv, data); +#else + esdhc_setup_dma(priv, data); +#endif /* Calculate the timeout period for data transactions */ /* From patchwork Fri Nov 12 19:15:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554542 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=R1BtZqqj; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSz90QW6z9s0r for ; Sat, 13 Nov 2021 06:17:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4BB3483076; Fri, 12 Nov 2021 20:16:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="R1BtZqqj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3327683034; Fri, 12 Nov 2021 20:16:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0628.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::628]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9E53D83040 for ; Fri, 12 Nov 2021 20:15:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZWLT0sBg0uRfqe7TKBr8wDfVvSYfEByLoI3+Kn3mL7yPm9BKYXCclQXmfMNVr2EgosJcI2RH0iQlQUOda8/89N4O9rYt+62tyIU4NwhjVmGgiXK/BDsfBYwisuVjdRg8zxufu8DaW5yo2JledTV6/uFCmHTBPbDXvQWUV66aeNySkyTcRSPJXITcYd8csGvtyzj4AKs6jqQVvRyWA8NDD4ns9sYppqw/Zwqlb61NYKI/jW8GlMcatGnLJKLsCcm6AyryN5yc7/WNNO4BmN+fVxqGQ98DWBH2AAp6icolNZVpay/Bvu8LUCXXrQPQodo7xqUix9s+Ss2zBYhkvMfLOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EvatMwcpAj5zcdkrC4jOAoxtZxb8kPK8KLt08MTSXZw=; b=dtexhT8qA+DSh3VWLi0tUcKa4J4m/26xlBW7ocucv9CpeDm7GmVdA2M6CbHFMx8sglG7mw8BdhUFBSTK1hr9jgCV3XkpJq5j3KrC1AoABrIhbsy/Eqk88pqfEE71Y6/K54eoIIIAJ3qELHSNa/8a6ZSxNJ0lMY3zHHxT7NmP+PexEt1xaIJe7pcVJJr5ZkNM3kaHpEg9RkVVSqZyMNr1EMDbZLci05ZKDu/7YFTgJcR8Usb2BORWX2GJkNipcPb2yJ3Ef0kO59246jI1vhfuz43OvH+H4x5IQSLYVG1LKyzs1CUuz+URD+oDPOZt6JKmEvCkbfvyeEkCEROeYXdAxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EvatMwcpAj5zcdkrC4jOAoxtZxb8kPK8KLt08MTSXZw=; b=R1BtZqqjYIHf7BEu7QZtMSAiv/Il75lLM/z7rIr8kYzr5usA3+Pc1apzKlxBx+sc6Naf9c0tlFGqT+Bu2ji2NF8Nurp78RJQhmJXzD7JBITsG+WVFnXOaj/5ZnNfiN77R2UGpLwpeNjxdpKa5lXd57TUWEX+WfybG9EfMpQNimw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB7PR03MB3657.eurprd03.prod.outlook.com (2603:10a6:5:1::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Fri, 12 Nov 2021 19:15:49 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:49 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 10/11] mmc: fsl_esdhc_imx: replace most #ifdefs by IS_ENABLED() Date: Fri, 12 Nov 2021 14:15:22 -0500 Message-Id: <20211112191523.1943825-11-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a01b007-2432-475a-b0cf-08d9a610d608 X-MS-TrafficTypeDiagnostic: DB7PR03MB3657: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:409; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5/FYXGPXYq9Tdknl89j8RVkHvozbKlyx0GnRQ4QtlfJEX7xK5cVLRJQRqr9kzADHwvpSY8SyMJDJOismp4nWoNxH/IH/lXH3dt4GZW+mxdiAuj4YTEkryz74AYhPXrJI/gOUStd4qMdkmVboJDn6lPKgcJftv82v52fVSjtISVuKAnb8Exx7aHL0KpyFoVo9apqm43PM8ROV/lO8xRpGWzdf44xIftcjitVGbI+TUJZFDxxGEdM1kdavBn2g4WmE7nN2H/7pMm8tox7o/SVTe2uomSD0PyOR5ahAY42TVljFSG8WO0ay9T8u8daEKxFRcf23MlFnveQxSUGqg5ON33okHS05tLWnYtPze+k6rCtszXBSpBX+0e0IZamJ2mnrKIV9/E90wKkVFbSA56HDwBjotgsBdDW07+OPkiYxP1jE1Bk0xsnWCoKUJjJUWoBSeL2r9rw7A+Nj5ak5qtjfcrngAsNHeNXlmgvwdRzCWydgZ/bCiRMVM+3pnwsn8v1O7fZ8NIhE1Qm3ju9LCpGu1RlYTCOhFBTAGn26SQ/VldvXkTsMecn2WORwaWFq8uCQbcdBT5eH9dUPlNgmd85+IxPXCZmKq1BAiV6TAemUHJmCUcYUeNybBaQSUHC/b4a8OowqZhRoukLSzcDlA5UnR/YZ1ciIIIr4sMVUHYs5CyNmuBLTBaSMinG4nZNwaKxFR0ZN3Sdw01+22eo+Xgb32w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(110136005)(52116002)(2906002)(2616005)(86362001)(5660300002)(508600001)(66556008)(66476007)(54906003)(6486002)(66946007)(316002)(83380400001)(38100700002)(4326008)(6506007)(956004)(30864003)(186003)(1076003)(107886003)(6512007)(6666004)(8936002)(26005)(38350700002)(8676002)(36756003)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1mRKDlqYz9Wf5yTZE5eEVY37ciS4/MSlpbtLQ8vT2sN52boD95U9sUUU7u67CLY9DLAsaFiQVfZnHU+++4hcigVskgzJgxCqKBEjlpEO7+ewaPT9HH8q9cEGIj41HLhRN6o+sefVyRUviMDl+b1RoSJVKnk4pVNaDT09pIbz6MJ1JfQowkM1GK+cZYQhGyboFXY8k13ChwHruic+3MwYy7Q1ZycaLDpUlc/CbQRtf9TRLDwVSBi9br/Bzm2aK136k+yk6UFnBpa6NJKClgAtR99OeDV87YKfb+nOTZkIqHy5d3uhyeWvGDKlWPGS6CGBeHCJ+WVsrkepAi+5EHokzpagytRjUN/VRk0RjvnN/KZYaAsZbfI77py4XcII7d63zODvM+7CcNSTQp9AhATvtX07OWTD7cIWFeLDW4SkNf4fZgHXfY5XGId+RDmG+DCx33eGy+TOnSf1Bdxg60p3z65IhHTucbAvivpyPbfIJxjM5fX075AVkQ5huleURXM+4Xh4rOKq+f1PA7/LFJC0TmgYCeBxXBaQxyRF+7Wy16B37aSVVOe/ePdcB+AhtqK+MAJop4tyzBWZb8Wkw76K5eXqPyAQocaY0ycLwxWdbWCC9Q9TlIBGnA8qVzmETz/9xq8REmkE8WSIEQsidnanMWln40fJFET3IySF0qRIOHPVmof78dBz+icw+mk9Wn8eR31FJUQZz4pWVKfXN1xkxeNkVsRKGWbMTFkYNjbeko92PBw9kLjxxGpQaG9phAIGoWwgGpYQTPeD08ey+6KZ7+peeN9Ku/T9n327WA7lnQAYII8LFEkj1uolZ4u2zctQlgyilFnOsWf68wA+4qXUe4Xnm10WT1crJL0p77CPlm1CdoF6rjru7nQH0Z6p6A1Y4VCfnTwxL7MPam0hFxwyWRFiQvaZ4JzG8jd4564Gu8TQKkNxsIICYAC7oPUzYCDWYj4bJnB3B9xwTYIgCCcJ8Pfd1IRYCQTapIu/clcZBcxa58dEiWtMY0j8pXWLk0TGt2yFTviYExS0tn/ouYk+i3LZn2WzdBjKDckaKJ6+79ihgIAbidOOuQ24MDVSzPQgc/6WJHJ0wf/M4oGhD+tS3uofQIdpo7fZ1aihAx9teJlZF15Y0sWl1/b90P2HRwGVds3lalqLtn94hOXIw+ntslOuxrMY+61mXK/VB0XahTKqBKtdamm4UJHGimIrw0KKfTtgzWfj8NvCMlwceS8YoRHY9riZUL7RAQQAsv2Rb39O4M2BK4lh237cFDMbyHHsyw7aNpUFLH4CaRWZ1MWLK57r7wHE+188POk94QZHgCJ2psFaNoFKvM2t3PgZG/jcnUMPZh+1GrkPsiBGXnPCcrnKGyTBA5r9ZtsoadquYn0dmDlJfRvK24BE9N0SpAg+duJNVIG5kPSkgxQ81mmmbAQeDutQNfRiMlZa8a/MyMun4flN7wEuQTJdRew6o8o5C7X933tyz60Bc0WTAE/hJqQf7AzDV93nk77ucq1g3hznnTW6pwbCo9PzN8P6Ua5LWb/3UaK/Lo9MA/DxIcMF1ITsMNSnCOvbTaJ63jyOSHEpNlu4IIk44Jq08lOQgoKmRuoWtZqIQGDs9ST5CDH+FY0h0A7Thws629AoSkAxzhU= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a01b007-2432-475a-b0cf-08d9a610d608 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:49.2602 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: inDBhUhSqD8iPTJW5ARdY6i1t6VFqm9bhytfCJtf9hvVIzefyn38SH3uiC78oD8CO/9gSlXTCMoCSblY5xF4bA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB3657 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit 52faec31827ec1a1837977e29c067424426634c5 ] Make the code cleaner and drop the old-style #ifdef constructs where it is possible. Signed-off-by: Michael Walle Signed-off-by: Sean Anderson --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 209 +++++++++++++++++------------------- include/fsl_esdhc_imx.h | 2 - 2 files changed, 100 insertions(+), 111 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index aa3d0877cb..89572509a7 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -182,15 +182,15 @@ static uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data) if (data) { xfertyp |= XFERTYP_DPSEL; -#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO - xfertyp |= XFERTYP_DMAEN; -#endif + if (!IS_ENABLED(CONFIG_SYS_FSL_ESDHC_USE_PIO) && + cmd->cmdidx != MMC_CMD_SEND_TUNING_BLOCK && + cmd->cmdidx != MMC_CMD_SEND_TUNING_BLOCK_HS200) + xfertyp |= XFERTYP_DMAEN; if (data->blocks > 1) { xfertyp |= XFERTYP_MSBSEL; xfertyp |= XFERTYP_BCEN; -#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC111 - xfertyp |= XFERTYP_AC12EN; -#endif + if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_ESDHC111)) + xfertyp |= XFERTYP_AC12EN; } if (data->flags & MMC_DATA_READ) @@ -214,7 +214,6 @@ static uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data) return XFERTYP_CMD(cmd->cmdidx) | xfertyp; } -#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO /* * PIO Read/Write Mode reduce the performace as DMA is not used in this mode. */ @@ -277,9 +276,7 @@ static void esdhc_pio_read_write(struct fsl_esdhc_priv *priv, } } } -#endif -#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO static void esdhc_setup_watermark_level(struct fsl_esdhc_priv *priv, struct mmc_data *data) { @@ -299,7 +296,6 @@ static void esdhc_setup_watermark_level(struct fsl_esdhc_priv *priv, wml_value << 16); } } -#endif static void esdhc_setup_dma(struct fsl_esdhc_priv *priv, struct mmc_data *data) { @@ -342,11 +338,10 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, } } -#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO - esdhc_setup_watermark_level(priv, data); -#else - esdhc_setup_dma(priv, data); -#endif + if (IS_ENABLED(CONFIG_SYS_FSL_ESDHC_USE_PIO)) + esdhc_setup_watermark_level(priv, data); + else + esdhc_setup_dma(priv, data); /* Calculate the timeout period for data transactions */ /* @@ -379,14 +374,13 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, if (timeout < 0) timeout = 0; -#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC_A001 - if ((timeout == 4) || (timeout == 8) || (timeout == 12)) + if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_ESDHC_A001) && + (timeout == 4 || timeout == 8 || timeout == 12)) timeout++; -#endif -#ifdef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE - timeout = 0xE; -#endif + if (IS_ENABLED(ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE)) + timeout = 0xE; + esdhc_clrsetbits32(®s->sysctl, SYSCTL_TIMEOUT_MASK, timeout << 16); return 0; @@ -409,6 +403,11 @@ static inline void sd_swap_dma_buff(struct mmc_data *data) } } } +#else +static inline void sd_swap_dma_buff(struct mmc_data *data) +{ + return; +} #endif /* @@ -425,10 +424,9 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, struct fsl_esdhc *regs = priv->esdhc_regs; unsigned long start; -#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC111 - if (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION) + if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_ESDHC111) && + cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION) return 0; -#endif esdhc_write32(®s->irqstat, -1); @@ -526,42 +524,40 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, /* Wait until all of the blocks are transferred */ if (data) { -#ifdef CONFIG_SYS_FSL_ESDHC_USE_PIO - esdhc_pio_read_write(priv, data); -#else - flags = DATA_COMPLETE; - if ((cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK) || - (cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK_HS200)) { - flags = IRQSTAT_BRR; + if (IS_ENABLED(CONFIG_SYS_FSL_ESDHC_USE_PIO)) { + esdhc_pio_read_write(priv, data); + } else { + flags = DATA_COMPLETE; + if (cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK || + cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK_HS200) + flags = IRQSTAT_BRR; + + do { + irqstat = esdhc_read32(®s->irqstat); + + if (irqstat & IRQSTAT_DTOE) { + err = -ETIMEDOUT; + goto out; + } + + if (irqstat & DATA_ERR) { + err = -ECOMM; + goto out; + } + } while ((irqstat & flags) != flags); + + /* + * Need invalidate the dcache here again to avoid any + * cache-fill during the DMA operations such as the + * speculative pre-fetching etc. + */ + dma_unmap_single(priv->dma_addr, + data->blocks * data->blocksize, + mmc_get_dma_dir(data)); + if (IS_ENABLED(CONFIG_MCF5441x) && + (data->flags & MMC_DATA_READ)) + sd_swap_dma_buff(data); } - - do { - irqstat = esdhc_read32(®s->irqstat); - - if (irqstat & IRQSTAT_DTOE) { - err = -ETIMEDOUT; - goto out; - } - - if (irqstat & DATA_ERR) { - err = -ECOMM; - goto out; - } - } while ((irqstat & flags) != flags); - - /* - * Need invalidate the dcache here again to avoid any - * cache-fill during the DMA operations such as the - * speculative pre-fetching etc. - */ - dma_unmap_single(priv->dma_addr, - data->blocks * data->blocksize, - mmc_get_dma_dir(data)); -#ifdef CONFIG_MCF5441x - if (data->flags & MMC_DATA_READ) - sd_swap_dma_buff(data); -#endif -#endif } out: @@ -595,21 +591,22 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) struct fsl_esdhc *regs = priv->esdhc_regs; int div = 1; u32 tmp; - int ret; -#ifdef ARCH_MXC -#ifdef CONFIG_MX53 - /* For i.MX53 eSDHCv3, SYSCTL.SDCLKFS may not be set to 0. */ - int pre_div = (regs == (struct fsl_esdhc *)MMC_SDHC3_BASE_ADDR) ? 2 : 1; -#else - int pre_div = 1; -#endif -#else - int pre_div = 2; -#endif + int ret, pre_div; int ddr_pre_div = mmc->ddr_mode ? 2 : 1; int sdhc_clk = priv->sdhc_clk; uint clk; + if (IS_ENABLED(ARCH_MXC)) { +#ifdef CONFIG_MX53 + /* For i.MX53 eSDHCv3, SYSCTL.SDCLKFS may not be set to 0. */ + pre_div = (regs == (struct fsl_esdhc *)MMC_SDHC3_BASE_ADDR) ? 2 : 1; +#else + pre_div = 1; +#endif + } else { + pre_div = 2; + } + while (sdhc_clk / (16 * pre_div * ddr_pre_div) > clock && pre_div < 256) pre_div *= 2; @@ -621,11 +618,10 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) clk = (pre_div << 8) | (div << 4); -#ifdef CONFIG_FSL_USDHC - esdhc_clrbits32(®s->vendorspec, VENDORSPEC_CKEN); -#else - esdhc_clrbits32(®s->sysctl, SYSCTL_CKEN); -#endif + if (IS_ENABLED(CONFIG_FSL_USDHC)) + esdhc_clrbits32(®s->vendorspec, VENDORSPEC_CKEN); + else + esdhc_clrbits32(®s->sysctl, SYSCTL_CKEN); esdhc_clrsetbits32(®s->sysctl, SYSCTL_CLOCK_MASK, clk); @@ -633,11 +629,10 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) if (ret) pr_warn("fsl_esdhc_imx: Internal clock never stabilised.\n"); -#ifdef CONFIG_FSL_USDHC - esdhc_setbits32(®s->vendorspec, VENDORSPEC_PEREN | VENDORSPEC_CKEN); -#else - esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN); -#endif + if (IS_ENABLED(CONFIG_FSL_USDHC)) + esdhc_setbits32(®s->vendorspec, VENDORSPEC_PEREN | VENDORSPEC_CKEN); + else + esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_CKEN); mmc->clock = sdhc_clk / pre_div / div; priv->clock = clock; @@ -1145,22 +1140,21 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, if (ret) return ret; -#ifdef CONFIG_MCF5441x /* ColdFire, using SDHC_DATA[3] for card detection */ - esdhc_write32(®s->proctl, PROCTL_INIT | PROCTL_D3CD); -#endif + if (IS_ENABLED(CONFIG_MCF5441x)) + esdhc_write32(®s->proctl, PROCTL_INIT | PROCTL_D3CD); -#ifndef CONFIG_FSL_USDHC - esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_HCKEN - | SYSCTL_IPGEN | SYSCTL_CKEN); - /* Clearing tuning bits in case ROM has set it already */ - esdhc_write32(®s->mixctrl, 0); - esdhc_write32(®s->autoc12err, 0); - esdhc_write32(®s->clktunectrlstatus, 0); -#else - esdhc_setbits32(®s->vendorspec, VENDORSPEC_PEREN | - VENDORSPEC_HCKEN | VENDORSPEC_IPGEN | VENDORSPEC_CKEN); -#endif + if (IS_ENABLED(CONFIG_FSL_USDHC)) { + esdhc_setbits32(®s->vendorspec, VENDORSPEC_PEREN | + VENDORSPEC_HCKEN | VENDORSPEC_IPGEN | VENDORSPEC_CKEN); + } else { + esdhc_setbits32(®s->sysctl, SYSCTL_PEREN | SYSCTL_HCKEN + | SYSCTL_IPGEN | SYSCTL_CKEN); + /* Clearing tuning bits in case ROM has set it already */ + esdhc_write32(®s->mixctrl, 0); + esdhc_write32(®s->autoc12err, 0); + esdhc_write32(®s->clktunectrlstatus, 0); + } if (priv->vs18_enable) esdhc_setbits32(®s->vendorspec, ESDHC_VENDORSPEC_VSELECT); @@ -1172,22 +1166,20 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, #endif caps = esdhc_read32(®s->hostcapblt); -#ifdef CONFIG_MCF5441x + /* * MCF5441x RM declares in more points that sdhc clock speed must * never exceed 25 Mhz. From this, the HS bit needs to be disabled * from host capabilities. */ - caps &= ~ESDHC_HOSTCAPBLT_HSS; -#endif + if (IS_ENABLED(CONFIG_MCF5441x)) + caps &= ~HOSTCAPBLT_HSS; -#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC135 - caps &= ~(HOSTCAPBLT_SRS | HOSTCAPBLT_VS18 | HOSTCAPBLT_VS30); -#endif + if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_ESDHC135)) + caps &= ~(HOSTCAPBLT_SRS | HOSTCAPBLT_VS18 | HOSTCAPBLT_VS30); -#ifdef CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 - caps |= HOSTCAPBLT_VS33; -#endif + if (IS_ENABLED(CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33)) + caps |= HOSTCAPBLT_VS33; if (caps & HOSTCAPBLT_VS18) cfg->voltages |= MMC_VDD_165_195; @@ -1197,12 +1189,13 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, cfg->voltages |= MMC_VDD_32_33 | MMC_VDD_33_34; cfg->name = "FSL_SDHC"; + #if !CONFIG_IS_ENABLED(DM_MMC) cfg->ops = &esdhc_ops; #endif -#ifdef CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE - cfg->host_caps |= MMC_MODE_DDR_52MHz; -#endif + + if (IS_ENABLED(CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE)) + cfg->host_caps |= MMC_MODE_DDR_52MHz; if (caps & HOSTCAPBLT_HSS) cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS; @@ -1286,10 +1279,8 @@ int fsl_esdhc_initialize(struct bd_info *bis, struct fsl_esdhc_cfg *cfg) return -EINVAL; } -#ifdef CONFIG_ESDHC_DETECT_8_BIT_QUIRK - if (CONFIG_ESDHC_DETECT_8_BIT_QUIRK) + if (IS_ENABLED(CONFIG_ESDHC_DETECT_8_BIT_QUIRK)) mmc_cfg->host_caps &= ~MMC_MODE_8BIT; -#endif ret = fsl_esdhc_init(priv, plat); if (ret) { diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h index 1529b8bba3..b958a6b3bb 100644 --- a/include/fsl_esdhc_imx.h +++ b/include/fsl_esdhc_imx.h @@ -24,12 +24,10 @@ #define SYSCTL_INITA 0x08000000 #define SYSCTL_TIMEOUT_MASK 0x000f0000 #define SYSCTL_CLOCK_MASK 0x0000fff0 -#if !defined(CONFIG_FSL_USDHC) #define SYSCTL_CKEN 0x00000008 #define SYSCTL_PEREN 0x00000004 #define SYSCTL_HCKEN 0x00000002 #define SYSCTL_IPGEN 0x00000001 -#endif #define SYSCTL_RSTA 0x01000000 #define SYSCTL_RSTC 0x02000000 #define SYSCTL_RSTD 0x04000000 From patchwork Fri Nov 12 19:15:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1554541 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=pUzTaYjO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HrSyy4KK5z9s0r for ; Sat, 13 Nov 2021 06:17:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5FBD38306A; Fri, 12 Nov 2021 20:16:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="pUzTaYjO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E3EBF83034; Fri, 12 Nov 2021 20:15:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0628.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::628]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 55C258304A for ; Fri, 12 Nov 2021 20:15:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HC+ITgl9xwgDLOZY5WaIzKQLR/3uiYEHzej/j1fgfzQuvhtnTZT3T2iGnixVL4myrv8cRReKCbFO2MyHupkjF/mRZSS59qThif9fLDN1bOY15ygikKVpk8ScNshjpdg5CdBj0q3jfxOgZp1r8CfPU3sTXL2l3BODbLMDxy1PibSt5mEptwyh2svSE32W9pzaFQG3B6ohLxvWhQCjxxpBn5f431pjHfXghsOKVAhclJZzRHeUHUTpoBfx0zUNKha6l3sc9t3v5sW38DikRLMvgUNJpKykFR+zHacxo2k3b8paIZdFouqoEbrvsmZ4UcU9WIQMCpnKhUfL//T07nKXgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gbOSEwgkq7S26JbKGSpM7Pe3CkSUwcMnuWdS89c3VQ4=; b=D3jAzHWKpYxHBF5j+vDZ6QARQs2fTGOHlXyE/mjoacG3q5NRb1Bx9aznMRDHncH9X4zC6+nW5aStBgoLWACJ7DLCEXm2pDWF5QaUjNffoR6F9LpT87tGqgqApdKUigI/E07NeujHXrbMVl96ervay1LFh9qzie1xlUDv75FR4OiDx1bosn49d79O1earSmMqB32U6reijNwO+SSascP+hRCFzCV2qrPUUwHbu9gFrQJxI6siKVMgtcXGGMu4V/X0ac1b4rVJzyqtZeh7avxqzCt0hXSZ59yOTPllVJAyVjpAgFxEHtniVBRNPoJDszRg7BIwYMzZd9zYNggAc2mZgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gbOSEwgkq7S26JbKGSpM7Pe3CkSUwcMnuWdS89c3VQ4=; b=pUzTaYjObDfjdfbiZcuyvnvveorlcJulYbXC0scSzJ7WkXT3SjpzcT4rjWdoSvU2gGSnEf2kH7M1+s/1It+oHoHFidpP2cl+AMNyH3G6vFA9zljpG/uYuxCZUp9iEvWFS9okDqDDX2DGbcjSZzv8M4BuJMKcO1X0NIt8k+SNTzY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB7PR03MB3657.eurprd03.prod.outlook.com (2603:10a6:5:1::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Fri, 12 Nov 2021 19:15:50 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4669.015; Fri, 12 Nov 2021 19:15:50 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Michael Walle , Yangbo Lu , Fabio Estevam , Sean Anderson Subject: [PATCH v2 11/11] mmc: fsl_esdhc_imx: set sysctl register for clock initialization Date: Fri, 12 Nov 2021 14:15:23 -0500 Message-Id: <20211112191523.1943825-12-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211112191523.1943825-1-sean.anderson@seco.com> References: <20211112191523.1943825-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR20CA0001.namprd20.prod.outlook.com (2603:10b6:208:e8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Fri, 12 Nov 2021 19:15:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0611862f-1f0e-4d47-ba69-08d9a610d6f0 X-MS-TrafficTypeDiagnostic: DB7PR03MB3657: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:298; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2UFmFRNS/m2JMyMPiE5xeoQyynZENFqlSJMVSFsqPKf6WeHI9S4RXIP+RYvuioH28sXyQxLirzVMWykyBuWfJGjYIXaJZSYVNIO9CUudNAEMQ7pkzPWMwSa0nolvMw0JwqNOcyM7aK3HnEt6QsGRZu76veQeSco3NikkLqDgmGiGdKU+UNsx42L7HO9WgvwxrS/qI+yH6jNos4bojSM0fssNxn6nENxp3liznjSJLehsxGfzKs7uMeOnIleazqBbbZ1BwXKZ7Wvfx8LlvoFHQn0qf0lViWDyPYkzDDL++RkrPCqMcIf6Xz1gjybL7eM2875gjWEu0nReGr4W7ifnEUoQ+JDOy6Qqb8Q3eSk9QZp/wO2yEcMGxqXxFHxmlm+l8GSJxsZzQKKvm1E+IZj3K/oOobJRSRlyMr9P71zQ/BPOwxqdG9gY+1Cr3clPoe+A+fv4kpRoJOxZXU29dtVBk891vWW3hQt3YLfTRclhek1wEmbbNX9/7aasGBZeC5AiDzENgjKFCmZp7Z5jJQ1ahM/VfSAhO2CaGz5q1jypvwsyjoH42zcO43Sjw330CW7Km16O2fpOLiI8HxikE9wbZ3UHhbU16iCXqpuPRvI9PdKCxCvA9Ao0NHdFfRe78SGJ6HaQ+YXHV4UInJaN1LkMg3N1fk7s+PgPGr5pE08j5J+wczzE0LqIDsR4LsWqdahns75pKNRr/ZzcE5KaHyvwSg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(110136005)(52116002)(2906002)(2616005)(86362001)(5660300002)(508600001)(66556008)(66476007)(54906003)(6486002)(66946007)(316002)(83380400001)(38100700002)(4326008)(6506007)(956004)(186003)(1076003)(107886003)(6512007)(6666004)(8936002)(26005)(38350700002)(8676002)(36756003)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MxaosNS2lRL04KRXi2Lxk155JFAOjOIMAEnuCiaV+rdcbLnKgc7jK1u/JC8X5wU9wYRCswJFHksg8I08YRsz18IE3lr+0f8ZPtz73y3/S6V51SlovShMSy3ooRHZElE/W+tsnDo7nd+BGouLFnL97m2YW4VSSC4SEi3VmI+wexODW+IKQS66O+wvwj3GBdzfuxSa0cR7Xzt00me9zAKFINR2GJ3+W1y+FeyPBk7TSuTkgsNkVWPR9J1Vxht39s0BYbbGXVHQFa00qGcs/mGRjLmTwXI5pZM95nQEJyumTs/7nfl/hGMNgZfCfgBJA0NVZaqwTi8+zjOoK9efa7ONoYViy3/G+VPLqkCbTVGFUHwKvm3lvjbfbUrBoDmifua/JF9I1g23b7jcI/ZwHERz9s23ej/Fhf5ZTwzq2EvrTAU8otclzE7eXNw8BpaWyDvkuMTPDhvyo8Hy2+cnoLDf+kgam1nvtE37tEA/EukvawJaIzTo3AuFOWLKUVeMuKauI1lqow1zY2XvuJX+B2sMCxqRnhrNbAQMKmDsJjbZDnVQX2NV74jumnZvkl5h+8IbdJpBVenMbEQXV5R1nkWY/JGKAEBuRsMWlHaZJ6xSOtcqbd+duscAG4uc9PfsAryhWC47t6vJ5DQZfMNeKuVoore49hIw53DvfKrQ1HaNJQzuYtuCfkh+V/AYSZPLoJLkzCHZsIx/0YIIQwPuLuUah8MlTVI5UX279vzfBV0XZInuLQ7E1xOmwEl4nO8EKW8aUVHo5jb/Lmiw61v1/xgDhAyF4N2uzT1zx+dEmdxEm+tuiqmRC+opWYGU6sLFG7xsNvYQ/bjmBqQSOxLKMwI1gSjf5pLyRWTN7RW7GEJOYqUkVRSXVxVT1lOlB594FVYVsJrwrIeACzPzw2nCWkFTfVPBzonCFhEyzqf4AKxblqksDrCPspFtJnyTvFNYdeecy4zFXBUzbVwLMgJ1gbOtX5FQE72zqk/shtX5Hk4xhR81v7kui+T228ydkBxyl0tEFA07piRpUH1euxNkZMgY2GS5NSxDIxCBiMGNr9X6TZZli9cBmUclJTUaFIcLcq6iKIdvhp0Ob3uwd6NTQOXChSHEaHEl8LeWZKunrhLqfPN71T0lcmC23LwXejX4cFOxIvgnlMo9VeGvsBI9VyrPzPB6mzdH9Yqcvl1ZtzqeHIwHUymmOzb8K5sAjVvtG7i17mNeDt+B/VKFuTbbq1a9naNX6IwFRPOuCqeaRVvUQGXhhiIGz9c5hCMBhf6Do0kR48Pr/FHFjeLqzqqr1sUpAio1nS9xn4DbG1tYOacoDlL6BTs6l39tzhHJR+oWyvmDkZFQMg+CoqhB7PMcGQbsPEFZqu+q061/yRG6mSvW14fmgmWqzduUugsScYVh0pPLQkzrQZMRSTuX9Z6eziNSiTWqjJcs6piHqtcS7ovOVxmCAQ16KNCepM/PhxFJ9+VCI8gVOIoOvdLqnBcDJlsJ804V+ycHeLkytIq70Xla+vxLQhp8RuogAlXbpq0LGXGJzAT9fZb/O4aWiA2Fd4n3Fs2kjxMOz504mK5CWik1yH/zXaJcQ7XOrEPhrkiOA0MgLXI7WhrIxuBUb0mXXttGObIHBZwCcQMiFPOG3VPolnA= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0611862f-1f0e-4d47-ba69-08d9a610d6f0 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 19:15:50.7669 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iIPNnpAzMqUphuSgX9x+ptvLky2ojHaHr/GN8tPfbX6Ah276k4QF612fFhLigmzMjG+UpUZ7FXWCbB+/VFV88g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB3657 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit 263ddfc3454ead3a988adef39b962479adce2b28 ] The initial clock setting should be through sysctl register only, while the mmc_set_clock() will call mmc_set_ios() introduce other configurations like bus width, mode, and so on. Signed-off-by: Yangbo Lu Reviewed-by: Jaehoon Chung Signed-off-by: Sean Anderson --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 89572509a7..636c35bc7c 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1022,7 +1022,7 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) #endif /* Set the initial clock speed */ - mmc_set_clock(mmc, 400000, MMC_CLK_ENABLE); + set_sysctl(priv, mmc, 400000); /* Disable the BRR and BWR bits in IRQSTAT */ esdhc_clrbits32(®s->irqstaten, IRQSTATEN_BRR | IRQSTATEN_BWR);