From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2852C433F5 for ; Tue, 23 Nov 2021 20:04:31 +0000 (UTC) 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) 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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: =?us-ascii?Q?XI1hwlhulC6xAhfSpW014RErO+CA1sdKX0CmQuIJSJMhexXwBNrf1439kZjo?= =?us-ascii?Q?kivT8NtdZUtZQx5WPzqEzuoVHBDYWFdSA5YyhlckWOhXq+iEcGh46DjHTpy9?= =?us-ascii?Q?fnLyDKXw2d7VvbGDA03+SQOfvJHR4YcaUUB7SXxTofXJ/qDacd5B6fNRtHw1?= =?us-ascii?Q?TRzx2gDKDQDfWlfJ4Y/8wAQhAaDV37jUNCZScvFnPwNkLJnRTvwyPdY7g0XB?= =?us-ascii?Q?qwDhyeUK4G+io83hessXp9Lmj/rbJte107lGgb1y0aTlsB83aV2tgBZU+CgI?= =?us-ascii?Q?UPHh72dZQCVMkuS4ZDgl2KZpKhH0Sg2sKZlhfG9gA335/2D9W8N0VA8paBxN?= =?us-ascii?Q?VNum73HW2nydNNYsDDADfh/Emoglyk75jQOMSLS7GC0Lf8kqsjJoxontSD+T?= =?us-ascii?Q?UTIltxCXf2x0Htg5FvMbAWVhMSklCX2QIyp9wPpG9TE0JU/E7b13bhTP7gh/?= =?us-ascii?Q?hA/T2iRO7dyVVcEodUTsjxhyq7yIcNZomthbeOd4a/vG8ESkuwAO4h60Ez70?= =?us-ascii?Q?x3fLoLYquw1vxmCN0JTGfCVxO29sKDowfNbxWkY5No5mpHLdEtckMaffgLiO?= =?us-ascii?Q?zE1Ek+EpDOE+rhGkOjWuxPOSgd3wa1j3TqLzn3z5BKjHglw1n+uu1Bao5uxM?= =?us-ascii?Q?+7GxB4J8dwNz3VEmrtoiGZT0nw3mKmxhwyJiYWGdW7kS6BojwhIQTRYZP4xw?= =?us-ascii?Q?OqL2bzhx52VwIWVxB5m9hb9kVH/C4FSKNpn+bVbKA/SEWta9XkcEA/XmJn6f?= =?us-ascii?Q?EoTE+Du2B6j33ULsjdg50ZaIr338dKV3a+onMvAz1ozD8HHQ6VruyZ7lUHT/?= =?us-ascii?Q?TlLQSdkHbfSr+BUxsgQ6XkzzgzxephtuEpgr0ge9GL3f36e4PkCDSjGue+jp?= =?us-ascii?Q?1HoWaTDstNar4TsyqAx25R3n+jUU+e6M/jbfW0C6C0yMYgilKKlGndu0t/7G?= =?us-ascii?Q?mnBdYwxFtSON8xYk2DcSttEIQdpZ0Poua5HnVcp+KR0XPxXwO9ZXL+wfrZvQ?= =?us-ascii?Q?w3kHGc+qW81jl+oupsp9hBl3JWybXEK2ThSsWQGtq/XkP/wQQfStZCCA7eB4?= =?us-ascii?Q?vi4P//DYwvkeZimH5CGai8NMVsGWz1IDasaZRGZYD9787k2kqD7OcLww5+/C?= =?us-ascii?Q?gjpMlZGZvQUcwa2V9QJbxssvJDMiZlAnfBcykeFJkT8V9mb55q0MITnKWJLr?= =?us-ascii?Q?CJnMq85L8RDdkzaKHswK5LeVlK04HO6ys5s5gb0GO11Q1iZD8Z5q/zNlixhz?= =?us-ascii?Q?HiJk4EhfSme39sRJc80XZSk5m6IeyQr1DmhNZF5BkOkNzNSu4IRKYDVFh6jE?= =?us-ascii?Q?qOLSARQiMXXYeg00ZJzya7SBXxCCwS5vpDKazO9P7qugak359exnQRcfYdjb?= =?us-ascii?Q?2Kpb55FQk2YZfgFpEWpJv7uxBqalzTIZmPYjBXQAX/pGNOcn5la/dJPnePZi?= =?us-ascii?Q?1mNqAp+ZaBPcvFyvG+QK5mEDm22MJX7jsJabesEdGMfoJB2T9UHNQLH6EHVQ?= =?us-ascii?Q?det/EefS25hJIWzzjBoeVFtLl2EOI/EZk++Iakh8wDMUSFl5glaBoJ3Vkl8Z?= =?us-ascii?Q?NqB1sOMq2rmr7/g1RG4Setu8xBB+uL8SvD52fAjeWKxF+ALdk+NWr7ymBlj5?= =?us-ascii?Q?dd0iSHnnAR/sUrAwhYfHTHY=3D?= 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), -- 2.25.1