From patchwork Fri Jan 18 14:53:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1027453 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="k2DKmPDA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43h45g1dPqz9sCh for ; Sat, 19 Jan 2019 02:06:15 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D17F4C220FD; Fri, 18 Jan 2019 14:55:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0B2B5C22115; Fri, 18 Jan 2019 14:53:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3E4FEC21C3F; Fri, 18 Jan 2019 14:53:24 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80042.outbound.protection.outlook.com [40.107.8.42]) by lists.denx.de (Postfix) with ESMTPS id A0B4AC220E8 for ; Fri, 18 Jan 2019 14:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o9KobLVMUrOHaiEX31YU+S/NzJmEecSZhCbEThbTZMg=; b=k2DKmPDA53woU1s3iqDbqXwJjL/CKF0t9jJ/8hneLa2w+fNzWqe2IY64q44fVO1gB+fItH3sY7w88cscn/w4ngXvA7Vk8rOGfXibASNeCi1xwshCsQPNlfM1yADbzDcJ1xPqISVuZrbyIlJdRNBMWYxeqBLinKkzXX8s/C4hgqg= Received: from AM6PR0402MB3654.eurprd04.prod.outlook.com (52.133.28.145) by AM6PR0402MB3526.eurprd04.prod.outlook.com (52.133.19.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1516.14; Fri, 18 Jan 2019 14:53:19 +0000 Received: from AM6PR0402MB3654.eurprd04.prod.outlook.com ([fe80::24fe:718b:a240:1aee]) by AM6PR0402MB3654.eurprd04.prod.outlook.com ([fe80::24fe:718b:a240:1aee%2]) with mapi id 15.20.1537.018; Fri, 18 Jan 2019 14:53:19 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH 05/26] mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds Thread-Index: AQHUrz2N5Jnb35eiuEWydCzMim2zUw== Date: Fri, 18 Jan 2019 14:53:19 +0000 Message-ID: <1547823182-6756-6-git-send-email-abel.vesa@nxp.com> References: <1547823182-6756-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1547823182-6756-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR0402CA0002.eurprd04.prod.outlook.com (2603:10a6:203:90::12) To AM6PR0402MB3654.eurprd04.prod.outlook.com (2603:10a6:209:19::17) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR0402MB3526; 6:lEKHdF3GpUkXXxH/4ncMwGMZa4/on47zr6CCBpBoyq/tkMppbHzstbXIguquBwJR9zGLgzjoi1ww98V6+9dSVTLQmqa6VEWW/LKSOLH5RfwhnQxq5xrHe2075QGRyeGB2e0iI2I9guKmbtTLaOqfjaLD8XUZ8qaBKACZi7UagKksHRTVZBd/k3XpWjaFXzV2lOjzSy0v0RZAkuDPKPZaNN3zW8xpanwmIuwJNNLyZtDVztQ3rrIQ90WkG3+peRd07wV3GJAajQCIkqA9bslWULZ9Z6td4gwrHjo8K6u5njQBSGzMiqqNHQHkxU0kxKCvQTn5r4+yBSZvdfBtERtikMmNY2PZTJ0PGFyhmE1dJtXtAiZrD4d2VyKIXlUiDNm56spMeDw0iUP8vlMr2yb/Juj7SLJMa/51dwA2XqQHktQHF2B39+kPZ502bXnZWwdhqXygJn4GfhWefmQJpd5JiA==; 5:/6QjS4FTleb7y/AvF/MgydlrxOLAbOPDzao7oY58WLiD1YMxHxKrRHo9jMxR90cBIG6oQIWrcZq1acyzHaZeL9mzjkST8DcS49j/zn6dls9enVp9Ht9MP4D7OO3+JV2WHKqX9Bo5qKddIXamqwRqKCJL1D4JugxS7ZUbLel+KbKw5nJ3nRd+DQlzY+eKPXEn6ZKeZrpVVXLB3XUpIA2R2Q==; 7:HKfwps3BYNV8tPvNGIJ0MnQXBtKNHznradSikRiGivT4SAPQl0emZ8hPwAX3uz30+0tXxEbZUOCTkXKgzumigoNMUCjVkhC+4PdzEMlDe+lFODUiAml7XjuWo/jVfC1JCoeNRudPp3Hi1d5xJnZ+gg== x-ms-office365-filtering-correlation-id: a5596b24-3c38-48ea-9f8a-08d67d54af4f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR0402MB3526; x-ms-traffictypediagnostic: AM6PR0402MB3526: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(136003)(396003)(366004)(199004)(189003)(6636002)(6506007)(36756003)(26005)(478600001)(25786009)(68736007)(386003)(52116002)(6436002)(97736004)(186003)(102836004)(76176011)(14454004)(106356001)(53936002)(2906002)(6512007)(99286004)(486006)(105586002)(6486002)(110136005)(71200400001)(2616005)(305945005)(7736002)(71190400001)(4326008)(86362001)(3846002)(316002)(6116002)(66066001)(50226002)(44832011)(446003)(8676002)(81156014)(476003)(81166006)(8936002)(5660300001)(2501003)(256004)(11346002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR0402MB3526; H:AM6PR0402MB3654.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: K+jSuqrpyVb5gkuZyvxRByhK+gkLwx5AaL+t049pD70hW/CBYaVioi51m8/nRRbEH0f7vLs1l550F66DALKzbFpnkIwL4ZgILlgwkVMlq9aeJdmTboVbBxn9L3oIlaedjA2ohWTg25wGPI4euB7RiXJmFmYIOn0Oi98jygTxFkIvNlFciQP3blW9+A1+Hlvuon+0mMspXb7jTYsqpb0pPsatYN9mws9CqikX1alue/YWxrA/ZTJ5wlK618XBQ2fCbd9T49TT2lMS8NxaEu++zXMqJmNcm9zOdnNzejVKroqiWQcYLVCK8nDecScSQdNBv9PJYAhd4Sm1Qt5invWgjYM314EmCKgRTS4oC2K+Fdw+qvOUiQ0ekcR3zNzFrSYZMwHmqiqCx6H2pk5XMCrUTeM+h2sVvLVyYp+PM4ua6vk= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5596b24-3c38-48ea-9f8a-08d67d54af4f X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 14:53:18.7553 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3526 Subject: [U-Boot] [PATCH 05/26] mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Since the fsl_esdhc will also be used by SPL, make the preprocessor switches more generic to allow any kind of build. Signed-off-by: Abel Vesa --- drivers/mmc/fsl_esdhc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 99e5882..f6d83c8 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -781,7 +781,7 @@ static int esdhc_set_voltage(struct mmc *mmc) case MMC_SIGNAL_VOLTAGE_330: if (priv->vs18_enable) return -EIO; -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED(DM_REGULATOR) if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) { ret = regulator_set_value(priv->vqmmc_dev, 3300000); if (ret) { @@ -800,7 +800,7 @@ static int esdhc_set_voltage(struct mmc *mmc) return -EAGAIN; case MMC_SIGNAL_VOLTAGE_180: -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED(DM_REGULATOR) if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) { ret = regulator_set_value(priv->vqmmc_dev, 1800000); if (ret) { @@ -1401,7 +1401,7 @@ static int fsl_esdhc_probe(struct udevice *dev) int node = dev_of_offset(dev); struct esdhc_soc_data *data = (struct esdhc_soc_data *)dev_get_driver_data(dev); -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED(DM_REGULATOR) struct udevice *vqmmc_dev; #endif fdt_addr_t addr; @@ -1459,7 +1459,7 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->vs18_enable = 0; -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED(DM_REGULATOR) /* * If emmc I/O has a fixed voltage at 1.8V, this must be provided, * otherwise, emmc will work abnormally.