From patchwork Tue Nov 23 20:03:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558789 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=H0z8wq+n; 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HzFTv1MMNz9s5P for ; Wed, 24 Nov 2021 07:04:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5271F8371B; Tue, 23 Nov 2021 21:04:24 +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="H0z8wq+n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 034C980F89; Tue, 23 Nov 2021 21:04:11 +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 EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::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 5079682A52 for ; Tue, 23 Nov 2021 21:04:08 +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=XJutzlcbuWgXooCXXlu5RVTOnhNnGzCdii2iZy2NPffPeu4fCuvjy+BmH0xcc1Q7mXlkyVIl6N1hlGuSmBNE/vyBi8Bhfqte4fphoCdZFnW99d84o9GsvNE8h7mGsiQLmhTAMPK8e+ZSzr19+nTuFEL4dnxNBwvSW15CBKC+Fa3ax/AkcL+PVj21XmGgtbwYTBkoXTqmdXBsOz0SQrtuBBW22Dte/BNM+AzP7hPA6aztUvMXSXLj12JBD6ZJJby2EtQaCfKBbJtW3EN24AxDDpXKl3ttaxPOZdTPDKfziDUxwYdlYqsjAdwpJzLZwyrQLCkls/M9zB3znHpgdcqPSg== 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=TjFE9X2d5F4FbgzZkNIOP0blsJ2L3h6BXH5BlsDGCtI=; b=XoxeON5A6w1FbnwYZKQi0qF3qK2FpXui9zxPyP5UwsDOjF9/ZIPyj/X4HzRVChGbjWomw3ykWJ2C3WCqPrQjLrBlRW7DtsFazAPGBUGhuGGPNKUo/koli4aH5zwPpdh+aRr4kas9UO2IorysMxdhPpKqk3ylyuN78ytG52Mh/qiiBnduqWifCl2/+6UOoopTl2GKCxOnmtCdMCbQVT1P2AUhn2lA1yhucpDmDBkw+QWktJilzbnZeviRflQQeQPpbHoXKtGIOe96gS0fGTuIJe/vBJZYlGSeAuMe67JJgpjAf7FNL45nVXt0wSoJbFp7YCCaefDR3LZ39lDOMqm5hA== 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=TjFE9X2d5F4FbgzZkNIOP0blsJ2L3h6BXH5BlsDGCtI=; b=H0z8wq+nJoxbceFfd/27HkvF8YhO8b1liL6ykk+jFhL/HBfMSfaE1TGrPms7xMj76xKe8JUyqmfSS4xED/0LHX3PE0yRF4XLqdgtShbwjEe3rtzZpuY8RAKe2ndaLTk5NEeq/bHE1OyO9JkvOv1mfXLhCYqOkds/v0rLangPcHU= 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 DB6PR0302MB2632.eurprd03.prod.outlook.com (2603:10a6:4:ab::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Tue, 23 Nov 2021 20:04:07 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:07 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 01/12] mmc: fsl_esdhc_imx: make BLK as hard requirement of DM_MMC Date: Tue, 23 Nov 2021 15:03:36 -0500 Message-Id: <20211123200347.3772343-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2bcaee4c-b55a-481a-ca78-08d9aebc67f5 X-MS-TrafficTypeDiagnostic: DB6PR0302MB2632: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:262; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WiQzq0HgEHVMXWoL34Hvyhe1mOr/i1VIc9NF2GIBR40BEx8LKBC/6K6a90AuRziD6nw14c6Dts9hdIOWvbBT/pewxEc6gD95EvZJmYwBv8ADI2SxJXrwYQAUAlmK5ZQYs1fY54p0jk52BSbft2HEhgzdykJbeikxYUvHhuokfGFdGtenEScSwSASeClbY/Es2gR7flDqr0UTxNRkuNOIkqotOQqKiGOVQeKK+H6UKwj+k7TW3uiGb/j8xVQ1UZoPhssoWngPKA2ASksL953YnkXAeVxV20whSBeL83mMamQVu63LmL1kVp5GKsySZardJ+ty6Bon30z/jhShlJvRk3asNaQzvdU4quirn3hbEy8D4Tq/feR9IuICXCnt3bLnM35uVI3XwCCr2wA5Pt7PqEpPuHBWLfEPtsWMrHZmEHSJ1Ea7XKAcW2vw8GgcCWv74KX7BSUos2s/HX51lcq8OTFL6yBMG0bF5RThCby/Dk1Rjcw0nEnvYWC/6+FZgFAWieD8Kn5UbEoMEQAUAco5CKgAMvAlLsMpSCy+U8ieoxWMHV87ammqmO4YW4vtqUKEqw2kmq4g+tfVv6fJ7KKEgpPAG8IfSwE3n5Kv8BRClzGgZ+AsxFNMxdMGv7Zs+GkV9czzhv05N/xYEE669M7cR4AkkCt9iJKJOUZ0oZHAwUoZEhyI3Uz7JMZPy58bA87hYrvrIZbiuysFb7pQgl67LA== 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)(54906003)(66556008)(66946007)(956004)(26005)(44832011)(6666004)(5660300002)(8936002)(508600001)(66476007)(186003)(52116002)(38100700002)(2616005)(36756003)(6506007)(38350700002)(6486002)(2906002)(107886003)(8676002)(6512007)(83380400001)(316002)(1076003)(110136005)(86362001)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XI1hwlhulC6xAhfSpW014RErO+CA1sdKX0CmQuIJSJMhexXwBNrf1439kZjokivT8NtdZUtZQx5WPzqEzuoVHBDYWFdSA5YyhlckWOhXq+iEcGh46DjHTpy9fnLyDKXw2d7VvbGDA03+SQOfvJHR4YcaUUB7SXxTofXJ/qDacd5B6fNRtHw1TRzx2gDKDQDfWlfJ4Y/8wAQhAaDV37jUNCZScvFnPwNkLJnRTvwyPdY7g0XBqwDhyeUK4G+io83hessXp9Lmj/rbJte107lGgb1y0aTlsB83aV2tgBZU+CgIUPHh72dZQCVMkuS4ZDgl2KZpKhH0Sg2sKZlhfG9gA335/2D9W8N0VA8paBxNVNum73HW2nydNNYsDDADfh/Emoglyk75jQOMSLS7GC0Lf8kqsjJoxontSD+TUTIltxCXf2x0Htg5FvMbAWVhMSklCX2QIyp9wPpG9TE0JU/E7b13bhTP7gh/hA/T2iRO7dyVVcEodUTsjxhyq7yIcNZomthbeOd4a/vG8ESkuwAO4h60Ez70x3fLoLYquw1vxmCN0JTGfCVxO29sKDowfNbxWkY5No5mpHLdEtckMaffgLiOzE1Ek+EpDOE+rhGkOjWuxPOSgd3wa1j3TqLzn3z5BKjHglw1n+uu1Bao5uxM+7GxB4J8dwNz3VEmrtoiGZT0nw3mKmxhwyJiYWGdW7kS6BojwhIQTRYZP4xwOqL2bzhx52VwIWVxB5m9hb9kVH/C4FSKNpn+bVbKA/SEWta9XkcEA/XmJn6fEoTE+Du2B6j33ULsjdg50ZaIr338dKV3a+onMvAz1ozD8HHQ6VruyZ7lUHT/TlLQSdkHbfSr+BUxsgQ6XkzzgzxephtuEpgr0ge9GL3f36e4PkCDSjGue+jp1HoWaTDstNar4TsyqAx25R3n+jUU+e6M/jbfW0C6C0yMYgilKKlGndu0t/7GmnBdYwxFtSON8xYk2DcSttEIQdpZ0Poua5HnVcp+KR0XPxXwO9ZXL+wfrZvQw3kHGc+qW81jl+oupsp9hBl3JWybXEK2ThSsWQGtq/XkP/wQQfStZCCA7eB4vi4P//DYwvkeZimH5CGai8NMVsGWz1IDasaZRGZYD9787k2kqD7OcLww5+/CgjpMlZGZvQUcwa2V9QJbxssvJDMiZlAnfBcykeFJkT8V9mb55q0MITnKWJLrCJnMq85L8RDdkzaKHswK5LeVlK04HO6ys5s5gb0GO11Q1iZD8Z5q/zNlixhzHiJk4EhfSme39sRJc80XZSk5m6IeyQr1DmhNZF5BkOkNzNSu4IRKYDVFh6jEqOLSARQiMXXYeg00ZJzya7SBXxCCwS5vpDKazO9P7qugak359exnQRcfYdjb2Kpb55FQk2YZfgFpEWpJv7uxBqalzTIZmPYjBXQAX/pGNOcn5la/dJPnePZi1mNqAp+ZaBPcvFyvG+QK5mEDm22MJX7jsJabesEdGMfoJB2T9UHNQLH6EHVQdet/EefS25hJIWzzjBoeVFtLl2EOI/EZk++Iakh8wDMUSFl5glaBoJ3Vkl8ZNqB1sOMq2rmr7/g1RG4Setu8xBB+uL8SvD52fAjeWKxF+ALdk+NWr7ymBlj5dd0iSHnnAR/sUrAwhYfHTHY= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bcaee4c-b55a-481a-ca78-08d9aebc67f5 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:07.1961 (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: ZSL3jRK1/TSJ8fF2PFLNJySnca+/yvp9KyeEotL3X4pac6j0+cjvk7V36tfZi/lBBbpBgDnmiAMhKLj2lUCYEA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0302MB2632 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 --- Changes in v3: - Drop Kconfig BLK dependency drivers/mmc/fsl_esdhc_imx.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 4c06361bee..85cd72a796 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; @@ -1510,9 +1505,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) @@ -1611,25 +1603,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; @@ -1740,14 +1713,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", @@ -1755,9 +1726,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 Tue Nov 23 20:03:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558790 X-Patchwork-Delegate: jh80.chung@samsung.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=bJNpvpyU; 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 4HzFV43DFGz9s5P for ; Wed, 24 Nov 2021 07:04:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 559DC836AC; Tue, 23 Nov 2021 21:04: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="bJNpvpyU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 96CC680735; Tue, 23 Nov 2021 21:04:18 +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-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::61e]) (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 142B580FAE for ; Tue, 23 Nov 2021 21:04:11 +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=Iv83p4ewNPcgSCuWt0QZQ3PPBEVlLsE67/JHY0jHsbdeKbsBecCnJjduoEbmpL+HNSL0ESQf/ROZVWh2RItbg6Uoa3zWS/7Hx3cXPi7Jah2LpxpEWh3bODjLxc46ydTifbEAsNhde8xy4f8SThNSS0ldhkaprkbx20sIfj+XyXOZvoSCp5UtZ+WTMovsQzRLFgdA6ZgyS2GCotw7w3t4cSYBRsKoOp38cr1xUJqYeQbD2jYD9XMY6YDFZmbVU65/NmCcFMm1rEwOQUJ7B0mY/bLdmRHJwU8ale2VYEZBjs9N+aRdvpSSox+CAat3qAtjkmk+vI1ovIpLbk6/ARuMxg== 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=aacSvHTe7USMh1ewdqUcDr3M3bZjQiD2Or9WDAifHIk=; b=R8fxTwOhbM5Wj6l+NBn/TrvFsohv5DaGdAJZvgt5m+TCvn3FV20x8mjrgQcywdHPEBKZN1TSLB7zsoWTp/uOdu6pgiVsNBRNQpvFFOjzr86twl+nQ8Yyl/WeVBgKsK+xR2fLzdB23/KlR0X70koTJ4n3WAxOw9ShvCXfBRzNpMRVg7nQ+We+ZnCsFmYElQqpFUL58KDbna50bk6K8Q8noGewl44d1MUFEpC05kc8vnZkmdF6Um84n/CRiebwqLQdeQmK2MvHYH4Hxi4xkGVzNQTJKLm0nNTvAuQhKNVMzmTW1Z6ZlX8IXXiq4JeS9Yw7XCovdYSIOs1gCuOlPg/dVg== 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=aacSvHTe7USMh1ewdqUcDr3M3bZjQiD2Or9WDAifHIk=; b=bJNpvpyUx9/f6aFgwIOYor7/qRlwXj60R/Fl7lPL9Qfwkzuh9deQGTdHvDXbRFJBRvKerIu6DWhCPHInfVE5zPnFZLFcb4n9qiaZytZC917efCAbPcv7cT9wb8ME1cjUPtwWYQh4EsCXrhhQEoFO8vCPJGBifzF0FbbdVs1MNGI= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:09 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:08 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 02/12] mmc: fsl_esdhc_imx: remove redundant DM_MMC checking Date: Tue, 23 Nov 2021 15:03:37 -0500 Message-Id: <20211123200347.3772343-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe6aaa35-50e9-48e7-e657-08d9aebc68dd X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: 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: Y9rwTsosn1lKqDnxruVUAWZuJc5D9ss+aQDcSKtCNTuI8tNRE8bF4PK5pcaKX4gtusyRN9rLcg5T6CPM/1OWfkb3bm7FBV+wH3NTXxjZUVdPrxiYSval55Fz+o4O4gaNNNcFURSIeY+DuGqKCe60xqElR/5M/EniMrSZ3kzdY0/GCYcqyuYfbhGttyu+sNhZTFNkoY+hYcuK0u2TbThc3z22o1ALSr0fkJTLOdBSv4PoOJG5Uj82FMODN41DJjYocdCjLs0ll3OLlR16adHMbUBwvGbOuh1IiHfnZ83L6vCsl9u/TjUy7qJQwkouLu1VmC667AiB7wxjZ0z8zNzcw0RG7Q6UIbIKXa0hWkK1x5WmdcViYTuqck6cdxM+/SqyW8fh8Et753k2WstbqdqY+x9Z56C7z1niYKiRIhzMW310M1Vpevr6dfEhfcRx5nCcZdybaeAqEGsTsocVB7Tc/fv4CTeIf1kGHJhTU9KgiJSZ069yrVhPPFRQtJ2XpEIejLHifoyoF/oUTUXWz+U8SVVpS1fU8uL5pvdFeQWPPCRVqfz/5s+48HbIEVH+Uh/nm0On7dd5wAMwSOblrPpQA4kWWezJL+Ph3d6i8Bp+BgxpvYmObdxuW8N+SA7QzhBBv1YaxzpioVPtBWQSxZruaW1OxX3o/A6G+x8g6Y/QEQVZZASeI3DHdbsU0ZXY+a/Ard5w3GGsdjk/DEfh7clkhg== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tJFMPFSL2ER+9HiOVUPNUUoYmetl0P2dxN3CvT++zbk7S/NI24OU0nFksheYMTXErrbtSQR+umZpPUQ413a9C4dqGksBzbFZpmOcxA+VVcTXgpuUgP+UhP1rcZaov37Me9x9x0EI9X3i0UxDt6K/ihjGrQFU1C54cyHriL1FrrP1dedVZpP3xSdP7SWOLOXJdnHP51ByzGcQMOSZRpNWAVeAy4kUUQyQyybT2/U2saEIU5Vf65aWr3CJwo4fyNgpvR/aPgvLThP1rm+lFKQtgv3Hp4Dme9VyJgZ0ERhaGk04Xb6cF0C7jnZVr+zGsIx87Jny+CWKD9skIKXcHN5RnZBeiPxjcjvP3aH4G8tlHTP9Go4onvdLKSkRA5L6L6QSGuR3kinlQVo96aiSJZAgsXinVeF00Etr5Oq7EvXDyxgfwpCuC1+QE3Aqqeu64Cy+kWfv5kCPhGGq0ewtqvgKwP9RD/3boFXYfHra4XQkdR2GH+WeFGLk9C3XYlFWdq+gp5RsbhvxurTS6cxJe8WFpAeCJ1P6gI1pte21k9Qf8Zzn9NJGBm9Md3kZKRFKt6EL9AvUcrmB4W4QG3H7C0J3yknmbx/9aNIMn6otqoP8HxCx1vq6QqAmPoph3V4VMSJuuuW17AHZxHYcAh+xSoXIQ+x/9k2w3HD3doYl/+V+6YAA+NA0U6z7Fc3j/SQUHrHKgoZHR5rlRl9zD2dgsg+JGfUOHF0zkddRPOkCxVWECfDy3BD8OUObfPiaMejf4G7K/ZsQWwyGV4otUNpWLXz6o30HWfp+PHeOpO6GxoPnPgwJ/z9/lRhkdbjaTNOoMD/VjGVCSQdsfvAIX/TbsQ2dZ48SWGh319UOSVFbnsqc2CqlnAHtNqgBp5c6MTKFrdOVdYFiF2/a57e/lWdYdHJy3FtznZbGmKEu1Ytb7bXf5jkg7r+H1dV+0C/mhd1dYNuzmPXtFRcheK4WNlWNR4vmPUBur8LBFtQq022+fd0pmdb7AxR6YFkEWy+kiwnfUAKEpF+taDKMQUHJ0sgsDzr2AGKksDpIzfZhm0Er/j6Xj2jUZ2W+6LmKuILJ8ZqZbWa9OGp/AqtsHOqhZ74l//sQJ4rHxGCc6Rh/nBzQcI6bsbaOrjdgXhiwb1d6wuWvc72Nx+s5S/axvfpP1rLFT/19Mkr0E1hcPj13LS8jl1O5LfvzSB1F6zVfUZ2xMRu1X2PyuQu0u5H6KJe7njlObNtM6tpNbGOXAl2nwCgsd51lT85PwYUiJjf0QAeqVrS2RDic4wquDPA1oM1HxF16A26wE0KgVMd5epIN0P/8n6+1wg0HXC3iGFTl7N8YGNwYiLJ8KQYpFOvf+zh1vYfeNomlydIcPrwqDSiAEww1NavI2ZleWAa+CQk9cFgEY90DD1mmcbBpcnq4qh6uJfupi6DcLbB0mMgXYj7/njor6wUrU3QJqeTjMa6MnhJxON2+3VmlKGz6s6UWG2vjZm6qOcHT/6qpzIp29kq22nfr/YwgfyZ6flSZ/159WVRPSsZ/G15jn6XDZ3cSyVZF0e/jUhh0Usz9FYHhYOn7cKeoPn00dJ8j3HXJS1gsXh/Pxpw4appcZZ+0jlnDuevS1FuSktRpJ6r+Ut8nESFeR3/GUVYKGeg= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe6aaa35-50e9-48e7-e657-08d9aebc68dd X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:08.7952 (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: M/9UWurPor50ULPLJ+bN1/AnMBSdTVkRIADRQ8KT/PJsaY7pucxrzl+QiMhX4rbPPZM9elMYba+MVxrKmdMNyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 85cd72a796..121f9182f6 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1609,7 +1609,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); @@ -1675,7 +1674,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 Tue Nov 23 20:03:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558791 X-Patchwork-Delegate: jh80.chung@samsung.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=B0oRevkc; 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 4HzFVG3dvwz9s5P for ; Wed, 24 Nov 2021 07:04:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D056F83720; Tue, 23 Nov 2021 21:04:31 +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="B0oRevkc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EB39182DF6; Tue, 23 Nov 2021 21:04:19 +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-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::61e]) (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 4BB4D82F8B for ; Tue, 23 Nov 2021 21:04:11 +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=BK/7HOBGs0b0yKM/Aoep6UV7pu675nco1qzvKePVFY36Fv80bGu93BK/lELj4P1u0OkiWwl7QnvJKWxsJ/ugB9STzEn8qWuUwV41+s7zxywfQBXZ87IArdjdGUYRWYhfzkva+IdmR7RuZ0j9vIG2Aj1VDO/ubNQkNZKEXUgnx2zHSVUTCe+I1yzTcCT+dUYYdh6da2tq87966lR/qtzhs6oxEgg2kY/qksiw/G0sNAn7j1sBzi0aRpgVMescP/gTrzJyoyGJROwCCghuyotC1KQ1pd2Qr4moKMHcRSJwzITqoAtsUI+zb+4w4N2A2oI1hMxCAH4X3FZlOkfvOiQseg== 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=i7JtGJYKyJJaK5uRs3XvcgLd7A/FjsG4BJnCBpTmWgI=; b=OkoonLHtIQLenipOie/+pItEm1BJ7CbTeAsL8lcg/XgERUfH1AzJzuCOJLD5g4sOK/+YG5Aut1wuNBoB+tVc4hF5ONCzB96WIwra3W8a3VJge6dY8z2utqInQYCvc7kdLcHoY5t1EfidM04JOKebE9gHFy3WmdBx+8ogB6ohwD0UztyJUFnqm+EgMLdOqmTWj6TRGoJs4zwbVFGtP5mE6nTMzSiMj4RQCi0hwIaHDOcNLiqsCJw8xHcSJygQu8aWXCPp2NeP2a4waNwVpGFXuyMtsL14Q7fe/4TqKivuh0bDsD6KbVspB4z1dPg4ilI+BaX7zm3+9eS2G+OyX+VpUg== 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=i7JtGJYKyJJaK5uRs3XvcgLd7A/FjsG4BJnCBpTmWgI=; b=B0oRevkc1EYKQuiZWpD+5SB1FLxhu5mZZS9subjaQxpRVeIEpqIVsgX47OUKc8oiA+S4xsOsYyGvLynKml/lN/Nx7iqBCHZZu4sWs9S6NpZezRfo1pxxeo2U9m2aeUhJWvawLzz1Tg4dwCpv6SMk8Xqw5nvoVgDu+eOvF1IDDFc= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:10 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:10 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 03/12] mmc: fsl_esdhc_imx: fix voltage validation Date: Tue, 23 Nov 2021 15:03:38 -0500 Message-Id: <20211123200347.3772343-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 05155fe2-a7f7-4cf4-5d2c-08d9aebc69c9 X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: 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: Qgt63uuVqVd9ZY++/p3/atYNQ7GctaFnfOhDR5PnTEIc5inL55k3Og0lHKg5T8SuYr+tgnT+tdTrDlRYg/J3NltqO3iutg7nPNkgSgXJHUnrlrErCaRQ38TPQYgV7X0GABibiaDTDZzhAxBUxfUs00Zpy+dcsoSidcF5RmzR6+YnXIyqGpkbylyFJhAqtTcSSDmJZT1l+b4nzVqU/y7JjT9WFHSbKP8bdpQ025ki4noHt1Qx9ch+9cDDxtjqYrf5sBxImdyn0Vy+DG2NFeetBfM6kmtlvY3dLIMbu+0ijTbuZtkNKqjB+gtnupFvE2THKDclUdH++mlw/04M5sLpURuOL6s45JiLm1rWYNwMCLT5vFIjpWYv4EV7/h5tJtfDxjJ1G3FiMz1GMilTkaC1h4MrFlfhRgIDgn2VoeQ1RPsU6sPURZP2O40K07adtQTM/sAha2mawhFBEaTkp/zkyqvUP8sjUpGJVClB5XCtQng95hXInHtKQ1ffFQz4YNm9eO57L2lp6ew1bMgoaEX8kYbi7BP1h1goIVeg5tamCSWYSLtzlJrcZyBHu4QYCEv2r7FoG6CNGhmVEglf6c7be6+iupE83DGQJVLtJPHRMageWBhzLQGmV+7RJMjxAuZmSqKhpG35yaKlRAMQ4Vf6gTa2Iy0BMWShK/QTXjU5CK8Lt78mIHLSQTkAYxMcLImBBabQzkJ2usyCh5uLA8cEgw== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3kav3qmtxBbYiHQ+bVecQ4QKyQ+B0yTdEMtMey+sVVBPmCkFcB5cBeS1fgmT3gJ6/ebpRunuvwIZ9HksLuW2rBZLFcEFddOmz2v7A5drAffWlLCr5Z2wXbN5ri8emjWs/GlfaCxJ2Iok8MX25GyOWSlqNNCkT9pOLKViHx5Aer/faWF2FLAxJY+q90uk0lQS7BZYI3avryJKfbOs0QCS1AdDHlA67qFquZgJnznIgxK/C1+OsBSR5fJ+jq+AiD6A2u1JmI0TBFL4S5HIP/rs3P+V1lqZqsNh0Vv113/oli/gm6GZPmaMMHd22iR3LIShXmH6yMb0w5sTQichCYreU3YN491Nlz3ydemrdEBFVNQ9kOcIsuGsqH3SikfKOt62LxpMqOjNuBwrn36G6r/6fCTLbR9EeX8tUh/tiqndj0AEU/oAwiJgSK4d1UgshyOo0oM0/keS9VU5DHrnDyx/KC/K3CMPgrVz13i82D5dARoqN6lPtJ/0Am4JBS7rOdmJ9Y6SIOiKmvREz8Y0G3oK3bMr+XsttY+YI6PQm5YLmOM4klhiFl5eE43/CdxxTlCgn0QXrKpBZbwNn5Fgs8ezslBQvPpwQvnwd/DaKBM8yJIthqVJCeSO7s2u2zUHHaZSAIMY5k4p/yvWjoH/MxBZq6PYPrE+ygRFygfei7g3aH/N4TLptQsojkJ4h+b1FrM3G2ROpOurhBZjZz3nwqgk1mB/EkdvKnAEw6JPAFvyxsyE48w4h7OOBI2yt9HDdT64ZCZ6OAnulPPfS0Vmb5LqVT/sugFTRL3Rni0gcqf51dgT/3rPnw8xZnP6wD0lIqlEdNLUv/k+DysAz2H0i9ntEbDJy4xvkjrSL+tdfcxmpz6oZPui7dVE2DiR/reD0pRymSYdQVuf7nmjzP2NqgMGFsQxpJllyO39d5EhrfR0rPk/pXoVwkcHILS8DJnroQrGRBjiWH9vYjb0UGGTQCXKiWugKeqOc1WXNYYXSwAK7PI4zrmn3g/qc33Z/VQ0+qoXBHGg+hZsyZZLIZiMVSl9uuAjJxyDV3MnGNFXBY9HMYLgUzdmJODFnTgeL9047pfaBCo0D8PZkOvruyp5BDk/RoUQizMPR8/hR6mzAJVoQNJyWcUL1lGFgtLI5acEbuAdwRMRdsvgJEYZ6YNgULVEe/kAm9//XIPPJIcPGKK6wGYksFtV34RgPNpXJQQNnbW9sX74jpavRIQKoEPYOR7gEu0zRzud2SjUxOzgBEc2ykNS7Dt6w6BWUqtc9XH/g7UY53pA3IE9/o4Xv4On0na2MSyKl3qYhgy4tzfOuXfb8x3ilKY10IuHRfbq3/t2H1/GJmXZMysb+hF3UPtre7ydTlddWwU839NspI1QCtcCOLIkXsas2Lrh1ZHK4eX4Mo7TcC9fsZTZPvwXi1yzr3hA1VYnvfDbi3Dyh3Q4EgWMK+oz0ESkTQRLXXKqNi2V7XIhhXW0AO2OFCTWhYmhOXDPNqibJ3ubXbfemnPed/7P7gH/YVMUDWR35Wg9D4R3QL5dSGctAiwxAlM4WfmbI9DCvv0IKCiUYJa9i0CEzfIiD8a5YiFFclM0w86rXfGSeT92vPVX9ELZClP/Phkk7m+3vR1j0BopOIvA+xfOntu0eMk= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05155fe2-a7f7-4cf4-5d2c-08d9aebc69c9 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:10.2584 (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: JBnheQgva5MHulVwYwgSY83j4MDb5Tqehd+TIAfy3yY+rz1e8u56g1KuoZotqoJ6T6K64ZLDIC+OtFHDG7XEKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 121f9182f6..f4ccb19d9f 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1167,7 +1167,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) @@ -1206,9 +1206,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 @@ -1219,31 +1217,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) @@ -1261,7 +1252,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 12e9163382..4ae932858e 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 Tue Nov 23 20:03:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558792 X-Patchwork-Delegate: jh80.chung@samsung.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=wshc0Kzi; 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 4HzFVV4vytz9s5P for ; Wed, 24 Nov 2021 07:05:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 30CBC80735; Tue, 23 Nov 2021 21:04:44 +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="wshc0Kzi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE54F80735; Tue, 23 Nov 2021 21:04:21 +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-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0604.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::604]) (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 9AE4A83685 for ; Tue, 23 Nov 2021 21:04:12 +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=UDX+UIiHupyyW0zqzUZSNecHiMUAqKZxJ4d59RVaDDrF7k6ovQIBttU5LAWms6zkmtn4WIHF0G1ceGzG+U0XrBzyH434VWg3LgAcE992FgA+y1tNT93HtAm3t6ToU1kpYI8Sr698K2OJ+5/7hoXd0ZDpWK2ls7VCXfJogbghCeC7eOaMKy5pFCE9JEfDmlqXsXuxluyoGa5kfr3hzdeIYitiKnkMiuAxGt/l9DzV9+rJhdRXtKV7+KVlEmupnJvr4DzZ1GA7O6tJs4okio4U62VP9IgCnRfxfwUUxCHWy85R2Bh/mcyUBBARGE6wBe9PmfJl1WjChlgvoQhMfZopeg== 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=CdiQBEu73iOM751GIbnH0J642UAxHwJ222INFVI9ikE=; b=XAJuqonu+FdZiVBkM4CoG+CrI7PxcY/HAnQNxY136gJOKa/qZj/xWv7E8ozxQccpkQylD679FsX5mHE3XkpTPo0QztUXE6SZkXCPRdD42hpQwkpum8ok0kT2sZ2cBPHHYS82jmWt3P6G8qtYQxYXnS0YTovPaL01OboYBinCfduXI/jl/S3s3Z6iD6m9GDb++X+v90UbBjnyKhxHqGDqTIe0us/pfafbQ4/Dc77npdtcZFZOZ+rfOu7+yLwHpo7YGYtV535hiIPdizFyMr7KyLXQtrrXOvPo31VA9dxQGYuAnVoIg+nkLIkRn/MMAXw3BEWz8mGd7I8ok/yfEsHdPw== 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=CdiQBEu73iOM751GIbnH0J642UAxHwJ222INFVI9ikE=; b=wshc0KzilJ4Zrh4XsRFOhDyW9qtUDnOAAYJUMPkzyJHfR1q72p3iAoxou138hvnUJhWdDmHwkZOygS+YOSBL9CWe/DMkIFmDuxbFKy+L+siN5tsT7lU6wpU6Ovt/2o48Kd9/Y0c7lYS1Vabk6M8x+5qjq1UPO4fifs+A0FMQwlA= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:11 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:11 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 04/12] mmc: fsl_esdhc_imx: clean up bus width configuration code Date: Tue, 23 Nov 2021 15:03:39 -0500 Message-Id: <20211123200347.3772343-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32273f35-150c-4e3f-79c2-08d9aebc6aa8 X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: 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: /trIU/svjYyBUi2ST4JBpz3FnSBXyNvcmdtLtDi+nLW7T39tWewzD3Ou7vljB8hwkyyJrZIgp/J5tMCBOIBZHMQ/izow+2t9zJYyv4GvGNKDIiPe+BVykmPqc4NOuC1kBlrBAcS2E5a/pAs0YyvWDXLh+DZo3t/DPgnOH6Cqi88oaFkpB/EIjg7j6SbnXrW0siJOUha0CM8tT3FgrgoOMLbi8VDAsEfLoDRRo8Jo/XfW/Exzx7KhoOJXiwSKQYMtS0NFwcg00qjNufnVSsZf4gTR5X6G1e0cgP4SOeBh2fGfP+b79ZW4HGQK9gtxBN8+QkFUmKMVSOlISnptMERmM0fdKCRvuacfH1Un8Gw9H17xkr8eSeD/sPEpODeCWodGLzLoCZLGxrA1lAtRlRqgwHqKdAwB9VfT0TfmAx1oSC/UyayKPcF6zrSpM0j7mBX60JZe1WNgMyTR5IvK0MJRxcp2TVAKvFAiIftbz/Xie5wbCd4Q9acULeHBwqRtrAy5FY3oxnKRBIrNKpi52LezbuVdel/SvIH/ZqdMGOUgXSPaYuajCGG4vLHdBvfvYcJTCZ3OXCVQ0o7sJoktpTb+G1mCiwBfFlGcLw+KMcoarB4tuYQYUCRaK7aPBPCMpgr6fDPQQ3q4Gvu2shnVMV9zZQ6X0Q503tl3Xl681bo8vjzCGFQnDMIqAN62bkRcQ5wyUQSxg75u11DQNIJgIcptaA== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TZwchUpVm+VPSCdrXQ5PARyAVFPX+iODM+bwhRN5jlVIfIIpV/5Onkf/s4D0kBLbEioO10ej3o7Kh4YsNK2r2U1idhlRKjJy6Hxak0Gnw0wJ1/u+ymFoHJnctpYY+s0Qgmx3EKlLbaTB7IaSBBjU6MoXEmQ7CURF0FFnbLEDvH6vx2+C/cVoKDkb7lElpRPfMt0xzGYiOVXKO7M7joKgwhXJGm6FPMSgVuKAC+rAg6N4JvxI0HFI8cQZ2sdLe9+u/10zWpQaR9tZenHNZsS0Y9GgHHL2BQpmQiceFDuMwZb/UOa0qypJgCaJ/oGUQBPAZEhonNPKJVbMCAOkAXVuq/8VPcZQpMjZGs3Q4qzxGSxvpASZ44Xz/l7oWj7/PAPjhIQXrDCFhqviMqk3y3JhgKby9C1QLhE4+WD7/HKrnQ/bcGD9GP2oP/5Hc7uSDd27yqMuyjq8+s/J8xURf7ekRFwHRn4oO+QAGCbi1v9CHAcE/vlr6vmA0SP/W2dhY2GQg3R2YIrXWGYB53ltrEW9jm2sde81zcL01d9aUbjUvuden3BF7Xx7XfinEi5kn6+eMQHTJWZF206yFXuKB4ewNo5RchZJm0JJ8MIAh9kYVtChy7KnVd2Mv8h9O3A4abwCsjlUlDzKTxGV5yl8ftZFx7gyVtuy7z1Rwt3leg3XQCoPGkjztDKXuKrQdLtAwmJseb6vTJH5ol7cvXSjOLrZqMnj/xRgGqcxnw88futeQUfecCkN9qWOcUbGTlCHWL90B+ITVdCM47BiJOyXgAlBxmD7cUcSj7stHKWWR3tJpz8+pQ0zIfPD63aoZlP/in5eJNQQaf6+igUprlPzlOhjlCB26KVBQIlNrvKtbpnosUmys9CrwZzTSKESsNpN7JLKxxKjrErMHqxE8OO/rQ6sUIiSD2sB6iDTdzGWSWMzOXIPhd0zEaQCsFn0akUt7axAmFv1tXrVesRbGwdFX7uueG5hzdNh9LOhpItTAPu2vW23U+naPIq6IfCjm4ygtmVQwVs37pA8Z7L46EGPobGusZbxsb+OubVILdGT6WKcNG7XpOXItatNNF2vcr3nx9fan6DAMfHhlpbzglqosYLalEmt+Cwlig/bIMBFIXGQIDldSdjfw0UH8XvPmIUkoon7tKy8UfScCFqbCPdJmOxRT1w23yk525ZwGtr/3/9nxocQ5tKtt0Ab958R+Xqky9IjLGjY1/eTJVXAMdF/vM3I5LPf4ulhMIQGtWZlkOrUzuRagejysBbgTbbV6b/KLtYO7eY9T7olIXuzCXD2wsNtxdORpmzGCICun59NTGinT0yMgEmajsc5jvMMUTW9Emd6v6+bTem8YNr/LBXVnBiwE8q9iPTMeFbzmJBIXKVnJj9GTEOm5/RDGCw0ndS9BMp2A8/dEsLQAFhpMNf6heU6j99D2WmKpecyJhab38WVCSd8ud2o7grd3zCzCzE36J1uWFvdutg2tUwNXmQrvHaPNHp7M/ay6F1OqXdDEOTV3yPdRLNNCp+ToituTOlNx78LMP1Gxr39BwbX/ebXjk3Zp3GP6T7DSS+sleQ0MQe8eGjFXKGiFFFV8I07vcP8yH3sqKlEWY2FFFJDnqpLkkh+NGbv9QlX3RYRcRnJE5Ch2oU= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32273f35-150c-4e3f-79c2-08d9aebc6aa8 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:11.8155 (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: BTPi5hHo326Pv6YtH+AvDHnw6pai9NQMYJBbqG3wIweTaQa/zYP1is3rf1wb4GldZzjbKaRa6tmHKz0DfydiGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 --- (no changes since v2) 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 f4ccb19d9f..98b3db737b 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 @@ -1235,31 +1233,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; @@ -1297,25 +1277,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; @@ -1331,14 +1297,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__); @@ -1420,14 +1405,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", @@ -1500,16 +1477,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 Tue Nov 23 20:03:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558797 X-Patchwork-Delegate: jh80.chung@samsung.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=EmkHaJyt; 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 4HzFWZ48gCz9s5P for ; Wed, 24 Nov 2021 07:06:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC1F283760; Tue, 23 Nov 2021 21:05:04 +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="EmkHaJyt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9D2A08321B; Tue, 23 Nov 2021 21:04:29 +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-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0602.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::602]) (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 63AA280335 for ; Tue, 23 Nov 2021 21:04:14 +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=oFOcPOoVeCzWexnS1sQIL+HXQDzq/jDGPH51FKY4RmiXhj3EbhSqBZlgnrjTbPTFuwX7kUbe+rCkUwLz2zLp7OhxBIh1GSKXstBh0UsuDuADAhufxYcxYzMKXveISajzJ5CjtE9fw8tLA70RBRcjncSwmhVly9ccu71X8gfCBzAmFeOSBLtyrLLY3SwEbE+2OmywRKfTTWQ8vr48LciIzsnCWKBzzp1gBT/0t8wPCP9zPbPw0lnjUUyGppoXTf8TJo/PSX87FdZ6lrFj2L8LOhE0dP+poFZYpsrsXyoupKnOgMM4C7/jz8G4RRrmLCEBHfIFUQJonjdSeSuIq3Mp8A== 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=xDobmJ7AV4UHwB408vhBE23GrcPc1rmaRAl1caf9udk=; b=U/54h5bY8o045HMixG7CagNRMdQKSWHKRkgYwoeH48aeoKsIWXZXfDoH2Am7xDC62ubfkYlqFTgW/W+Qipbb6oBkH49YucZcd5gbRm3ybLE69R6KG28jD4hU95SMyRLPvHkb4I1D8SiCcNLvi7NmNoGBYsZN1BOhFuxafTjlkuEgx5Au+qa5gRCB9A625eE3yO7Yb/mmR3vlnHwiLJqVTufL1FLkmUoMrpJyo5OQ5iEsLOckn2GzL+wpMKYAwQBWMk5cv63wimi3wKfILYi1ZI/b8vd3e2faxL7LWXcfXT0qdRVBbEhwSFN8SNY5ClnTNgvSF+24P+B/AV1hOrcTwQ== 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=xDobmJ7AV4UHwB408vhBE23GrcPc1rmaRAl1caf9udk=; b=EmkHaJytf7LXxlnidXskd4opU6YFBlWM/CoQ0mlpYU4bRIiL2/HV4dt797J8A/Tz5Uv063JQifgAJ497sRur62xAeu3Qpkxd1aPbneIlkuzHbK7p50EAPWu+lFjSB3SLuc/n/+zH4LwfyVEq1pQAnblGPuICMULZr634eENWhaM= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:13 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:13 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson , Simon Glass Subject: [PATCH v3 05/12] mmc: fsl_esdhc_imx: drop redundant code for non-removable feature Date: Tue, 23 Nov 2021 15:03:40 -0500 Message-Id: <20211123200347.3772343-6-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d96725d-55ac-4c2c-8fff-08d9aebc6ba4 X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:386; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ahJ2LxZ23tzdfk8Ktxvr+ElV7YskVdhujJVVNejxzP1yq1rch5teZ2WHTF5tkX3Cbtnqp8zrSxBKJzLfGvrCAtl3PKnuZdY+liXd6JNcd4IUC3a7NCvO5qgDB+IG5og6FxrdBuHu1Iu3MOBCHsP8wlIOZ6GYdBIqo208Gcot9Sji8SIon4FRBvnZJtzEwDkog762Pu2Fpl0adQ/5b/qQ4Jy5fUM+VSyJzvMpitYAXx3vUoTQyFY6tpJze9APjq3c351uKLck5ODnvSJfByQjPHMHaJyMNIywEhSaaCOglFakTFEzXFxZRlTSNYl1sSqhL0SHQzOW02Ta5fHKfDqgPjBmhRXSymkwr8CGiTszsD0Fc8pJB1Mmo8480wiPXejAMVDx7hRX3Qkomns0X0NCS8ry0ve8Y+a8TClnUNa5/isIWbGIqQYuuL9u8WsYWu9ab0CsILhoL0G5km6dNdYCM+Balx87pOTpIQRDuunXLmZMRdJd6IPtE7rSM4LnQCaQUZgHZ4GAn0ysocng8VM0dIUyYXSizb3ysP99yHQhzrZf5dv9wpPwkkxhmqH2al+8p4mhhDEZ9RXF540zO3a5nQl0kkt5x7BPhdwS6mzA9BorEUgnQFZ6B7M82nUzFcVxTYLy/HL0FvFVcUPwnioMP2/ONeXvro9kL3/3W4l8MwockDOhcHLgZHWyXsKgC3ajWkTA8ZskH1h+f+TL4FJUDg== 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)(26005)(8676002)(4326008)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6CvBOdjXqDvxrupRMlZObGK0dIitAMnkaDcPUFzLdTwIo9WbZzF9fF7TwQUV0LLjiZglcVaGoIhxZ6N7mLiEn+SkYsB+34YP+vKgD6PTgOdNLCkOli6074lbsEtKuoNdl1HPsGvbeI3rj7B1oJz3uIF7c9vWSp9+heg+i4J6dlKyY9glC159vci1Bt+edXiyv4BHctHiKYP2kAXrwE6C2yMBWyTXONPWxlvZ5yNL4KI9PSbbU+mFdQLRJKmPDYT5Md5e2KeLp3gcvKppt+zaGxIcdD/cRhfWWzQAWEzCalaWobK8sv2aH/Bdb4RqT/D2mD9pAIHaELGw0fNWM8P6pLSUUT7LhPV5JOLGhxTMAeFl2yx1qwls0MUm7dIXSTJ7Lxm6Oil5HD7waPnO2X8irThjdFz5rdDg8ZIDLF9ENcn02PcAedrcnrv4pmO5QypdI/WTU97ArH56JCW0mwulhWLNgCl6vaxQDVbP9HLms1uMGQf7EQV3V3bUeL/5Ls+5nIR/gVTxYuaL7aZa94qhn9ciDsVlbA7ephWZWcFdapjFJFDdG8uR/04zecKS6iduOc00lKrw4YHQd7xHNSUxJsOI+RMpP7lq5YH1n4SPO9/8ERNKqcfCAZCX5yY2gDAvRDBkgUUZRF/2azGDWL/LJKdsdzF+uX/k7gMohzGiN8Oao6QnhEk7iWtKl991KtxSdtwJMbAsU4jCrvwdbLMnW20tGIS08jMW4ZjeWBp+1pR/xV1ytnO4GwRct8yUyVU+igShJ80ouznn+amHvNB2MWcfKgZnK205Bbo7EDbkcUk/tP5Zks6rlDk2Q1jb/7UnGTN4zHXb4zlKr9RwStuyWqoR1tPMKW866R+Szvcy/0eXpMCr6RmHlodauv8H0ooTMuU5qnCXsHv0jc2kwJI0IU+6W2py8Yxh1HlBhM+6DBED3U+hIa4o2Z8ct30QHo2ITd2R8bqTZgnoeVEolvG3UuSBmc3FaYVR4BcECE7Ke8TANDwayKYjzQvBBuUo7JIVNQtcok4GoXnEL4QaP0Ebsfeq85twBa0QpcfDdUA099RnQgTXKSmpe0AIHwgoGG4o45cSE8szWog+N7zD15NyQXok6Lk3UUvfU7vjN0gpXM8FsXpGeCrfVcnsS+J6SitVfudqgtvsIoODJX+LnHglcHVZ7NKGM3oqvwFfnkgBBkTAaqm/4aWoyN0hDx+p/NM5VkUu7nzWwv4HFCJFmZ8RMELIwG+XUOMKkxwmqDXWf+zSzpMRgCSn7kFvTk4zAWhuaKaO01pKSw9jHTlG5xIBWPxKhwttL44tvuoAmAxqVJfbcdWCnxQvQ7h1yN/egSuizk9SH2cnpR/LlYDShr50rkIofmLEB59+j/bzsL4OEPxS/Hw/PbP6jqu8DXBbLMxRwh22DFVSFJsTTJlUJYJxCBmMpJ7Qy0eL3MzVW5zuV3XWALMJi2bZYzr0t43xqjrIXjX9gBoFd6AejdYZaP+WP3Btsfmb9bSwdJzkv4ZQcQKO0cD7Kj2qV2JFawtyFIKCGa97NHANn0vDcbLkJWEsokBorit5Kjlf5lRFUMUGJdfOVxdmgUUnTtlASiULa7E1HREJpKkiTvMvPhjif7yJ9XtFDxv3cGrtD/KOmQIIpnU= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d96725d-55ac-4c2c-8fff-08d9aebc6ba4 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:13.3616 (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: YBg79596sA5lydSj7dHYqot110mrv66gpVXkylhLSTH+hpO5eiSDlp6n3eaPYchUj0DcPCKaTIGejiQF4q3rDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 [ set MMC_CAP_NONREMOVABLE in plat->cfg.host_caps ] Signed-off-by: Sean Anderson --- Changes in v3: - Fix build error caused by unconverted OF_PLATDATA code drivers/mmc/fsl_esdhc_imx.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 98b3db737b..4d2d757723 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; @@ -1086,9 +1084,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) @@ -1419,25 +1414,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; @@ -1481,11 +1469,11 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->esdhc_regs = map_sysmem(dtplat->reg[0], dtplat->reg[1]); if (dtplat->non_removable) - priv->non_removable = 1; + plat->cfg.host_caps |= MMC_CAP_NONREMOVABLE; else - priv->non_removable = 0; + plat->cfg.host_caps &= ~MMC_CAP_NONREMOVABLE; - if (CONFIG_IS_ENABLED(DM_GPIO) && !priv->non_removable) { + if (CONFIG_IS_ENABLED(DM_GPIO) && !dtplat->non_removable) { struct udevice *gpiodev; ret = device_get_by_ofplat_idx(dtplat->cd_gpios->idx, &gpiodev); @@ -1571,8 +1559,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 Tue Nov 23 20:03:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558795 X-Patchwork-Delegate: jh80.chung@samsung.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=HdsVEzYN; 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 4HzFWB3Wncz9s5P for ; Wed, 24 Nov 2021 07:05:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4963C83731; Tue, 23 Nov 2021 21:04:55 +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="HdsVEzYN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DAF2783720; Tue, 23 Nov 2021 21:04:27 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on062a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::62a]) (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 43CEB81FD5 for ; Tue, 23 Nov 2021 21:04:16 +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=QUpzznaQuyGHyGQgzUX4g1bn1Oxgzzyx5wVV66vjNfREa6gj/mp9+JXwQSMdmgLlE30ahypuhefqOIrAgXz5rwqH3HuCUFguRbN/NKbNA3eqBIFTar3zZ1WIqwHNIx3LNDckKDwYm5fzRAs/4R9Cwzy28HMQlLLn39zZjpEJ1OYFBc7Snkoo2tUDhmk4Y/YE36/26B6wwTfFds8jwELmAY/Mz7tpMENdQNlkF9Q2npn0xyhtLXp2+0qv8iGE2JLsiMi/Sz3TlTsosv/YLvPSLa2kxiax8UAZpFQRL2U5VxtMDVlNEOrGGQupXd5GHMN2GUvGwzjeIC9tMXNC3LxyZg== 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=aMw701PSNB08jK3nB4b+tw1JySAHD4aFspXd3JJTiwQ=; b=e+y3lnUI+90uHd4mKNgmPkI0vOc4DOxMTcwHQMI6tn+3nQxQ4W69mUb7vOnKi/Hhi57VMLUD6fWNs3O70PPFhhzxlEna/ofJYfZz5AQgj9GEuUaxUPrWLCBrcWGetOx21i0OjKa8JeCrKergPZ1w5GmXZIakvQREJzmA5GzfmWK6PScLAA60qTr1ClWY0xnqjVnRrlFl5vU5IUhGxfq/PxLagENvJPg90dTxdwwMvK+91AUdBMghgNERQrlYE67Zp4ngJ4/ko6jJes2qUbh3mPhDVjYmaihWTurK5Jl+wXNMmH9g9+zHNU5qicAIlufafzCQCO+ooDeppJ0bEMx+2Q== 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=aMw701PSNB08jK3nB4b+tw1JySAHD4aFspXd3JJTiwQ=; b=HdsVEzYNjcmF7CEIPC1RZEtrp8r65MKtJRg66D66lIPgt4/MFRaZPQyxMJyuha+CcGRzC0yzUCahaCTjtgdGqWV1W0v3BEWWu1Wxn6gVz4hRuIxB5nTqkMpjkqW39+O12VDCSgyGRByYYiDbVxdrD6h0O01LXjtv2dTX6cT1O48= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:15 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:15 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 06/12] mmc: fsl_esdhc_imx: fix mmc->clock with actual clock Date: Tue, 23 Nov 2021 15:03:41 -0500 Message-Id: <20211123200347.3772343-7-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 10ddbe3a-a999-4f40-3a15-08d9aebc6c9c X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: 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: We6MQWtsler3DX6x+xsEME7qEVBt1IBRuQMy56A09IRvhuZUMVAO3nNPmCR2YUojjPCqlN2e94ZAopo21VHUOyLuf7jRpGKllDf89/gIBOY56REA/sDF+5h+vXxRRKaM+2Qb29AXPyJaju3BSAYCEBvm4ZFWd2/3YchFx1EAaGUMz4qzYLiwrFksvQPNQKzpBw90r6DwHygbhHAcxf1BKSPvstNoQpb+yHHbmvz9gfBn07zA5MdKzJbv3f6PafRhBigT3GF0eFACg7yzs3X40paGxCZiYanwW/OnZsFlaaRsduZzxbs+5pLxHYlrgy6QfXsrhVVQjCbS9sRn1rhlGRq4ov10RBOsjSBei6Ccfi5bwuA+aF7dot5jdpXS7+w0LC8PlLatE6f3eLZ9C/Scdg8OVRRKU4vhTVDqQlPkcbyjQzciCv4Yin+GqmuEJgfL+HZZR932CX4h5YxrlWkDKhKp0BhEu9mBZOXwNOl+CmQICI61MRXeAmcQssM1Zxf1knwTf6cTXr/Sp5rkWY1muJMqA3aFHaNXoDUY1+yVP9HZY0uZ8qDaXn/M41FviTSeG0b8WLM4nYWy54R+8jGXYyT3rpvj2ERPU/ZWgdNaO0fvjAqngFqqCoHnJA+UzcpBbolaruXLdaBlmacKlcbshobNNcug4DJR8ihd9iABoLYNeaySPow4HKC0GElJldDL4whu5AcesFCj0y3HVO24QA== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(4744005)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: scl1Vbr3CvkzCjC9OicbauN5uQYPOCZtSe721pB1LdDOGoidpn4FYAMxzmf5RzhABsoPFanugEUNTQJDA70eLSBiOUxybxdKrlmlMhYDbYsMgTh+3kI3sAVv96pGIFL/ewNIHbh4uvBCLAQbiK8N+BzEQEe5LVHL+6K7/6LdybFPm+WvFn0sjYg7n81JWMndePWQGBND3DMP5qo2pFeFs/+BDrxOvgDYHZv18XkfXNRI8RxrIkua6rKeErWvaf0iqSsRY7QuDNg0KwQSnc74by3+qd2Xh38oVVi1xR8l+bPi1d1rVpDIsRV6qt7PKAkhSdbyvRKrsJDOExnXkCS4nhzaQW0A9P4eTZfPD2GDT/EvsPSQnO1SY6aoo3VweRVnUb25Wx0k6CXLcP80NEMI7dNnnDwhgzjTv+gBGmaYtAIRzVgvPW//XuYJLf1OZAq9lw2+nge6dRrM+rlsh7wJv9owJa1Q23E9CTBobtOgQHwSaeAzWeYTmYamRO6uIJxQsvgmy0/dJnqkE6B/Fe/a1o4AqK/URzeBT7l55XfoB5gxKYDGefoABjRu9lZEsDlTgdjH9RCU96vkPlfTJkS1y6YLqcaGfbiaPMk8DDKWZuCa6pST3I8MhNMmurhIt3593FqyY+YmQRImqCrA8EK5TiZZndJbMDaIRvuhnAhZ5zz0L6lJsaPdia3Gk+RBd1Rk2kwKILJsxtXY8ohzHcZyS9Q068pbJJxD2wMRF9UWqoyItU24OvnyssF4S/nv9z74WrExnruDA7uLvP7N3Z8bHZTyvMK9Qdovm9KsnFkLAcYcT/F5SIpoNTgsCkXqkvUv/0HBUF3+dX/1D0cn5AuP1iadA2cl6yrWEFdhB8gFrVC1hGXAjdXonfdW3fSdEf8PxStOJtUxwqpgocvhjQzRvkl1jGJUvVRG0Qxb0P7OjMEr3smwLeC8B+e0nOnujB7T83fp59KsukUKlPTilhDTLddezxQK8t4W2tmudV2J6p6/MmwVmB9wkEXZV8jDd83Fd6l1rlNDdSXvf4ZkP0BT3r1TNOKAYwSWI5G0qJ2ut5u1UsRJp+X0AhigGNlLHTDKnzsHJgGjdL+XEfk4+JXLuHBMjUOUE+lt6gxM6dsSLxoLu9VVTRqoHC0P+3XpWyhNf6Jse7UgrqPmFHKm7s+T05KDIh1KCW3MZpuDKEWI7quFfbM2yTuvFkwm3eUgZ8ta9q2tzWONdhSo7J+FPCoqzHQsU2rB6r0MgYmFeHr+qIDsoJRdaT6KKfKMSJII3mVd9+0vD1oWd0OwrAhCV0xObiPudR2pEvoofUeGLGEOIyoNRlynA/rU3X13Uy6rFWHjBQR238s0iBG2T6l0Gv4cDPpop64LVaDNH7ciL9XoOFQmZ9nvGHVXvWuHqjfBW39lnoiWD9IUV4jDsNJmhqvPyBrUETnE2cYT0IzFV9ujwUHCuAz2OJwP2NlNW0sQkK5mXd09u2A9yWwU/vafJOwkU0QqbyzA38DJ5qlOyJpvF1a2oxdB/SKNFmY+rnEgm/lvoAFkhkhVeNOUmcZAU8R1I5esYfa+FFw3mKJohmYBbqKhnWyWI7rDQaOboAhLqHCTg6HBDYEDpF3xK/Z3JEP4xZ5R1+egGj7dSi3QbUJ+Al8= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10ddbe3a-a999-4f40-3a15-08d9aebc6c9c X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:15.0957 (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: u81k373iCjkifNyHm/ZFYeZppWJbncXIz6op9Cu+4eTdZA3KVqUy++F41whlOl58kf2n+SRL37wg787xvUX+nQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 4d2d757723..72f3eec205 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 Tue Nov 23 20:03:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558794 X-Patchwork-Delegate: jh80.chung@samsung.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=EwQqP3SC; 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 4HzFVy2Ghmz9s5P for ; Wed, 24 Nov 2021 07:05:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2289783709; Tue, 23 Nov 2021 21:04: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="EwQqP3SC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5DA0A83718; Tue, 23 Nov 2021 21:04:26 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::610]) (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 7BE7F836AC for ; Tue, 23 Nov 2021 21:04:17 +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=G7U/xtYlowpctbApecaM8mkhwKSuZ/okIbyGqQuqob7P7hiFL+74SxMgB2lVi5zUFbeZneFyreRrwJl74eWm5gpoEX3ip+0mHkch37rAlaEluqBDoe7FPqGP0kUI4sT7hgdCQTv58lneQ5vRlABWBTEmFYIJ8x1/YYhM1wpfSjZhBn8D2L/ynWF4w2aPLptqDmnE/Jbcs/sTTX2wXwGSzaSgfH6LkI9bBEBf/CAj3U8dZRg57s5xLZuzWqYNxkXhX3xtrAqrKJcoa6jUYeVf3DXvXyNXojspU/pd66Wu+k1UPjRVaopJ7JqzVkQLngB6UFe+kkymdMwmBzad4fo3jA== 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=x0YorrnGkYOx66JqEhwPW4hyy+G8Zm/AjzrwunJOqFc=; b=NDDTgTD7F3F73nVEiw0MhxZp2FH/EMlqYwYFzG3LY5r6l657uOuspbGEL0caVzSlU8qWmuSFLMA1USV6K7HUM60VOmJkqgUFgG2JZtrXy6WigwQmLtwR+DIFKPjHgLoQ26UNu8F8Ivo5zeRN93nJqMT9JJ1GSJKIhG1645C6HJU1FJCnZjKYuf8XMvVddAV46hTJx/vbEnljVRXrv/NoPxRiIykKc87zCrAq2k//GY281upp9SzJtn5lMPZAAEMGpJyt5DY2b5PaVN81ZcdBjpo7NmTIfTKub6ReETNJR7NvNJFadTq0mjNHOoLOgEKAtN/lKRwdfpm96zIKR2RhCA== 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=x0YorrnGkYOx66JqEhwPW4hyy+G8Zm/AjzrwunJOqFc=; b=EwQqP3SCeGfTv+SaXp+6Slc33t8u206MxnwMJCo+DrsQCsnaTsv1XYK4h8zWkiRqi7bAXF3MYnJC3qYu+ehDDwiS6w+QXISaT4ikjIH6SXaV3fmkwQG+ywFInZnsXXY+LV4c6WtnZ9sXLfAzmrlIVbJNE/S3Phbh435UEfM3gCg= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:16 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:16 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 07/12] mmc: fsl_esdhc_imx: simplify 64bit check for SDMA transfers Date: Tue, 23 Nov 2021 15:03:42 -0500 Message-Id: <20211123200347.3772343-8-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 41900cad-a1c2-4a3a-442f-08d9aebc6d8c X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: 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: 2RBffbAhwaH2xu7Vx9U2LEGZp70MtF3UNAsF9puK27FmGcqA8sroTU9M4xp5pQqPP1AReYCWvcJfpvejn70/3AY0u3Jfx9WOOyvVY2FTlOsnSq33OAgUpWBVGEtph1nBn3kruiDDdnOQPTjFHgdWrCPfX7IN3XH7F/g3TeIe1nWACJ1TP5Yz24rZzvaJAr31PTNjGTC257f1r/Rcst/j23uITtwj3suQNWzj5XQkFvlSlOtR4ytavWHxHXOT7gvkRbjU0SgwDCBwbpNazR9KxBae8yfgYJ7jnCGFYOVGb2Twom+1M2cUpV4VHbrv2+WQ+iqhpHiSqVhm9c6PgLYrgTHd5aMXAugVO9s9op5d94G7yorZJ+tKlWip+1IlPci2YYnqPScN8nZYzlDTaOClwpBYZqIlH7fzAic+4oCLRoOySC5uwTnpGHHNBb34xYqKe98yUmpZ53J984k64czul1ofjcNKcERz4kZSU/GYu8GH/QozlobTOsiSDemnhlYgrdBUNjJ94NOFP/1IwsGxS84v2DFWPwfTn6aXn4rFgT0fR1g3mLvB7KCF81srOMTWqvY0VgeKcm6ZttgG21ku85fCJMEgSJduEa7hbx+8vytQl/dsmQ7HYrh0U2+cuRyHLXnkC4IaA6s2+Zrj4DSgWkNoIxkkyfIID1A29gP/p1ZY3sNRL3UPQ71I+FSFyzC9cc8AGAE1tuxsfQtIng/w4w== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jOnXAuqYTzjspnQBSqdXkacrxprIDoOkRCiQHRH8XVPLXt+GJ//n1v2m4ivojWuvZ9eKSDLmga0yXKLPvxMw7E9/dwUF7i2jxLtSsg9WnX0i2FkhN1BpHALrIOvnq3nfoKgd+ScXun/DYotqFur9XtX61yVWfrRJkiH8mCeQ+5hv2FLNBZBI+CXLSAE5LDCR3oBkE/V4LCHzVIUfOBPxfCoudcCzM9YXu2OP9SRfGRn4TWW4DWAZmUOVleijId/J2IgPbLBc+hEGcfvKuqAfWFJlvDlO1OQi6lA8+iO3FRMaKJOl2LbTT0VocgGfmhYN83eVim73v2NdKHLk/daB7JXVxBdd7FMpFFFFQQr6pYG6QUsgqnZQmO9wnrEuXI/f4HxrZhzEkcD4VjRKFJEyyo0lPZEZ9LqRvnVFyx3nnpkpGD1A+RsHlfHHs4r4imTP3hKYh5twusU/9vA8oLwQeRTbTxnLyAHQ+vnCFD47bIOO9yxUFaeaEymQcFdiKoMLnPk0PNTflDJfom7/7PF+MXg78ZRVNpNhhJA2crSg2WXFEfWAV8rGN9mJIlMAq96R5MUIWDprNxzzSPuaR0ZeAFg3QT9afeRPUXGjmIJ1E/t2Bo4P+NAp/Sd5rTdSdBPjvRaL/AObFLShu5C/vTsi3iRhdrKtogU1TuLBp5HTFt5N8gWgGFEgMr/ZdjB9I+5BDvvNePp9kmJ4vbYT7WPNWd3GtkI+2flp0iKqg3Qu3LYGX+is35vKODxQ6T19hiMfdQiem0oNizyN7AkZVnQ92lYvj6/xwPc320hfBdfJXVP/aWiWoYypdX4iHMGXHt6N1Wr/O5pELgbvNenoEikVexRm35o4dO6wDlduTF9amTWj3cM/oNEfgir5cD0JZD+PIpMxYgsEXURC3CeWceJJvmSs09vFsssTTNtfFBTbHfV/CwIAT9S6pI23US7UgJZByqRlT9RA3tnit3Yc3+GOhpgR2B6zwOHCcGcd45Yze+sOduY/d7O6MmnpEWM+lrE1WH9oBHtTW3Y8zB016wyys6vfW6Jz8hVSuyTOrXOY8p7dDD1C9gt+r2dVk4OaN0Ysj0xnvgWAtN6Tlo7jTzly0kh6RWU9DZKhKCxm0XuOwK2VvOwS9UgaAT++xK9axZ8dQlKP46JlgD5sW7Mz07G4aL4Uvip6vORUxeQZmGBMSOJStXYGd9MWdM/uxGT7fHf4m1U+riQQ3X5lA++8/8RpnTdWd8RZ3osqLNj1dCOg+Fl4CFVHk8gmp+33xF1PB8HIUyle1UV0H09A+k9kNlTeu3sF6PUrGJSnZtIddhAgRckeSEfdjZqKOGj4AKo3wJQp5SxHgHdSuDSugDZ4JhbHRb+/ubLOAYdakldJ1yJ+jmU5KbT2SvqJLKVl1+2DJzfM9DPjwsdm+r92L/7rlk/rNtSonfUYi/rihTWwbF58J2exIsIHUifVqW8KUdt4z7Sx/RJj08clFV2OyTJOj3xnzWu6IDuJyNcSe8b0B5m+iACKfQnBYh1Lefz0HAgs4+xJryTLMN34QRmedHDaWbGmUjc1tUMoIAxEtzJkZdMWMzxAy8aoGg6AGHu/xIQivgP7Ui1eyXWfT5RnNsZTtKFUGxAVpnB1PNncZWpcNSLFrGM= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41900cad-a1c2-4a3a-442f-08d9aebc6d8c X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:16.5968 (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: GWLdS7JmBFL97h5HGqm8Od8KEU7Kz725Vs3gCJ2IyoAnzw/8OoOwbbQ0dFQiP8/7NjY97rEtVL+mj8+yc6F41g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 72f3eec205..84df131c9f 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 Tue Nov 23 20:03:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558793 X-Patchwork-Delegate: jh80.chung@samsung.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=brxcSIn+; 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 4HzFVk6LRTz9t0k for ; Wed, 24 Nov 2021 07:05:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3BF5583738; Tue, 23 Nov 2021 21:04: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="brxcSIn+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D24E8836AC; Tue, 23 Nov 2021 21:04:26 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0619.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::619]) (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 6BDAA82F8F for ; Tue, 23 Nov 2021 21:04:19 +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=VZyi+WBOWS4NMmuBTzqZJwkeYxjJ+dDNGpWBHvU3pIqJWGLkwtux8Z4SJdPYpot4R7oCmOyBsTBNhj47tXNsEtH5zHBBmxLOvBjy+lPGgSGaiboMwEy9NV//vluLWWZyGYHDQvxlDm6MAHxHWQAz299psC0dJShMj9x1nfzjCP+IxTMHQ2NkwaB4bPL90LmBEr/dHuY+XdKucVaSQ9gF3w2LbGcP2AY77Oj3xcrl8Mn2UR2rj7gVzBD+5Bu9ix7jxW3kAkyWY7cODRgANytZUqo9ANdwPRpZlpktEvQliabv2H8UJzl6JuWlws9aS4wFfkdJ+nKJiSCGv8VEOLU78Q== 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=xwlUvc6H3nQ/RcUWSFGqmSpzVYC6eBBzlGwv5eeBALo=; b=I39bMcoa+w32nBb85XJviAHgiucpL/7iADtnJOy5HTMBJfGWUnVCHeaciMb8ZbEoZd2LBv1MuV2W2L/2iIpVHFIYbLmXSuJA6cPLU+pKDQnKSEu2Cu832TpKYIK1bPyzuyxi+2E9K8HlsIHN/2IavqTVi7vLmH+7IRB2dQGNpH1FKuhv8coofYhdz238/ovggJAhh318B0O80JcrfR8eVDIfkdFJkPP0tB1dsAkb2RTgHldYX3CllcIBcH4O1eSRDezzvSHwqllKwBbj4LAd+i5kJgcLuRPtfGFKg5Y3sk19LqL6cJKiKMstYnB4vK1J8TFYhFEPSwe0U9Wg6NUA7g== 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=xwlUvc6H3nQ/RcUWSFGqmSpzVYC6eBBzlGwv5eeBALo=; b=brxcSIn+f2P8hrLCUZfhLTYPeepYdUWZ+w9OC5W1IAm3aHirCReJPKLweroqkttSUgujsPz1Gs8wUUZyC70q+7UGFpabY1sUckVIeWamuW8MVwkOhK1wZEmvHcw4+floyZeIM3WlDJImQ3SFPq1Ox8vG7ZuqTOq7zxMRquTYwHo= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:18 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:18 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 08/12] mmc: fsl_esdhc_imx: use dma-mapping API Date: Tue, 23 Nov 2021 15:03:43 -0500 Message-Id: <20211123200347.3772343-9-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4673287e-6d44-4249-301f-08d9aebc6e78 X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: 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: D+kCkNwr2oHaeLJ1VzbnxawjyqaTceGxKVavGyywokbfIKRYwIJr+sI73bmhomyEYh9Gx7gmGRPMk7liy3w3+q5VinF9A8T21cn+mGlu8RSC9GYCMo7v7qaxO8uWyUusAKX/VDOO/tq/wDc4AaGQ15jnogVtTMTBhaZN8QQ4zLj0nq4VsKfC0OXwpI9dX5kbwXDx50yjcj0Sx7ajxBCC6yzkNdSIInsx3MbhNFs7KHqFjifC2DXGm7BvB52RXCkN7n2BmnhjjdIC2ObK8bL3Yit0HVubsZdzodjls5m3XJ8QIj04+BzhPEXen+cV6qlxyMaJwn1ST9i9xi01cmI27kPEZkPPuZThO2+Z+ox5kOTHkrp7FBrq3zMrtGuBHk+ashzoPPrD9eku1sfKWNSroNLeudOSnx4nb543/NxHlEJNK4wU2HvvAdLRc4J86OSvMu2AS6G5AQMC6/ggukTe62mg9f6jBRO9+6fS+VP8p1v/f1tcw3iVG9cz+irx5mmanA0RutuFGKBxD1QmoXVqoTuvbODlr82V9PJbzn0wVm0TTF7PiLjZBc4Ylitb6Y0n1pyirRs5Ko+mgAVikZVdas9du+7G4LsrEbmijJzaXAfGEFh45c07khM06Bb3JXDaugZypX+95XB8doJfmzfC4hkhzstvXa1hp0WSt1rG2+Z4ICOoPFuHA3yaeXPZKGVrQPhzD9wet1wVp2Th6PVNiA== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OCyJYa1DmHQM0pgsJbqWxD/K4cKjR6b++Syf2q7MYEWzNc7i5Suwyutl7MMu1WniMQCoU9NNLU7CSL9bC90EBfCmMD1QL7drp56fqawKDJYqFJTNd/JrkIAs08h2pZ/jmutVkvEQkXfmGdM+ffq/kVT0CiYrDFdnzzmVojQ1sKbBn/sfNiuA0d4SJDaPvmxseItR3Ce/h4VuAjnbvNYy+JkWmgc9vQgMV5gqDXSYg+XIgIT18W4LOGAo6s4gJ4wLDkSg65ODWlqSEDFVirLb5BWwHUc/DqUODMsq+9VVghgwdAeNpBVHc+nntfpZp9sgm0WFXF0x0WxNQKkfa97MZRWVZvYhFqCKzdJD5Ckx65ylB5lHAZI6tA+u2roiyXV0nPu0AR+D7NUfj73zLvR4xigpRQy381cX5dC8D7QMLwzcJDFCKHqs3lHwTH9E51ISuJn32+Loty4HY2khCpae4761S25z0ja2Q5CjAfOAWOiuOJUPaVdt0jx9HL+0LR243lgj+HBBX6mUBEw1s4FM/y+htI12QXgZc8z3GspoV6E6zBN3+cP3wuVs9vWkxr1nU0QXFrYt6S8yCgPfj7TK1WOyqB85+/qq679GWHem8dXY/yV+/3ghI7mBAiNw3k0piWuXDzJmOc9O1H42V4pcA66C15e9Nwlg+rI8sdqK/nFNHv5ICT2oYOOgxaPxT5UjCFr2cWRQr8miRRLtklmndmScdJKSccJ23S0eTJNol0xb3+YC4gtI9BPQXT5OFW/0bgDFDcmmKERad/T9BP62idr8+c1ZOJ7oyB84EPSVRfLwDnWahsO1azq2iLMp2GGRdIV+EgyDX0SH17Ok2xXYkgUBJ1S6i/I3cXvg5HeFaVjentekJyYNZuf5MH/RyaQD3z3OPL7QDTW6KyDkmNgP/gkHuxFT9SL8LVxmtR/tr1/wOQfBvGirH88onwRWsnQJDtxnuTnQchJOveHRyKGGtXrPvfk2MnXgZCCNbPyDaYUBsOpurUweK4rh/8RxD3lXRbI04ZCfWnNzYe0fKzw89Ev5+beNDut5TqGducunowhxAQSYNEaOulsk1nOGcHCN1mh1o3Fp1C1wVCrFFC73iAU1PlB+56NyFREHcMOiVrQmsrQ2LovjHjYtCbEnoFeYCPASS4/C+6orK93mMsNHtalKOLFMgdofhdSzq8m3DZGlLax2QN4e2iu1RHGM97NlCTCypsjNw432SoUVHKXrL5RcS+SOxzT6QsZV2TZRzMm+XIBcbc36zSTRtoYDfi+4qfYWeY5XphhURKa7XROtD/+BfF5g4nB8UnnthuZ9klG2YPbHqqIk1eDt5FRLG/akAKnrMkL8abidq/J+sqM33dU5xcg1CUf6dw7Hvhj4wKY84tjdunxlVAR7mzDqC4gslwzBGUzmU/NFo5gjXwb+AjikKN90PPvcpDJTLbZxrlhvzPickRk5VIfRMzMfqrMI3BN8nOH2PLd+OukWpTYqZt2d8G1Vyd3PBcn2JFqZdiTC5H3p+Zt13t0K9sgzYCpTmkgSi7anCV9ksyWG5MMVmWm89/B/XeplbHyGoactO6H81JLjrTgFjDYf1p4Fc3Zp1+vHIAhSZlttJOX5WIdU0jFEklKdEN7emUzV2atwIAg= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4673287e-6d44-4249-301f-08d9aebc6e78 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:18.1090 (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: 2wxwi9E0OarAq3v8NIK2IownvjlvneYo6PoK9/sphTHOihWFlgjmmTgl9f/YEfpM5QG7BJhxWZkkyXsm1/LjMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 84df131c9f..283af35a81 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 Tue Nov 23 20:03:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558796 X-Patchwork-Delegate: jh80.chung@samsung.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=CykrZdtR; 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 4HzFWN5Grzz9s5P for ; Wed, 24 Nov 2021 07:05:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23F2E83753; Tue, 23 Nov 2021 21:04:59 +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="CykrZdtR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0924982F8B; Tue, 23 Nov 2021 21:04:29 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::605]) (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 896B182F8B for ; Tue, 23 Nov 2021 21:04:20 +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=XxE2dDSDHp/CWKZG0qNxQZfF5ObUzzrpCvt1hYFeEAXZnYLQE/KqLad4v0ddtPYzR5Ul+IMcMVBpyXhbqunz6JhUSIPpH6XHuYrp43AmUfCgYlBJlX4I/fQ1s7KFvl73GmoZaY/cg3p9u0sYk3WhRcomWSliEwSKq4ODlLFGqMsBZeUF0EzXFTz7v5YpSnncuF5cDZelfurlnMgukaM3E8ijk6gLIhOYbuAuWl5s6ava1vLS8JOTbAOLdrqAo0roDQLG/5/725OgiOVt4KOynf8f+RyDq1pPkwAI8IFznmG4MKBFB0hP7OgahN3IclURqiP8/nLHOHQAmR65CUf2Wg== 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=r4uxd0bXvrGK4wv75WSLuN9BTYCDM8dlB71C7WjmaiA=; b=e/3X1fxj6KR2vS7ITw7rXawxTAyFc85cZhUA5W7e8Lhi0Wt4a8MQ8Sq6NwmrjF3tLb4mntraZSr3k1UwurVW+ZQ9am1AtNPkCu8IeXxTRqaYH0Qlr7oUKgqI/nlQ5/CGYXxm6AFtjLI7PIMxCNefwIRdmOpmkCWI+jX030X2/Yb6mdb8GvxngeGnwBapy7pqjLFdRRnvtReUgtv1RtpmQBLSn6wBGsioORzykrt68zOuhig2Flp8zOipaoLfLXmxdMl1BhUA5e+Rge62fMRTVHyeAkvA8UlBtDiCk41uNjtLhyf1EQjz1DqAAJeverWB6kv3NRPt8I9/p5C1hPyrrQ== 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=r4uxd0bXvrGK4wv75WSLuN9BTYCDM8dlB71C7WjmaiA=; b=CykrZdtRNSP7naGdTzkr6ECfm4+99WZQahyHo5YzUpz0va1ECKGC70tAZv1ruwAfX3y40MI5f4tOK+kbD94F3f3QCtZRAevkFNwTPHu2WLAE5tNrm0EfSDv/djfBk2kIM1wBziYyRThFFYU7piFs9QWudjpRrMvl4qFCr4LKzpg= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:19 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:19 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 09/12] mmc: fsl_esdhc_imx: simplify esdhc_setup_data() Date: Tue, 23 Nov 2021 15:03:44 -0500 Message-Id: <20211123200347.3772343-10-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1a010a64-7447-48d7-0fde-08d9aebc6f58 X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: 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: 9X/dVjnLqtUzq4xDnV1EKQl63WMXRFJ+dtee9VkNZuSLVSTK2FRresgGuNbJKQgRS3oAgCju1X7JpRodHg3PtWOraCazCcLiZhfXRdD9NYC3jEaiJjs1iotngxNAHDc/A5JgEAjTewqSabpZW1CC8WIVdlopDoJleszArb5GU/2lxMoHi3x4dutu/sbG8+m0CKKBM0UlE8nR/70EynNeT6oFpRovmjFLqtsQJXei6ivI36/44nWSnFnW9Pya09iI2XT3bOpGWiHCT8dQj+/Pb/Me9ehiOhXIy4cx4X7QOFqY2xKoCxhrtDuqcNqdUTy1lL9V0aic4qVaFUy4ee02d2nXTbCWKPLPZOl8o4F0ieFHHvuyP2XAX+aubIcwc2KLNlfpHLFBEVQYd50D8XkyfVpmsg+qRgyoRz2/oRp44KGAx3uic8Qbn+cGQk1HSP+bRgDopGIP/GrcrdIt0YQqFcMWb8NVgpQE4HSrJHQGPlm60l5r36/WL29GLisPttmG49PwilDBUXAgNQVZuL6s9fYTjVccsIn2P1Th6jqW4WAv4dIbzI+07uocAPaTPFkUWRGFD8Q6V6FmaD+5pZ9zUFE0jyCk78V5bIpB09u0fjHQiTngcbyfOVpJkKX+/TZY//WWf5y8LCXoyTcA7zgcq/+KYcJ9N0WwWOilXeIHN9qsbPkG3NGg7/zTslNKp279KscJMVnkqVEnRHBQxLHDSoJPn/9e/R73/5gljpVyu8Q= 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001)(393754008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GXUnHNIbE33VDMqDmRA9fDRh34teoNMB5i8ILz7VTYQfr4AqUYiaSIeqH/AZWVfx+jcFYBAe0JIrseSDyKj+89rdcNcSvc91Fcon1Fr2o2jb5Ef6Vb+bQ2cgFNNbTCf0oMW18uFmhiTdhZfUi72n89CCWyiWDW5Gz7uLdKCTE1whf3WrF9vHoE3Lr8Fow4WYVZ7B+lswAlIiTyriPXf5m6Ejgp4COSmno1BWdkX0qxCrNRxLw4zY7bUR7Z+IRZkPh4zHL1R4GHjN8i8gDBWKva2nBFQw21dRrmk26bzOA1nuhOqUXBoCvjvwpVzAc9RVAna4BedZ1NElJ4j480OSogXVbj5awvPgDdu3/zoxFuo8gYBDOevnzwWlXTHENu4a4EuQZNLgXK9qr238hkp7+l/XZFdlof3Ko0PSeHKd38s2EzoKhB1PHvDgK+/Is9x6Q7oqYx57PF8sOAelzL2Tx/ceVx8RWvfgNGBWjyTVfg5Z/8AzPGJT/EHwlnFbsWRGLerpi+ZY/XHIRRgRsjqKyWpp0lOuXI7blZZUBY07pD+9wIj8pzCEz5WbVMCaCDEho0WNWRvpLlinvgAD5WD9dhn00dRDk5rLPVWEI6LQ/eCT9bfQoP6Jb7zjsI+f+yqkniubsiCO8wcVc51aXhS1VQ4UUtDZbitjTw+bVM7MBIzo6Ek0XV9OwDtjysyXqkdW/nkzJtpZIYTiLU89yfLv6HDY+XIJNFnubPvkeKkim0oDqcCXy1Ooj+a8lNqyyh9Jxm/QHcQIcpQYXGe5dqZfXniqPU/2norR9QS4hezOlVQJDvosjtsv4gwa4QubvYcTJT7WvUzsdm68ha+sGyEfmQLKIL0ZAchw8BSY+4uDB6mb8883+s8tTez8tfMa9ycEVIxPeGLU//0k820RgvbH2j3Cw4Q1/Zc3GIYpEtz3uMebpFSae+ffUfPh7GadWO5u4DTV0gaVeYWQMKg4ntcDTigFcP4294FksDsHY8e6QysEP6B5sCjpOegMVf0Ier1ShguMbTOCWscBuHOCsyjwPTaNi9diIcnX0v0kBggw62LmpLOgVyygCcIDeuZCVPsJ+IjaeXLOmIB0VEg9mnpmRzcFmXcQwzI24NwRxY2ofXdJkFNmelQHJgwECK+NXFVzR5ZneNajnnYgNT8wHavl0vHfz+VWo2/rnJb1DIc/vDgokrfY6G+xNAjZfFZGXQCK6TyDXwn/TCvvvcamT/oT0my1L6Di6AEvWC+LFVvX7fSR+AZ6XxsJ1TZFXS7cvZUU1K+yaTv1xraRsYSaSRXpoOucP6vYnJfPVIrfsqSy9obPc+56UghvCXVf3xZ5NOZDPnMLgvFQM/ofCbPNhrDQjHRsP/bAxC4kPbBHOOP8Nz9djPKtOgFhjSX4lSj+jp5XjJ+QWw/9C8eGWdBe7YhztWtKRL6mZtaeGBNSCDM2Zy1M1N0bKdC73ek7pHq5ryOTyvACflK6Yo/10UwuFU7rRk3RVkQBxZvLQcco/kL0iwDPSfGJs7dfUQooGL+xtb+mD00orBicDlKsiKECIeyG9YAfeMzxMT4DEu2oLrYyZxpg6+ey9x73n7+Rq7CKJbQv5GUqlqW7F3Ub+OFqpf02+6AgJdSOmXTmjPg5uXkO66M= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a010a64-7447-48d7-0fde-08d9aebc6f58 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:19.5892 (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: zNOjVZ7/fR37J3AlFgV4cnO/Hsuyk3zm8a9YkQy7baIY9zwI06euYjlzzjAEdZDBxKQGl3bcCICKJpFbDWkt9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 283af35a81..6c25a77c79 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 Tue Nov 23 20:03:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558798 X-Patchwork-Delegate: jh80.chung@samsung.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=Ce5kU1eA; 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 4HzFWm6vFfz9s5P for ; Wed, 24 Nov 2021 07:06:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A79F583762; Tue, 23 Nov 2021 21:05:11 +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="Ce5kU1eA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 575EB80735; Tue, 23 Nov 2021 21:04:33 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::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 A2AB782DF6 for ; Tue, 23 Nov 2021 21:04:22 +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=ieVpnGKgQmfDXYIEizMrDuLbInX9rM/8Elazzh4m5s/3Iy/mMLC8RIZUy/mWuVVsb6eZ5ArOGp+iCdPjOQDScln0MusDWqrEzyyYAmka+z6gldbLt0t4mySeG6mZKDSLukp8dmCocg4L58h7fTgAyhM2fsYwkzgTUUETKXg0IUczO+F4fyZKYKSWTMz8255J+5fodNn3o+doxNFaOGF9PmYC2Ks/C7t0NAMlebL2ouX5VG9/Mq26suSCAxVy8XcwUFKfHaVDjAz/1+BnmwixDFgmdeX6SU2PDpK/pTKbXdDQD2Zb510wO4z3xc8iQU4/U2obrS+8b+rNiHsEueu6dw== 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=7bBSEHIYHRnnpHl7jsVumTBOZo52VJbLd8i+Yvfei/Q=; b=aH7vR2Ej3Dyvq7Sr9169uuKkl2zKLKoI1xNR1BrgRepqR8QDkSk3ESb07Qg2D9P+RN1ZEStVGueCq67vxm2rs+KK5EdKIuUIxt8S8AGGAbA7DumuYEeivR3xHOZ7Lg3ty/uMvf0EMe517Cfe0dEef4ULD+gMTKMHvQlCpbNomOd2sQhWJ3TYx3FM0Mn7KGlBDs2X5bz31DnbsRapRf1vCXwfdxX13+UHtjKJAsugfJ3yCIGg8GjWNNB4M5HWHbohq9ak63dwWcdD8QB0pyzJu0rcIELpmxxkkdQ9GJMxxqhJ9dPjFtA7RNuOCOFYpTco5/MaH9oo38FeeaSpIdmDPA== 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=7bBSEHIYHRnnpHl7jsVumTBOZo52VJbLd8i+Yvfei/Q=; b=Ce5kU1eAO+TnGTQ03a1K79GRPl+cIxLmfm1V4xrfia/gCQx+ltBn2ChxMPMhqNc01PPrFvEoJVkJlJa6E9o5umlbRccT1FoFF86roOiU4TER5hiP4Gk+wIjef950N7qTzHv5kwo+fzyGTUAmt9l6ftI4nhw1uu+W1tiJtiLbipA= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:21 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:21 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 10/12] mmc: fsl_esdhc_imx: replace most #ifdefs by IS_ENABLED() Date: Tue, 23 Nov 2021 15:03:45 -0500 Message-Id: <20211123200347.3772343-11-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ba05d9e-b7ef-45f1-a43b-08d9aebc7050 X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: 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: mlLCIvYMnlBqgmoa6FEntfqTD9xCCWiD7s5P/jhHeQCcqPCHM1npx6TLALKxlerugNOiaHRgzddcHTImVtP2zixd2terMGXEDkzDCBhNHFT74J/n2wpjBDWSpmpMwQA6jwLBIRkULj8nceqdPThBaHs8PSPeGaDilSENcNqCEc5UuaYxP2mJTz3XnB4aQY5TZvE+ogVCrLh6XcuwUzJevbg0PJqC8QHgWErzAZLieB1lEXh1409AuGFISe/ql0qBkscymgAzytWuXANCzCtjDzXVbQCHLQORQa1nfgCZgOgI80zB2caNtpznfox/Z+8n1xKetpUQimwHy3AjpjnIR9bxYffhpIxBXdJkesrfrBop6cG8yiJWvGa3g++Wu1cKwWhOaliSQT1i9Jph/jQMX4sbhp8mRV6JaGs42JMyNfAmsrFJmu4EEauAGUU64Wji7pEAFFH4UQZQUrK+W1HCRv4m8iFXEegK1zL/fIsP5JydHAN/i1dP9YL2jrhvxhlqfeZIjLj6lBbRtxnFTuLnZ9IBfC4KtQtu+VK/9pc2B/+bYkGqqdbIbmPxGE7nLpWp1mY6L0CClM3souTTVzkzSz7OCGU3qJNLFVgZO8iBq3O/XQI/RiJk3mcULlrynRXX7IDy5oyHso4vcEAADze6usGLxln4FzXP8oVTRiUd+W/GAGt0alaWdVxki/lb2E8DHbSPtsGiPrY3cNpwTj7FZQ== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(30864003)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A6Ewl+hDv2XlCUDCHA/cz4ou0FCvW1jThvE4U7WdNARb/56KfQYF4hZDf3h6Gh11cCtZ1Grbp8in+e9f0BWVftkwHsFQEG+Dzl5UHHFyBP+6hejoMINQsy4IFQrn6vT/OdaMoMeulgZQQvKpKI5eYdS34JQqR541b858ODC1h5cjs5df3n7gFLexs89h4zxErYtLK9Y7Fwh6XEXaSBKwIwIlPWD2k4Bk0ni902scSuUUzb18JOJwQGDVnbsP6v5U/W5+3wHuf+jGS8LJ7kHum/GtBK+P2UchJ2hZHhOzq00fvz8rJnqDcZUxiPcD6peBEXI4QDgRHiKwpGu+uuVavxmgglBxwk6khFDVsgjBqRJ5H6Mia82AM7Wcpd/e4yKMRDVkzwjegr3pJc4yE1SKydXHZNk6cOZgpvzx1cG49ZRdFSvt8gHRg8TazULug/6X2maU9fAEinYy1kKMf87u6oZkeuIajgrrh3PH6OLCehSClHDn7dUKlFTqXEIZuaYl3V6AOm0lepz7Iu4n3ko4okC/IiwWKhmTXZyVDblXvazIVACcwrUWjDzp+dnEUeDHuCU9GySisfUDRnZBLd++XOiEnupuai2grCXK2Wj7+fcVtBVjAbApAbpGuizJ6vMk0ew9dqXCfk8stUwDpfddO49+tbEHbevQ0CIHAajzA0X155Ob5fEgS5awEP1ff3prZdgzOkNsPIqDZR2iYrgWSJUgzRE+T7Y7SxbtnVE+Fk+7xxvFVMQ8wCBt6tmIqayqbfBcMNiWla0hqk+in9sleEfwcGTnJCR+Y0aS/o9piv+vXTdFs4LSXUmQzIxiF4IBZJopKflqKKeipVz9A3grvTf5jJY4QIrjGCDD0iqCfPJdA7jppjBXX1Qq668qQclPuY+/uWY2/l3vFL6mgxzknd6dbTk7dNb/1KD5ov71vqqN8QssNwhqrJaYzLLqpXUx1FpDNbVXfqc+KEYBhTl+j50wKO6ewwpV2y1oA4ojOU2d52/JZBTiqZYS/C34e2nRAE/1M/OEjHemOXozZ1QykUUS26R+ZUDdyhfowmivubRGApMllLqfrexfzO3QHDyscdFIi2D9/nFFvOf4pXn0L3npO+5C4OPkqWlYyewn4/VlyHggEynYhj1ZwCsLU0BssekiDx5/9wftCnsskKS6ac0HrxeY0k2GhDGpvPNus6ynJlD4NNio84ZX5Uf8O6MMvrB+X/nXyOPeHoGeuIq9041ki/8+UdrjZOy2fr98mf45pN49LqAXPL8TYKbN/SEytTNm8bek6N/tgzN75/lmGs6/H8hZ6xpGbQxiAjJkX6KPAuRMSVoyEt9w2iXZGhUflxAqIJ/nZBzwFLwm9YItKK6UgSClIjV9cVaiOQnWvNtk+18lLvP5F4X/+m8MgPC95dI4TvWrgwg60mSKB390htEqStnJ0mQiQXfHU1ZSFSeXcZHnvTr2AqZSBVq1NI8klCgVhh2MOQWe5aICizzQE1pCc6QcRKYRLzSOKQU42SaVk47LiTfwJ/cCCVashVgCETGvW2K/MDQIhokpfYKhzl861GBQU81CQeRTcQfzG8bAL3PFHRawtWDKA6DXABPpTvUrHhDW37tUKUeKrejmKgkfHqODbvC+tB5jPmB9RZc= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ba05d9e-b7ef-45f1-a43b-08d9aebc7050 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:21.3022 (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: 1Txo9mdWK19gMsSzrtucDMVkPFXTl7ABs3eOWxdp9f7sBWItrHBRXjFuknkqbip8gBCRExh3kvL+NMXFpoFVBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 6c25a77c79..2da70663cb 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; @@ -1148,22 +1143,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); @@ -1175,22 +1169,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; @@ -1200,12 +1192,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; @@ -1289,10 +1282,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 4ae932858e..2153f29bef 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 Tue Nov 23 20:03:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558800 X-Patchwork-Delegate: jh80.chung@samsung.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=r160c2Ra; 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 4HzFXB5zZ5z9s5P for ; Wed, 24 Nov 2021 07:06:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2A3DC82D5B; Tue, 23 Nov 2021 21:05:19 +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="r160c2Ra"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A9F2580335; Tue, 23 Nov 2021 21:04:36 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0624.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::624]) (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 181AB8371F for ; Tue, 23 Nov 2021 21:04:24 +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=WEc1SBtcYXU/Bl+BDUJB2z1V37SAc5XdQozNOIq6Ug5jrf5F7nCxpSqIXx7r2lhwMjEKk1ZnZoUsnzhB24GkPvOJxdZlRbFim9drLRvZcmT0cfvbuwEOhRjrpX40pRwjnzaZx+bsDopgGFTngIvgev5wJk7D3FAVje9z0qkU0k53bp6RdQVEJ/duSlZqYjyFG6O7VJRUlxUnw1konDylIU6iQWYXcmY8v7ro/agiP8hlrYmeBBDRroBMgCFQxqf5NcE9VJAHwz6iVuUMYHwE8at0Ty8f4Z/0D+7UxUf77RfYO1Bn88dvMFtWkvnNbJLoYPDzqq/OrClLbe/vb8ISyw== 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=a8RlhBAMkY66qzguI//8cnqDCQ95KgnbLlc1dIMrKFI=; b=cxwmVYo5SiCFKahdcm0cHQYzwsHIkTK+s70LhnbN9H9tMCg0urzXIXQIeP436IW/cme8cfX48OxbqA3ko1aJv3qnmqJuxuc0Oj+Z0FvZntQbxW9BrrUtlzPF5mKsRIQj1XyLSgRoBceKbTiOJ5NGsUH/HQMbA4x4nvywtvjj0m8eGV8CMum3cCq9goBWDQW5oJVNlxKpUeJ1o1qpxB3n9lnIM/IBaT0M628biTXMBQyqBBGLX30HahesSIHo2pLcSsQrh0CIrlcPFc/lpadSM3Pm6OHoWm4KshuKTcVZO6yGpOubOUGzmuUj0rJ2b4wr9TCe0Fneb4GzVGaZkRaN1A== 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=a8RlhBAMkY66qzguI//8cnqDCQ95KgnbLlc1dIMrKFI=; b=r160c2RaOw+WYW2uUZgD81gDt0sLObZ1SneONEPr6J7h4J15zqeSG/WPSNGRKA0nA39guu0NmO+4tRWDtWvpmnI6j0uyuI8JYf09xXNxjssBN7x/Bpbkeh4mhiGIK1WKaPpCMh8X4hitqcoYeJynDbQ+BTsnRV5ZVKVPmw38Now= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:23 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:23 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 11/12] mmc: fsl_esdhc_imx: Replace more #ifdefs by if Date: Tue, 23 Nov 2021 15:03:46 -0500 Message-Id: <20211123200347.3772343-12-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bdcd61d4-4dfd-43f1-d9be-08d9aebc713e X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MNz8TnPEPIe/U6lU0FlmVHiKEF+u9a3kC3mS1A74GK8cEHUc4pbM8QCl6BYmokb/0XeXbn7SXdupJ7ncbX7q9qyEJpru6Zk8zk+M5c9EmwQ/+CGd1oDEZ8vHNIPjEiKZ/8DM+K2zYeAway7BdNK0df5h1E74peIfHvzG4K1RRVEWMz/lG0NeRaCve4ewKSY50ysCiGs7MWW1LXl5lfXOv2eSX3G7ZleO34TN4mA4xPrQuCtfBduszWvu+A67Kb1dzhSyRb4T81JSrJ2CgIprtE8bl+zrs6r8Y2FRTAud+DyuPVfuFq4W9ntAXbn0d+nUxQkkJJvJmugi+6IeVjclz8/liee2CwrQgqBkQKqIBDuEMm9Ze0QvZW3Fv6j3q0WuoWEk1fHHEJWd/JyW28rKqtchqsFcQngpRAwvJIuvz78QaC0wHMoXIgCM6XG/ExOwE/nsep4ZIuQmqF0uZaME5DqwlXeSKN7JC1mJamL26QbBa6k1ay2cnucLWVIL0DXo2eqUskKFkrgR21OF0UOJ3wL5WmSJKDo783EBJTSAWEHU54XIqMz8jB2dAdYyG+6WNT6f+juxpT1kRmt2oJTj0Kx/59RIFt8Yjniu5bcnYWq4kanSHGCmz2yGuNdweezrwuKRCPJimo2DHzYAJtGS0TvLIjVNMV4Z4XE9weIl9J0+wvtwxhE5t9bUlk2XnCGPQ60LRQq6CM4J+89PUJeI9w== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wM+7tpqu+g/whrgxVaE18a9JfVGxx8LyjV8GGaVqInCccfY/9qfbb0BG8NbCAVwH813NVNjGZa8Wh0YNqMJgn3Moow79Zwsi6Y7a3dBBslm94YHbAcquP0+g1sfaVefHGAuVm7oWyuVsuh6isIWUg/gjs6/SMNphi16HoNwJkzF9x96fY2WYyoJPYkbEJ6m7Xm7M9QQH1SyVwwv5I0VzBWRNw36SRuUyam/paVk9Lf84+qBzbrSx2sGNEJOAE6POC1XhyqmIiWu7BgU7RpsGIiHFmvpH901nEvFWIyg70i6+3GJ6ewYfw6Qu02pd2YFW21LEVYy12KhyJPxFqC+xcf5bAvIASxPf3Hfz57K9nxGE7BF+7F2hEGzwWIbcjev6wQWAM5kOZMf4IjD1qvKAstufahpTkb59jIx9UCS0wEVbQRd8qatk7pu272qCgfjvh6ucBwrL5+10R4p4NHCeQbZt3UBD4EAfeHtl+W4IO4z9mLYhQuFuXPjoEnoTt1jPA1MjtS//8B4VzwsFYJaRfQRs76rGo2//a7mmH/EEv/4sc5DtKsTqUo9i7s4UuBeryAP66nRy6Pt7JsvVRPPYUwWXcObMw1rg7j2Z7U1C/OARiwl/i1VmMXbEZeu88J1dZ2XncKKWq1oYcL4Z2E7sOYZ30xAebi6gGdAHOrzdOmw3VK+/faWuqcapMMbDtAvCwqC9Uyx55se0vjphbYg5qUBEQviGtNHdp4d/vamvn5Nfkv7wJ5fgzugemesZU6tKlo0V7gNQIcKVAecUlfI+TRIj2HKcvoHY+9kx3wyYMf4WAlaVbzUsMXZCzIPf9duO8vwO7VZbYb4OWMLVOuaz6xLoWQtEOfVm1Vg5vUMkmmekZB8I/MFdiLqFKSZ4xWhsR9TnfZ9v8s53m7Pycssph013jFz2YROUTjNqhNWEd/Tb3YmLkJZc58BJJCPBtIJe7SRGB1c/Lx8OprjAROC20cgZA3r7MNX0CSUMYkbn4sErK/0mE6Gj7R8XJkNkUA4qqhF+mWpxLXo3lcvTA75bU68FIjXFd+dRqMx1NZCKlgy5a6EbNYuc2bJr0S/BFtXxzVzQ9i/hiwlUFKk2gyenlzFCI/nY4j8Ef9dMy53CCDd6Qdb8e2L//vL8yhqBDAi22bujg06T5MFXoy8x8wpbXZGfVuB0+2xz97PrxzJWniXGpd8g2sAK/GfX4Kog/P48u4U4oa9/Epp2MD+Uv1NpaVLm0Bk8quzX6MJHOZrd/qwoc5DGIKflRUb9IY/IxwEScsC15NSS1OVHE9H2O64nwzXp8VDkUKni+EyHCHiSsP0Nz4YLcH/24jMBhG/rg1Ofw0KN/jmSpBZwv8Y+eeQa4FL8KypT/iKLOh/cGFoNQGy/8Cyd20oy8z2yPk3zyheWsi5OFgim+bWPikuw7UHhTqdjsLYTgGx6mxLtIJ2saIwNXeUdyeJE4ygQlA0hjtiduhoCPY77BC9gItaT0AQZFM2eZbmvSJs7s3+eRFnDvuKW9ZkGSV96lp53kA/2d69Jbqr+IFp3WeOeNvCxeKA/73MYCcCntM8cd/sI0Oc4yzMGjGkyJV5j+RE3kYCI3pbvd0lYlHUlnRuFRmOBqyIjKhd6tq0XgKbo1pkXag+7CF0= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdcd61d4-4dfd-43f1-d9be-08d9aebc713e X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:22.8813 (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: FgctL8vmCiZXFPXeB1xUSZkbXNe5K1L6D/QO/qqwAI4chJ3tzCNe8pF3XoYumxgQgpPhxGJDWW507j5WCmlY8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 This builds on the previous patch by converting yet more preprocessor macros to C ifs. This is split off so that the changes adapted from Micheal's patch may be clearly distinguished from the ones I have authored myself. MMC_SUPPORTS_TUNING should really get a Kconfig conversion. And DM_GPIO needs some -ENOSYS stubs when it isn't defined. Signed-off-by: Sean Anderson --- Changes in v3: - New drivers/mmc/fsl_esdhc_imx.c | 152 ++++++++++++++++-------------------- 1 file changed, 69 insertions(+), 83 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 2da70663cb..25e912ba95 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -164,10 +164,8 @@ struct fsl_esdhc_priv { u32 strobe_dll_delay_target; u32 signal_voltage; u32 signal_voltage_switch_extra_delay_ms; -#if CONFIG_IS_ENABLED(DM_REGULATOR) struct udevice *vqmmc_dev; struct udevice *vmmc_dev; -#endif #if CONFIG_IS_ENABLED(DM_GPIO) struct gpio_desc cd_gpio; struct gpio_desc wp_gpio; @@ -386,7 +384,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, return 0; } -#ifdef CONFIG_MCF5441x +#if IS_ENABLED(CONFIG_MCF5441x) /* * Swaps 32-bit words to little-endian byte order. */ @@ -455,14 +453,16 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc, /* Send the command */ esdhc_write32(®s->cmdarg, cmd->cmdarg); -#if defined(CONFIG_FSL_USDHC) - esdhc_write32(®s->mixctrl, - (esdhc_read32(®s->mixctrl) & 0xFFFFFF80) | (xfertyp & 0x7F) - | (mmc->ddr_mode ? XFERTYP_DDREN : 0)); - esdhc_write32(®s->xfertyp, xfertyp & 0xFFFF0000); -#else - esdhc_write32(®s->xfertyp, xfertyp); -#endif + if IS_ENABLED(CONFIG_FSL_USDHC) { + u32 mixctrl = esdhc_read32(®s->mixctrl); + + esdhc_write32(®s->mixctrl, + (mixctrl & 0xFFFFFF80) | (xfertyp & 0x7F) + | (mmc->ddr_mode ? XFERTYP_DDREN : 0)); + esdhc_write32(®s->xfertyp, xfertyp & 0xFFFF0000); + } else { + esdhc_write32(®s->xfertyp, xfertyp); + } if ((cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK) || (cmd->cmdidx == MMC_CMD_SEND_TUNING_BLOCK_HS200)) @@ -597,7 +597,7 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) uint clk; if (IS_ENABLED(ARCH_MXC)) { -#ifdef CONFIG_MX53 +#if IS_ENABLED(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 @@ -758,26 +758,23 @@ static int esdhc_set_voltage(struct mmc *mmc) { struct fsl_esdhc_priv *priv = dev_get_priv(mmc->dev); struct fsl_esdhc *regs = priv->esdhc_regs; -#if CONFIG_IS_ENABLED(DM_REGULATOR) int ret; -#endif priv->signal_voltage = mmc->signal_voltage; switch (mmc->signal_voltage) { case MMC_SIGNAL_VOLTAGE_330: if (priv->vs18_enable) return -ENOTSUPP; -#if CONFIG_IS_ENABLED(DM_REGULATOR) - if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) { - ret = regulator_set_value(priv->vqmmc_dev, 3300000); + if (CONFIG_IS_ENABLED(DM_REGULATOR) && + !IS_ERR_OR_NULL(priv->vqmmc_dev)) { + ret = regulator_set_value(priv->vqmmc_dev, + 3300000); if (ret) { printf("Setting to 3.3V error"); return -EIO; } - /* Wait for 5ms */ mdelay(5); } -#endif esdhc_clrbits32(®s->vendorspec, ESDHC_VENDORSPEC_VSELECT); if (!(esdhc_read32(®s->vendorspec) & @@ -786,15 +783,15 @@ static int esdhc_set_voltage(struct mmc *mmc) return -EAGAIN; case MMC_SIGNAL_VOLTAGE_180: -#if CONFIG_IS_ENABLED(DM_REGULATOR) - if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) { - ret = regulator_set_value(priv->vqmmc_dev, 1800000); + if (CONFIG_IS_ENABLED(DM_REGULATOR) && + !IS_ERR_OR_NULL(priv->vqmmc_dev)) { + ret = regulator_set_value(priv->vqmmc_dev, + 1800000); if (ret) { printf("Setting to 1.8V error"); return -EIO; } } -#endif esdhc_setbits32(®s->vendorspec, ESDHC_VENDORSPEC_VSELECT); /* * some board like imx8mm-evk need about 18ms to switch @@ -936,18 +933,16 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) set_sysctl(priv, mmc, clock); if (mmc->clk_disable) { -#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); } else { -#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); } #ifdef MMC_SUPPORTS_TUNING @@ -995,34 +990,34 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) return -ETIMEDOUT; } -#if defined(CONFIG_FSL_USDHC) - /* RSTA doesn't reset MMC_BOOT register, so manually reset it */ - esdhc_write32(®s->mmcboot, 0x0); - /* Reset MIX_CTRL and CLK_TUNE_CTRL_STATUS regs to 0 */ - esdhc_write32(®s->mixctrl, 0x0); - esdhc_write32(®s->clktunectrlstatus, 0x0); + if (IS_ENABLED(CONFIG_FSL_USDHC)) { + /* RSTA doesn't reset MMC_BOOT register, so manually reset it */ + esdhc_write32(®s->mmcboot, 0x0); + /* Reset MIX_CTRL and CLK_TUNE_CTRL_STATUS regs to 0 */ + esdhc_write32(®s->mixctrl, 0x0); + esdhc_write32(®s->clktunectrlstatus, 0x0); - /* Put VEND_SPEC to default value */ - if (priv->vs18_enable) - esdhc_write32(®s->vendorspec, (VENDORSPEC_INIT | - ESDHC_VENDORSPEC_VSELECT)); - else - esdhc_write32(®s->vendorspec, VENDORSPEC_INIT); + /* Put VEND_SPEC to default value */ + if (priv->vs18_enable) + esdhc_write32(®s->vendorspec, VENDORSPEC_INIT | + ESDHC_VENDORSPEC_VSELECT); + else + esdhc_write32(®s->vendorspec, VENDORSPEC_INIT); - /* Disable DLL_CTRL delay line */ - esdhc_write32(®s->dllctrl, 0x0); -#endif + /* Disable DLL_CTRL delay line */ + esdhc_write32(®s->dllctrl, 0x0); + } #ifndef ARCH_MXC /* Enable cache snooping */ esdhc_write32(®s->scr, 0x00000040); #endif -#ifndef CONFIG_FSL_USDHC - esdhc_setbits32(®s->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN); -#else - esdhc_setbits32(®s->vendorspec, VENDORSPEC_HCKEN | VENDORSPEC_IPGEN); -#endif + if (IS_ENABLED(CONFIG_FSL_USDHC)) + esdhc_setbits32(®s->vendorspec, + VENDORSPEC_HCKEN | VENDORSPEC_IPGEN); + else + esdhc_setbits32(®s->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN); /* Set the initial clock speed */ mmc_set_clock(mmc, 400000, MMC_CLK_ENABLE); @@ -1030,12 +1025,11 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) /* Disable the BRR and BWR bits in IRQSTAT */ esdhc_clrbits32(®s->irqstaten, IRQSTATEN_BRR | IRQSTATEN_BWR); -#ifdef CONFIG_MCF5441x - esdhc_write32(®s->proctl, PROCTL_INIT | PROCTL_D3CD); -#else /* Put the PROCTL reg back to the default */ - esdhc_write32(®s->proctl, PROCTL_INIT); -#endif + if (IS_ENABLED(CONFIG_MCF5441x)) + esdhc_write32(®s->proctl, PROCTL_INIT | PROCTL_D3CD); + else + esdhc_write32(®s->proctl, PROCTL_INIT); /* Set timout to the maximum value */ esdhc_clrsetbits32(®s->sysctl, SYSCTL_TIMEOUT_MASK, 14 << 16); @@ -1048,19 +1042,17 @@ static int esdhc_getcd_common(struct fsl_esdhc_priv *priv) struct fsl_esdhc *regs = priv->esdhc_regs; int timeout = 1000; -#ifdef CONFIG_ESDHC_DETECT_QUIRK - if (CONFIG_ESDHC_DETECT_QUIRK) + if (IS_ENABLED(CONFIG_ESDHC_DETECT_QUIRK)) return 1; -#endif -#if CONFIG_IS_ENABLED(DM_MMC) - if (priv->broken_cd) - return 1; + if (CONFIG_IS_ENABLED(DM_MMC)) { + if (priv->broken_cd) + return 1; #if CONFIG_IS_ENABLED(DM_GPIO) - if (dm_gpio_is_valid(&priv->cd_gpio)) - return dm_gpio_get_value(&priv->cd_gpio); -#endif + if (dm_gpio_is_valid(&priv->cd_gpio)) + return dm_gpio_get_value(&priv->cd_gpio); #endif + } while (!(esdhc_read32(®s->prsstat) & PRSSTAT_CINS) && --timeout) udelay(1000); @@ -1164,9 +1156,8 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, esdhc_write32(®s->irqstaten, SDHCI_IRQ_EN_BITS); cfg = &plat->cfg; -#ifndef CONFIG_DM_MMC - memset(cfg, '\0', sizeof(*cfg)); -#endif + if (!CONFIG_IS_ENABLED(DM_MMC)) + memset(cfg, '\0', sizeof(*cfg)); caps = esdhc_read32(®s->hostcapblt); @@ -1313,16 +1304,14 @@ int fsl_esdhc_mmc_init(struct bd_info *bis) } #endif -#ifdef CONFIG_OF_LIBFDT +#if CONFIG_IS_ENABLED(OF_LIBFDT) __weak int esdhc_status_fixup(void *blob, const char *compat) { -#ifdef CONFIG_FSL_ESDHC_PIN_MUX - if (!hwconfig("esdhc")) { + if (IS_ENABLED(FSL_ESDHC_PIN_MUX) && !hwconfig("esdhc")) { do_fixup_by_compat(blob, compat, "status", "disabled", sizeof("disabled"), 1); return 1; } -#endif return 0; } @@ -1347,10 +1336,9 @@ __weak void init_clk_usdhc(u32 index) static int fsl_esdhc_of_to_plat(struct udevice *dev) { struct fsl_esdhc_priv *priv = dev_get_priv(dev); -#if CONFIG_IS_ENABLED(DM_REGULATOR) struct udevice *vqmmc_dev; int ret; -#endif + const void *fdt = gd->fdt_blob; int node = dev_of_offset(dev); fdt_addr_t addr; @@ -1395,7 +1383,9 @@ static int fsl_esdhc_of_to_plat(struct udevice *dev) priv->vs18_enable = 0; -#if CONFIG_IS_ENABLED(DM_REGULATOR) + if (!CONFIG_IS_ENABLED(DM_REGULATOR)) + return 0; + /* * If emmc I/O has a fixed voltage at 1.8V, this must be provided, * otherwise, emmc will work abnormally. @@ -1414,8 +1404,6 @@ static int fsl_esdhc_of_to_plat(struct udevice *dev) if (regulator_get_value(vqmmc_dev) == 1800000) priv->vs18_enable = 1; } -#endif - return 0; } @@ -1551,8 +1539,7 @@ static int fsl_esdhc_set_ios(struct udevice *dev) return esdhc_set_ios_common(priv, &plat->mmc); } -#if CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT) -static int fsl_esdhc_set_enhanced_strobe(struct udevice *dev) +static int __maybe_unused fsl_esdhc_set_enhanced_strobe(struct udevice *dev) { struct fsl_esdhc_priv *priv = dev_get_priv(dev); struct fsl_esdhc *regs = priv->esdhc_regs; @@ -1564,7 +1551,6 @@ static int fsl_esdhc_set_enhanced_strobe(struct udevice *dev) return 0; } -#endif static int fsl_esdhc_wait_dat0(struct udevice *dev, int state, int timeout_us) From patchwork Tue Nov 23 20:03:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1558799 X-Patchwork-Delegate: jh80.chung@samsung.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=4F8ZGwBe; 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 4HzFX008mRz9s5P for ; Wed, 24 Nov 2021 07:06:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5193283772; Tue, 23 Nov 2021 21:05:15 +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="4F8ZGwBe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14CAF80735; Tue, 23 Nov 2021 21:04:35 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::614]) (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 732FD8372E for ; Tue, 23 Nov 2021 21:04:25 +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=P6H+klBEYCWxh5ZKH3dAtL8TSLOhK3jNQuawMzetJsIxcL5vqoffJq0/BzWFgtjpKxph56C7UEmvcudx4np5tOG7ArkQPkAdHVcnJPGvhH10m8HqKsuxi9hlaUusWRAroo8DpeK9XHSKe+lr4zBWScGat4x48IaC20eEVtlb/N3EpP5SljslfU1uUOgtqs5+vnT214joRJkzHBzM5UeQp4pECnk2R41DBe6Oshh6/ZvpYd++py4Hc7kNFmOw1Xy2lm087uVbM7zxCBa6ohk0tv+yG/mipCylYc6PGPjuBw3hkO18YJBGk16EELIzjAAoX9Tf4A9c2PpVnchMwHgS5w== 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=3wWMUagZSfd43kry5sIxJydJatRI5Qx6jYGBgJVj6wY=; b=kRYxcxO6QK8DYLSMib1UMSGIHFgxKtRDbDPgTN+dWgvtpljFzaXU0XexXYxO/FmhG+Df/MmBfzSSbeQ3fwIZbHao574d7d1mkOxlEk1KQJcIh9y0fv9T9ayN7p9Z+3iOFog/g5Zf4oT2nha3NLoO0u7MNq9MflY8vcH3xZTdENFEv+XySFMqYY29A0A1SjQI7NG3XvAFIvcFPgpVoT7Z+YyNWd3YvTih7J25X37uqwrf2rzKfmmLI9Lrf4XHBQLr9WeWLohyVvnMrhOohJY3TLzdIZ5NRHoYOHjMvB3uDCFmamJ32Ri+IUvZhPo82LIFSUCz8CKowc+MjHWwtDDeSA== 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=3wWMUagZSfd43kry5sIxJydJatRI5Qx6jYGBgJVj6wY=; b=4F8ZGwBephqrlV21O9RKP4/Ll5+Nt10HX0YyMgfZZClklEroMz16qfd7RiUbgCIDJfc+XwYcAKUkQ1VIfjeyTw9B80RWjE67wETZmF+Kt2/LTsfg2CHQt09VpugVRGhuhTA2Myjlm5RyBecBZVp59E3Rqh0DNiKxmlcnW9I6SGw= 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 DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:24 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:24 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 12/12] mmc: fsl_esdhc_imx: set sysctl register for clock initialization Date: Tue, 23 Nov 2021 15:03:47 -0500 Message-Id: <20211123200347.3772343-13-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) 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 MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab205d38-432f-42be-83cf-08d9aebc7236 X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: 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: FR1HnFpRw4LDDvN8JBy24S+DlgAXsRR7ZZS3ChlQ/Bk4HzLK0cqRXmUut6Fl2fWz6E3shsY0KsN+YPhs7wro/PM3CQRqHgnV9Qf6iy/OrQq8dNe0l/rbRCPSi/Zzx6fny7Zs90l4VZpOuOt9e4EHi5HAZfoLnHfMf+LePAeDeNI+Oj44FY5ayihRySSErmgW5tVc0UvmwTmsNzn0aFkH7CdOXHaoFJBTri8LlxEHThxcLDHVpWu4H8S8FzGvMn2LYPBfPVoZyD75NAx3ugngy4a73s7UKJ7kxs+fgLhNyi6vcIb8SS+d7kG48erTNlbFhyHAtYBBhgCIUau8za+HGhCJ2e1dV0KPMeGoze1o6pMDcBvn6uiCp4XJotf3IlbIKW4vY3OwmQ98pqXnhj1I0MapOToKxaQKYiUl45o117rvUZMAV8gFrvnd+6/Z8KVd7woWRpTDo7uJvIYWj2/JtIR5j8+qAGv9GEPaNFGh3q0zU1OgbNNsIHDLVNMn96tOLFSCmoS5aKWIDOojyqdIajSwhe6oPrzoG4QDEP/Howwur4JoVAX/R0W2rmLVb8wGFVKV57rvbloveiMEG1bX1iDZU7NdrOg/Ngqe4xGKUxcnpohv8Q9WYLn9yfSu0IAlYl6+Hgvz3UbvWcfOOFh2VLKyW7GWDtYCrOPhKKimWxIlsBfl5tPuRlFuGIHjJkHdzMUytE/6v63YTqrgdvWC1g== 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)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o0QrC8w3g827f+t9R2Rd/GQRz06fRZ4qrTEf9eYWqjyKIvfPqXUcQPfVbiCNbD8kEHGgwzYQJBTU7KPOLAVD4pA2lZrtTVHn5x+dMk4A41bmZQZB++QHaeT70sS9hEeoM/35NQ181H9Wx7IMBN9weahFACXAi3FB941VDcA8YlGsXjxNNbOZoFSfvspR2LSfSMq1XPC09Xlex8XNhXxELidBDlaPkaz/nTpfPq3T6xszDGYT71e3TwhYVqLwucLKcHu+WhZvUCaa5Sb/ptYXXyYzh4i6YgOcDER7phEZuvY8lG15W9bRxJBIR4IkWLKfgBKjV0rpQ6gjE16ir1WC5j/FbkG2uCl4vGXR6JldBWyIPBQL4j4o/yXoxy8XhfsTG2jSitw/x3xUN+gw4ekZ3H6igORvvsXd0nXR13lJkJfRKRikfUGj4drikUSH12hjRpP5Bkn6G5T/s4zPx0sa4PelK04qem5Byl+mgB8YNRhdT1hOzUoHP9nisy4IYi3Rt+6ndVbu2Z1OYen3QZzxCUWnf1P7zmvVGYVxwrohuijJJa/sQRzT2b1Xo4as8K+V0hLz25uqxh2OVFSsgiqwqZdKsgZ0wjZyB/1YCwcFOjabp7B8SRhmAKb3q5lou3OojbqCXWbswEbOtfJnhKcZOZ9hu97kMZjvhgsaP8NI0j+WhI0hIUZpv+atpuWRxbJjib2L21l1Ve+XxVnhDxmTs6v0HdRcz5CDrM0AJC6Y5hyQLVg/yswYGDJpiRCWq+RpA+44yIY3cqRYmlD5rAGaCFZ59rJLX2YH1zh3tPJbRVGaALQjOnP79tHHyy0pHnyxuPiosAAvoRMy2/uIWCfTsQ6Z1BdOUGXNplL2ej3O+weoMG4J3cI+NHY0pIcWj67ZNVouEmvhbIAK0CMt0/2bx1nSi8BqIjgrVTyeZo1OF9U2dsmlTQqojKNbtTkRivRZ2Pp2yiE4DmjD14b9w7WeTKXoMCrUOVfdss9bdXvykY+JE1ALdBS+MNXvIRyfNXGy9Fw2TWW2BuCd/AmHzvxYwrCN0RxC9ZDsKVvI3U6LwyFbRRly8u3JP0PAsp8kyA6E1vAK03Y9qbVQp8iq7MTUMNp75DvFqNGAkl1hDj1OXrOmPeEt7VkhjZ60f6h4gd9K+lttgRGlknvSni7LGNLwV0F+LQqkf25VpHozwFT3eB6XokeFxZ3KHHYSeV1WSOyDTkkrlBoYQFSf8JisIKnQkkm3szr89mfuKPFEgWxSiQOaj2Ln9ivhLdTu9Sf/raClNUsmBVz5ViIUFKuZwA4AsPsZ7OXcIljy1DgId/VNjMqFiyVmSgPPvoj1IeGtUhesHIqt9U/M7k/7+NmLPR1LXpASTofaYCqfEE+6sW9Qnp/DJuouW6cGetjrIjd/Y9no69isUKdYryO9gSKlDJmXwsGmBAPzSsZH+UoVIFwFLEqjkjNTj0DWULTXqea12OkRJ40LgKwi5eN1ypIjpQMjg57ghZviZyuFsL0QFkPiTuo1h8ftQ0TLE5oKoMlgiizL0MIcfThWaYcX5LXelD2rRo+B2zlKyuIEzoOpFQ4Vb4d3In6AMuxcqH7BlTg4SNovEkE70dUkNc1sCQvnK/7ykyuupcWdkHxj1Bur9cTlLWE= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab205d38-432f-42be-83cf-08d9aebc7236 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:24.5234 (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: 3RgH2aGwJbToyJs9/kAKsF35ZmaSufnrDqLUznd1LXeA8jQT6DmnpzxH1kA0hL1zF7QFPiIteHg3T1iJtXEGMQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 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 25e912ba95..9299635f50 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1020,7 +1020,7 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) esdhc_setbits32(®s->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN); /* 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);