From patchwork Fri Feb 1 16:40:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1034956 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="MXUSdTcX"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43rjZr1xGSz9sDX for ; Sat, 2 Feb 2019 03:43:00 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 05672C21E2B; Fri, 1 Feb 2019 16:42:18 +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=RCVD_IN_DNSWL_BLOCKED, 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 CC951C21DE8; Fri, 1 Feb 2019 16:41:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 45799C21DF3; Fri, 1 Feb 2019 16:40:14 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20048.outbound.protection.outlook.com [40.107.2.48]) by lists.denx.de (Postfix) with ESMTPS id 2CE97C21DD7 for ; Fri, 1 Feb 2019 16:40:14 +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=H8wzUkTFhEL7r+KLgZlzXdxXdo4eSQ3a9RyNKwU38nA=; b=MXUSdTcXOXd+fB0eyCTGh3hzXLbQynQQMeZCd215ULUmqXQq9z3FdSzy2kR0Mo7p12pfRcgOdfJp2XRfDjE9iQfmHBNQY2Q0mUkkd63ito+dqKubddbDK21V1x3dyz9+K9bnk5wMOVJsaFCAsWoO/Pmlk2HLv3B/m3TeKGBoN5o= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2957.eurprd04.prod.outlook.com (10.170.228.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Fri, 1 Feb 2019 16:40:13 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1580.019; Fri, 1 Feb 2019 16:40:13 +0000 From: Abel Vesa To: Tom Rini , Lukasz Majewski , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v4 06/20] mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds Thread-Index: AQHUukzMGTI225uCT0GxYM/FAhATMA== Date: Fri, 1 Feb 2019 16:40:11 +0000 Message-ID: <1549039198-16674-7-git-send-email-abel.vesa@nxp.com> References: <1549039198-16674-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1549039198-16674-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: AM6PR0502CA0011.eurprd05.prod.outlook.com (2603:10a6:209:1::24) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) 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; VI1PR04MB2957; 6:YD6oilHNvdBb5G2LgWuuRH5mqknVATfJvDI6YCyEEFY2ZFJDotGABO3I0ESc40/VNGOHklo7gFqC2tp/11CRBIXdkcTT/u8QSoXzpTV/94TBGXJn7IDJpPqEiyn7pcP/3Ge+qbejF2AGhEE4QICuZqaXIMwzNnYdi8C0p1pje5wiqA3e+hKeGh4I3b1tu0gnlyGHJ7c1v3ACUI1RbPMblWeeYGkIpBcPFoSzmwW/5ZRtcawW6UNVASTwVi5dTeveALmjCCwYXl8YJeQmx7GNidu6PzaMHF4v8g/WcYl7ZHQU+8wKED5f71+14xW/AbDWUtJFWRNSTqpvj1Og7gCgS6pkML9OyWh6Fh9TH9uCzRVMPY/1XKubAxvI/v6WhDVj91doMqi1p8pp1NcXIt/nhdtxxJ8+X8+Eup9EkpRVV7nBcix9dwyrmmCBCgpi5FCea0YRLwnADSbxCRFUXn1Flg==; 5:K+tWsQIrfl7MTrgTfUBnVVKf5oI7qbi0PEI7xdoy+2P1jfq/YdT9+07Ne4a+6yk8lc0lUZ7Fil2irWaLqJP/HkyxeapEnJhLoYjYWJEeSzitDQOrb6LXwDvl+zGj1KS7G1vASJ0JIW1xzgG/nSz4pQW3KQeQnF/vJMhttDOv/VdRsdJLuoRikDPx/z1cNL01C4kCBICgI6zsCN/wuLt09A==; 7:qv1SHIGaFSM1xJoSDyZMV9ruTF39Cg7S5Cm/cZeYwI6BI1P2P+vNcn9hnLV9oJU8VjEORWgmfxedN/5DLnha9JX9X2opvSg/eeX2Ld1BP8a6QH5CWLNuNWJieJd8kcADyF+l0YBIkrD37pZWg0HoJA== x-ms-office365-filtering-correlation-id: 9d88f475-a041-4e5c-ff6f-08d68863ef3a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2957; x-ms-traffictypediagnostic: VI1PR04MB2957: x-microsoft-antispam-prvs: x-forefront-prvs: 09352FD734 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(39860400002)(396003)(136003)(376002)(366004)(189003)(199004)(102836004)(446003)(66066001)(68736007)(7736002)(6512007)(36756003)(52116002)(386003)(486006)(476003)(2616005)(26005)(86362001)(4326008)(76176011)(6506007)(11346002)(105586002)(305945005)(478600001)(186003)(106356001)(53936002)(25786009)(6636002)(54906003)(316002)(99286004)(14454004)(110136005)(44832011)(2501003)(8936002)(6486002)(3846002)(2906002)(6116002)(6436002)(50226002)(256004)(8676002)(81156014)(71200400001)(71190400001)(97736004)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2957; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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: zNwuI7EyESZv0AqNTFiuN8Em/dAdBCxqQhHZmlFG5Ew1as6FhTkAXJtKNwmuw89sQRErPtqC5FHJ3/BOBo7x2dMmfzD9+1mQvNBnKl0tVn0ayHhjg1kFhPBv76Ri0ThbLg8bd+jHnYMUIIJQUdYe+iC8jo4o/Ul1dGBEPcdLA1ranTwlzHSYIPkqWgHFG4dyDTHkPPm9fA4wY+CcD6qTq24nxiQHi+LL4FLt92Jm6iTAk0kvMQrwpm0rK/sqSHVEAKxxbZOHJg9cOl0whIXm6s6rPtOrmAPDSQJpw4cooGmQFzlLnoPdbNTvLZ5r1vQA4VXa3pZ2j5/osGJjJ5DCcboMrZJfH0mPw4rzJEK2MYr3I2BpY5UrUcRU8/dKol2aFcygmst64hswlWV4jOr+u8V8LX3okEyG/e+vnzsqXcM= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d88f475-a041-4e5c-ff6f-08d68863ef3a X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Feb 2019 16:40:11.0320 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2957 Subject: [U-Boot] [PATCH v4 06/20] 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 Reviewed-by: Fabio Estevam Reviewed-by: Lukasz Majewski --- 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 21fa2ab..9e34557 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -804,7 +804,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) { @@ -823,7 +823,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) { @@ -1442,7 +1442,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; @@ -1500,7 +1500,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.