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)