From patchwork Fri Nov 5 17:39:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1551501 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=aj7IaSB2; 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 4Hm77y4bDdz9sCD for ; Sat, 6 Nov 2021 04:40:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BCDC78372F; Fri, 5 Nov 2021 18:40:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="aj7IaSB2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 608DC8370A; Fri, 5 Nov 2021 18:40:06 +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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0629.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::629]) (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 9082482C6D for ; Fri, 5 Nov 2021 18:39:58 +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=Ha+lfVcI+S7KtLYL3LpsZm4iQJAUP4iPD7GQ1+8BCbkGZsL25H1IaVqVmObCEnhDhQlKn8etFEygp3cvKChM5K2MHUi/FLbGgdutamHoy3X1F3Cx6t7zX2ecDX04jwHy+aOdGLOgDGs0JIKE4phsLatauWr9V5XufgGo/cydd3NSEqpYU5g2FO4/ebQ+FyyAFaJbqx/5nBrlyFoH1NyOMzsyrpSceNYZDizxMRWrLUMCvYGFui1rhr9tZF6zcQhOv4xxPVn5DGBLiHzqaMKJSNBjlLDDbb9o74ppTugxthsAvfAsgNBpyTX83lQE3Ekmve0YVtspwGlSXUlP/96p3Q== 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=pccj4/LCXxkAe0ANjB7yOfVvOm+9uAZlxkVxWF2TIwA=; b=dp+ts9id51hB/FGHj1i5DfHOqInpuFWmWo4NpxG7esWzH+1eKMkA9hzZwTkokhogzG7E0MbbP35fib88/dO++UUpft5wPIcWz6TcdD0rBfT1VokZQLaMOLeblyOBDOHSCS4FcJeSk4z2IcdTvZoEkndEFY3xoFGzWhR1SDSNNYvNhkHxtTjrs9ghhaZcgv4pTAVFKacma96KXXt9wbNRGl9n4M1jhQrkFZzAL7pn30C5gdI7b/TXWiDZX9T/XchthG0aPtmoVfk4lfTEo1VBIUeibofENewMPY9M/lBGUh5j/gUotAHly7jqAUqNCYKFRs2R4Bd5fvDxBaIyZCI4oQ== 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=pccj4/LCXxkAe0ANjB7yOfVvOm+9uAZlxkVxWF2TIwA=; b=aj7IaSB25d2a5hAwli1g2oRq60NXVN3w8Fuha+Ga9rhZDjiiNblbZyWYmSE9/iei1av9R4kqrAdSgwsShr27mRfV7k/wrgEJdvUhjhYGfRPKNYD7KvKTFXFzL9D9Coi8TrW+bqydSfdSUF4KBeMNyEv/VIELw3hW1r05BwfqCi0= 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 DB7PR03MB3802.eurprd03.prod.outlook.com (2603:10a6:5:3b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.19; Fri, 5 Nov 2021 17:39:57 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4649.021; Fri, 5 Nov 2021 17:39:57 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Yangbo Lu , Fabio Estevam , Michael Walle , Sean Anderson Subject: [PATCH 01/11] mmc: fsl_esdhc_imx: make BLK as hard requirement of DM_MMC Date: Fri, 5 Nov 2021 13:39:34 -0400 Message-Id: <20211105173945.92446-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105173945.92446-1-sean.anderson@seco.com> References: <20211105173945.92446-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR17CA0012.namprd17.prod.outlook.com (2603:10b6:208:15e::25) 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 MN2PR17CA0012.namprd17.prod.outlook.com (2603:10b6:208:15e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Fri, 5 Nov 2021 17:39:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a7483da5-08c8-4c6d-9847-08d9a08348c8 X-MS-TrafficTypeDiagnostic: DB7PR03MB3802: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:218; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 757sui1T92tvWoGf499Yf05LbQbFZ+gZjqspKQwNHwO6+U3h777UNpE3CmeL3vvoU1G5CtAn/BffNi/S1OhQRvtFlbaKHCMgwoFBHbi2pYrMQ+48upw7p8SBoip2iZBCwCMcHdfPkbr75YUvSz0u5UISRR6e+OhxoBttUdtY4Ycmrihr9UrBpM6TzLJmPum2fsk5EByQaK6/g5vat80x/P9CJKkn06KBXZVfuztfRAKD6wW31u6Izuq2dtQ6qdSPA4T21ASqxzLBNd8B6obNKRqwR4/2SzouYJaYq9a2lRN5mn55Fiv0oXKiKKfgbsN/Hg24iYZLGFoIgXpjvnLDe7N/PIkNdxHm+WjwiMgHfeX7FC/c4gsZhzq6JxovLvVTJxSaEvjoPYEJyqLzvwuRlIW3ZS7/mHm0LA+Qh4XUUU8QwgvQ+LhOLE5lNWVrQxzgA6PTe3YvXh73UQ0jz6HESyDtysseFlEbvOsO3a2mvq8Tm2yPoCMEhF73pHmU8r1FhlYNGDIBEIOtKaa0divsTxteQgGQ4xgjuSixS6lqQcRg2yYU3IJ3hd2JIYLJfQ+o849xr4MSVqcJ1A970YB5/UK7VAS+u+vlPg9GZVIBnb/HHuASwHfc6zzoWvLyPpFw3vd8yn9cnaD2iyhZPW6BW33yJCni6u6z2bUBHXNXCZO2bK2OF/OPpOGtUy6q4uO6M5KxYqYByMU2KF/QGvjtrg== 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)(186003)(38100700002)(110136005)(54906003)(2616005)(38350700002)(1076003)(316002)(66556008)(956004)(66476007)(66946007)(6666004)(83380400001)(8676002)(5660300002)(86362001)(107886003)(26005)(52116002)(4326008)(36756003)(44832011)(6486002)(6512007)(8936002)(508600001)(2906002)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ophp9GGB3pLd8ffGywPJIjs/QsVbcg3lCKQn+vNJMnpnhrW4oJ+t7uQV7pc6CnuVMgYAlA/gwrkulLFqVNwoAqiIvbAB4OfP/ipyCcfL2Aq2DHWasRx83k0t4hIHRrIG9GXdiDgJb7a4COxtXUpjV/q/XrxVh0SwE/v+v+C6PLiduQ0lVaMg0sq7OJgMcet0lKeny2+6F1xy+gSPrL0NjxcpgQ1eZ5OoolwItuBzaohyyURSFwuPZ1AqORnUTk5jC+OnSohiYa/Petgk1QTUaWkFyStOAGTapEialF54QoC8QNjPkwT93L0p7ahaz7fGl55R13Uc+JgBnoxvwJmN+wtkMef3qcq/58TstOZ9gTfSd4d8DjoK986zKjWggd4jwnj6t4eLjM9vSvNlVuwvae9aduURQ48C8L4HKR33C+RIgiKbRr2qY0Ge5NHD80c8zyBtk+vZtvVRsCxKcc70a8w4psB5a6mgyxmOPEasO+597NsvAMPysKeuNh2G0n/Oo4GUmuvok9Um3ktu2Cv0Btwxxjl62pUIgQzUtfSiuJE+5BXmgLviWd556GGGm3EWeEsw4kLxkS45sCfH4I8NBcjGqWWyuGHDiPh527G29yVQA+keKoLGKmSyBuIHEnEtOpMSMKusId2JYxjkvt5xKL+07OdxNb9T+BTwQS8+WjT4x4FL7fcjI5RqQiGD0udbkFIsAbomVlpcg6KiS6fZZrrjgEHmLGxg2JNofM3vMMqtE4cDKdkQ+v+ibdOwf2oVBwLapLDmuBWsM1ONhuzIct8U8V3YRB5Y/BhvWq9H93BBc9bxYJGi4HIpfyuUWHmDl+LHuoerxo68vGoSDRKUyo7MFOo2/ue5wrxCs5NtrQ0WnUqM8+WIqVBHljYjjJ8P59R82lslh6nImmnukc/BVONEcgpwgUaaHhEZs/FxJUyPhKQpcixC5HnaRGMbOhFH0eQpZq6meQVNkOp1aMKfLU2E2axs+Vb1tVMfzos0ysGZn45+ZWexPhfdvW87YutrINp4hDdpt8frcQHZBhN1Q03NAASbGRdrK5nkRryUo9QtM/pgk7nwnGPLc+DE8ok8WbEy+lqNZDBGDFrGecu7JX2tdVmxotd6UdLR27b4VTIHbVTdbSVDw9mplzce9SVsciMZJ8RBNcsVMAkooxIYnH0FZ33GIeauUqLdlTE6CqhUHHMZa5AqiAbhlKbNIHM/MuZ+SR4png1K6csCDLPvasHjAllTwaFmJa7ZiLWFhqR23R/qjhki4yulLOROtvNFT6FAYnyvaD1N8UwgkrdOpILmnmlN5QYllaG/I2Sq77gqdV2rk2oKJEIZo3irNkJTiD/SVhbHOeExwhAxyJc0Pv5/F3VjpJv3Vahfz4vS9Ebew358/Ybr+yJ6MS14qJp938UUdOVAAqHJBOomIdzsGY7k0NRG6VnqyxxEuvUcQm0nbHc66AiAyjrbs0uwml9L1drKInT1igRQz3ZfyPxHFfADtqGSCFJ7Z0hOZC7tg5YSG8eyP/HMlwoObPNAB8Q/sQVJxprPVUxTIbMgwYrwkC6IGUnK794P1Facjxo/lAawZJayKGL3p4IBYf+KHFb7FGq4pgj2Un0cnAg1gfNOIy2eFeSm4+65sDgj1yraFfA= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7483da5-08c8-4c6d-9847-08d9a08348c8 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 17:39:57.3020 (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: jNKMekkxGwo6DSi1T9XONczkEfOGqE1KK5EioHz07X8Ou4Qep6LeaFcCizinG4CXcr44uFo1vCn4f0feXs9L4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB3802 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 --- drivers/mmc/Kconfig | 2 ++ drivers/mmc/fsl_esdhc_imx.c | 33 +-------------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 1569e8c44a..313244682a 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -790,6 +790,7 @@ endif config FSL_ESDHC bool "Freescale/NXP eSDHC controller support" + depends on BLK help This selects support for the eSDHC (Enhanced Secure Digital Host Controller) found on numerous Freescale/NXP SoCs. @@ -826,6 +827,7 @@ config FSL_ESDHC_VS33_NOT_SUPPORT config FSL_ESDHC_IMX bool "Freescale/NXP i.MX eSDHC controller support" + depends on BLK help This selects support for the i.MX eSDHC (Enhanced Secure Digital Host Controller) found on numerous Freescale/NXP SoCs. diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index aabf39535f..0a7f7e61cb 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -39,10 +39,6 @@ #include #include -#if !CONFIG_IS_ENABLED(BLK) -#include "mmc_private.h" -#endif - #ifndef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #ifdef CONFIG_FSL_USDHC #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 1 @@ -58,7 +54,6 @@ DECLARE_GLOBAL_DATA_PTR; IRQSTATEN_DEBE | IRQSTATEN_BRR | IRQSTATEN_BWR | \ IRQSTATEN_DINT) #define MAX_TUNING_LOOP 40 -#define ESDHC_DRIVER_STAGE_VALUE 0xffffffff struct fsl_esdhc { uint dsaddr; /* SDMA system address register */ @@ -157,7 +152,7 @@ struct fsl_esdhc_priv { unsigned int clock; unsigned int mode; unsigned int bus_width; -#if !CONFIG_IS_ENABLED(BLK) +#if !CONFIG_IS_ENABLED(DM_MMC) struct mmc *mmc; #endif struct udevice *dev; @@ -1506,9 +1501,6 @@ static int fsl_esdhc_probe(struct udevice *dev) struct esdhc_soc_data *data = (struct esdhc_soc_data *)dev_get_driver_data(dev); struct mmc *mmc; -#if !CONFIG_IS_ENABLED(BLK) - struct blk_desc *bdesc; -#endif int ret; #if CONFIG_IS_ENABLED(OF_PLATDATA) @@ -1607,25 +1599,6 @@ static int fsl_esdhc_probe(struct udevice *dev) mmc = &plat->mmc; mmc->cfg = &plat->cfg; mmc->dev = dev; -#if !CONFIG_IS_ENABLED(BLK) - mmc->priv = priv; - - /* Setup dsr related values */ - mmc->dsr_imp = 0; - mmc->dsr = ESDHC_DRIVER_STAGE_VALUE; - /* Setup the universal parts of the block interface just once */ - bdesc = mmc_get_blk_desc(mmc); - bdesc->if_type = IF_TYPE_MMC; - bdesc->removable = 1; - bdesc->devnum = mmc_get_next_devnum(); - bdesc->block_read = mmc_bread; - bdesc->block_write = mmc_bwrite; - bdesc->block_erase = mmc_berase; - - /* setup initial part type */ - bdesc->part_type = mmc->cfg->part_type; - mmc_list_add(mmc); -#endif upriv->mmc = mmc; @@ -1730,14 +1703,12 @@ static const struct udevice_id fsl_esdhc_ids[] = { { /* sentinel */ } }; -#if CONFIG_IS_ENABLED(BLK) static int fsl_esdhc_bind(struct udevice *dev) { struct fsl_esdhc_plat *plat = dev_get_plat(dev); return mmc_bind(dev, &plat->mmc, &plat->cfg); } -#endif U_BOOT_DRIVER(fsl_esdhc) = { .name = "fsl_esdhc", @@ -1745,9 +1716,7 @@ U_BOOT_DRIVER(fsl_esdhc) = { .of_match = fsl_esdhc_ids, .of_to_plat = fsl_esdhc_of_to_plat, .ops = &fsl_esdhc_ops, -#if CONFIG_IS_ENABLED(BLK) .bind = fsl_esdhc_bind, -#endif .probe = fsl_esdhc_probe, .plat_auto = sizeof(struct fsl_esdhc_plat), .priv_auto = sizeof(struct fsl_esdhc_priv),