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 60DE4C433F5 for ; Tue, 4 Jan 2022 16:16:58 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 44EE481429; Tue, 4 Jan 2022 17:16: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="h88Q2Lc4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B1AC382F65; Tue, 4 Jan 2022 17:16:53 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20622.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::622]) (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 6172381277 for ; Tue, 4 Jan 2022 17:16:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WFE1Vq1MLVrj/h9Dh8RRuY/17O2Y/OicWoqbHS1z60bs/2Id2YW4MsbgJLUg1wuGiUMyQMJLv6s5SyBRRh7A5SJnEVpT9YjBYPsXijPZqpkb2TinWujrb4W/aMkmHuqvY0PFSnMBlD1IIVuBDaGtgqoMKKAjYB0ZiV9O0sPe7wrOsknM0xRFkpobW1jlXPh5wK1loNDP+HkXvZvZ8EwbTdyrDAdfYFYb9iR5+PWg7nok8PDt1JKrEijTZvr3l1QyG038fA72/Dt776Zg/Gqc75gJwNscSsPdP/AW2XpPs9VHP8CRw0bmdh12ZUc4pm4+RMq+/9REvl/ksGUwjlHDwQ== 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=fGE5YZSEYZ+IwXWkl1ZSZ31mN/wsP9rKHXxZQS0hQSQ=; b=M8Vn8hJnU5NsaitvBTXrTNNB90EXk/C6QnUIiO+e8jTCcjJHhj8v+8CMazIjzabcL5DJncO6P30+wnihVe39AN71uUuCwasfUkOrstwF/PAg9YjZsDuZlyeLzgGEL3Qp72ltRHJcPka+DFgpsdeMW4nCfy/1FjK61rOkXctxZp6YPDD5DDpqHT+mG4o5XZyw/cwTQKYuRiq78HKKqda09CsUURSF2wyipHf+E/FZDUNUNe7XCOgk5TRGhs2Ojkn+DGHe41lgFteY1JVc1qWUOmErUgDgEvy0tniqCq3B7uv8kCy20ICJa151y9wdWn6nufFbu5q9h5J1Yk0gzfvyCg== 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=fGE5YZSEYZ+IwXWkl1ZSZ31mN/wsP9rKHXxZQS0hQSQ=; b=h88Q2Lc4/hkcd1XvDbkMdeA02h0ufa5BqZcJEw6P061LkPymgOiptuS2dF8RN6Eftn2Nqw7g+nLYXAUzTnLeXU1LZqMHgkkCfNVyHKhOtlrxfe+hLZHTeadB8NfbJUTBWNspiI0Ww2bphV2Og0IOOJGZO7Ch+Y5UvPtwqT3cZyU= 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 DB8PR03MB5881.eurprd03.prod.outlook.com (2603:10a6:10:e7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Tue, 4 Jan 2022 16:16:48 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::d47e:81b0:256:3005]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::d47e:81b0:256:3005%4]) with mapi id 15.20.4844.016; Tue, 4 Jan 2022 16:16:47 +0000 From: Sean Anderson Subject: [RESEND PATCH v3 01/12] mmc: fsl_esdhc_imx: make BLK as hard requirement of DM_MMC To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson References: <20211123200347.3772343-1-sean.anderson@seco.com> Message-ID: <17862939-c7b1-310e-d98e-ce68f776ee40@seco.com> Date: Tue, 4 Jan 2022 11:16:43 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: MN2PR16CA0019.namprd16.prod.outlook.com (2603:10b6:208:134::32) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e869d23-f0f4-43f3-9ac7-08d9cf9d9b9e X-MS-TrafficTypeDiagnostic: DB8PR03MB5881:EE_ 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: /7/IQYVPXWlAxZMolB5TQNaLWgU3D8Kfwq9oAeitdy6LRK+le7qILAE7ampAyj/IG1xaqeUiLM77KBic6qfCdtF2IDQgQJBAUX+zd+Qro28xoBxz7WEpEJzwZ7HXFWVIyrnCapAfadne3nfcZP2Vi20F0BRBlh215hEa2+UudjQTyzDFbfoqK8qTCO/5U2aO98fqmRmaF1YlFGY1ttfGx8Z5v3tKUxLnzyiz//DQC40mSSW54ZOqKQKHEWcoT1SyWafjsujzd8Q4PbfuNQDEYjWVnw/JRnuPpjVY9nMgcjDP3At0BEXhuE4a0FfKYC0hgmhn7Qn+4D2UgPz5HRSlcx5D6lr3b+JBasy5ofiU5n/mjNTUmUocjCmRGNzbZWa7Xm6h8HrFDSPC4FAbGUvPLT5CYb9/CK54RS61KmcqIipecRsMlifPXqTmri98kpFDy4oMS88UUa8ennnQGOtx3rSi0ca7VyFkG4EVd5seipzy1JfId9Lxr7oX7FiLD1R4oMKguwkMfFwdgEauAxGdV1edwVMoQcGFGVubFn9sXwnbAPgbejgDzzdqQcPvwWx5EEMJw689SLfgoLu9+aHcC6V46vz2obreEbcmqB5RkZvEuA2FzPPXzI4Lc+WJ/kYUxPmtRSjDJV1i+IZbL39US6uCfwHgb8GCOq5g4W31yVye7rH8UmhuvLwT4qi/FQPN2fWeT4jU6nbVUP235g8+NVjXlv3v30wnKK+yUkeLKL2G8Pb7gA586oWo3YP7VG+TI1Uo0iyZckpe8YYujSuuiQ== 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)(8936002)(31686004)(2616005)(52116002)(44832011)(86362001)(83380400001)(2906002)(186003)(54906003)(110136005)(38350700002)(26005)(31696002)(316002)(36756003)(66476007)(66556008)(6486002)(66946007)(6512007)(5660300002)(4326008)(508600001)(6506007)(6666004)(8676002)(38100700002)(107886003)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?Windows-1252?Q?Ami6EBatFp80uWl98Zs1j+ZDczpaxnG3CiL+aXxCThLu5QNgTe15w1sB?= =?Windows-1252?Q?HwttAmjsQBpvVLrVk3PnZuCcjIy0x4L8wEV9PRt533vrUIfYQ6/YiIfS?= =?Windows-1252?Q?0objKHQSJ/jeHS9OxNZeIdwX6w0fjcJ7Jplc7fPovp/R5ANROgOtnOii?= =?Windows-1252?Q?X4st6bvQjNcR8WIxSDb4B+hGl97PWVgJywfUnGyR9XzE7YObQMwkSPpc?= =?Windows-1252?Q?TBa2gNlnwPCTJMSyohTWa6tEY5CQhjKsz6+YGwsCfp3efN3/xLwsf5Zw?= =?Windows-1252?Q?q4qJeO9bQk+f7B1bSjdiuSZGn/ppKqaG31+vQa4NdAat1uHxTGzmMkuy?= =?Windows-1252?Q?OHuYhgP4vDxPXoZFryUJIFVgJqaF5cVVJGYynbtUeXLoHHXuzHJnojdb?= =?Windows-1252?Q?i7vsSUIvHgvedW0z6lLHV1Y9KW4psndqp5A4zpmhd0+OrtiPLeMP79hW?= =?Windows-1252?Q?NQcUkOzgtiPrURbeAR4IFB39SaBGX/WSMK3IIguZtxRN8YV9gkB4KP3r?= =?Windows-1252?Q?sbEKKix6wfbBtBOES0iaKSIlkVPSjjl04SCN79q+u4GenHhbGnY2Sgkg?= =?Windows-1252?Q?6jA1zPzoNMu1eP2EDLgGj9zbqK9rC9+t2epEw0ODQjBKg1wuQgvynDB4?= =?Windows-1252?Q?Ykc5Lh0C0vXf67o+4ICr1ETWmnmO+SAuLd6X8zjQw49Ho2SOgVlv8kou?= =?Windows-1252?Q?9psqOJwEdgUEXXJZqgZgt98ydX4m1wcSiQiwKXmip50mdY/H0wgNJ2kg?= =?Windows-1252?Q?9OvOA5X6MlvofymQOARMQDHJOO7oKczAhzewjKvZ+7MuA3DyFdn8vPF9?= =?Windows-1252?Q?TIwcFPaZNjGoNcwqEjnjHvk16XfWemeBaueNuyDeTdE+iqs+cduoaxd0?= =?Windows-1252?Q?pckICW9cuU473kFlGY5TinNc7R7iwt78ykFHtdd3vz63j0sI3y8E6MLR?= =?Windows-1252?Q?tZNEg9I/+76U6qU9CILWRvItM1FewMKR/CiqOBJppDlPuN0lzGWCY40Z?= =?Windows-1252?Q?p5NxqUmkSHrkVdL9INYUIbID/x+C7S8/we8A4SYxbw/OW1IlYiL8Ei0U?= =?Windows-1252?Q?xyZCnDj/CYJhSiMfyG2MnVBJIPxpJLPgQt2d0wZdSLhxE7vdHInu1bbG?= =?Windows-1252?Q?AKfaXe9De2VmkRFHD8z0ETs5bGDjkIvRRJmjHV8tTNnlzWkQ4ooyRj/A?= =?Windows-1252?Q?3liTEojQBTZXyVdwKULGHO/BdQvn8L5WLMeYjV5tfGJacnLUQdEUKuzy?= =?Windows-1252?Q?3+KBydquMMC+FHX+FTOSv69OgJ2nMsAyuEDmz8TOeWtPXnm5F2QSdVVR?= =?Windows-1252?Q?FJI4nXgwREMZhUnA9ZRIyoA6lnp5zWfg2lamm0WGJEiRLhk5QoHApcGE?= =?Windows-1252?Q?amJGjiDf4lvoJINE1cBhrAgMhIX5f2E4FHvgzeLsoiRy00vhb0pUEhyc?= =?Windows-1252?Q?5rOHWpjNS6kRrdTLiwE4qG0NJFoyvjsBvqQk6mueT6HR6yiawH8O+CD8?= =?Windows-1252?Q?9qPFRtpTYn4+PbRDhecqFpkPA+qAjZ6Xglx6qXsjW+hn+14xT7f20MNl?= =?Windows-1252?Q?tyu3rpibsGUtMyyBVR7jB2sildRgtCCVSrwFbPnXtmlj3ImXJpDNy+x0?= =?Windows-1252?Q?+0UBSPInCO/zouuDmnDgcrNkZUqCr0bR+Xr0iHaeyDNf6fcWhFGu2VUN?= =?Windows-1252?Q?VwzTL4v4IMFcQoqmtoYLYAotnXnbVpRITuRSsCQR6dwveWuMqMXLducz?= =?Windows-1252?Q?sZMUOdeNZ/1FmZhN0Hs=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e869d23-f0f4-43f3-9ac7-08d9cf9d9b9e X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 16:16:47.9032 (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: 0XnSqYqZUSZr2b5EByPkMfPxhmM9WSMn1wfr3TbAJ3ynh03Tdr/WrnQFXKQdW40cRwsH/nTGP0sHI+7ULmt8sA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR03MB5881 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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