From patchwork Wed Jan 16 14:03:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1025916 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="WQ3glwb3"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43fpyG3LJlz9sD4 for ; Thu, 17 Jan 2019 01:10:30 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 12621C21F24; Wed, 16 Jan 2019 14:07:34 +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=KHOP_BIG_TO_CC, 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 426EDC220A5; Wed, 16 Jan 2019 14:05:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4998BC21C4A; Wed, 16 Jan 2019 14:03:30 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60076.outbound.protection.outlook.com [40.107.6.76]) by lists.denx.de (Postfix) with ESMTPS id D6948C21C29 for ; Wed, 16 Jan 2019 14:03:29 +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=WQ3glwb3ybqmdAZDret6kiZlcEOAZM8PaV7gl/j/8t+x9ibf5fWKEZrwNWpbLF0iOidnupbr5C+Sz+0taXXzEgl1Y9F7LY8qVhESkTOQvqhvkA+UaNN1khCIvOvmII+IbM+fu10zaEe0Z7+21GsGImq2CUFgFfBwghWi8a7b6+A= Received: from AM6PR0402MB3654.eurprd04.prod.outlook.com (52.133.28.145) by AM6SPR01MB0060.eurprd04.prod.outlook.com (10.255.22.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Wed, 16 Jan 2019 14:03:28 +0000 Received: from AM6PR0402MB3654.eurprd04.prod.outlook.com ([fe80::f19b:c79a:43b4:b88d]) by AM6PR0402MB3654.eurprd04.prod.outlook.com ([fe80::f19b:c79a:43b4:b88d%2]) with mapi id 15.20.1516.019; Wed, 16 Jan 2019 14:03:28 +0000 From: Abel Vesa To: Albert Aribaud , Stefano Babic , Fabio Estevam , Simon Glass , Bin Meng , Peng Fan , Max Krummenacher , Jaehoon Chung , Marek Vasut , Jagan Teki , Michal Simek , Maxime Ripard , Siva Durga Prasad Paladugu , Neil Armstrong , Chen-Yu Tsai , Eugen Hristev , Abel Vesa , Christian Gmeiner , Alex Kiernan , Igor Opaniuk , Jean-Jacques Hiblot , Jun Nie , Daniel Schwierzeck , Sven Schwermer , =?iso-8859-1?q?=C1lvaro_Fern?= =?iso-8859-1?q?=E1ndez_Rojas?= Thread-Topic: [RFC 05/17] mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds Thread-Index: AQHUraRBBB3ZkyZBIkCKgb2p4yccRg== Date: Wed, 16 Jan 2019 14:03:27 +0000 Message-ID: <1547647383-9439-6-git-send-email-abel.vesa@nxp.com> References: <1547647383-9439-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1547647383-9439-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: AM6PR0202CA0030.eurprd02.prod.outlook.com (2603:10a6:209:15::43) To AM6PR0402MB3654.eurprd04.prod.outlook.com (2603:10a6:209:19::17) x-originating-ip: [95.76.156.53] x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6SPR01MB0060; 6:N1PT8tZRvqjTTuQE0fQFeVWfibM3aFsd9p+iJgEV+hEvJIaHKb9n97ex+YXrBVLvuSyxyGMzb/BPseQibdXlt5uu1tOnKmDr5JTe2yxOAR5HkAefG19eFMV8pZBbYDbPyzpUG3O47GZttvRvjf6Od8EbDXOxblYmHpKBAK9Ao3Cr9uXLj2hNQRFDJcDsKOs5syzYTj1MZsx9QS0OWmaZ+/rVPZaadomWmH5UcfcuKCrZ8JrU+WDOIhfHq66w6FUMXoygKqfwg4n2/D7WmJKKE5Yqy003vnaxOz6hXHvxFbAr4kfq75U470K3hLcgnPYTv1u3JvrG9VqjF94UJshvOuAufu1O2ybC4bb4iZkN37NSr55pNDUub5dVWFpj88aBF3Iof5LCSWFTiJP1axloUp2usR43TqjWcFYdl+gEHfC+34BvqIKUulLJXbqoVpy2gXhrbsITR1tX26UfwKq0tw==; 5:UQ37x0kwL6fbOUld9Ofecmpn3U5qHri0EI9wRGsXO0jsiagYk4a5yo4RsXGtgzg94gsDR7/OX1ivHyeYmgx85k/RqcdpFKjgM2akXN6olZDa8EgMhAJBQ9GSkwLo4XQhkP6u4iiEi29jgz/+pCucA5EEUACb2SNxS3spwHanEID7meH4eEWoL05O+V9CKYUsfzjRKaY/bPKn633ckM0BFA==; 7:fiGaS2HeSfWFuX9igMD/FYumO7E2WluCAcUbW09SgQ9dhoEAy9hRegGXhYsBxTPoAMMAE1YBxS5SbCgmwCbAyM7Mnt0dpGF14LYhKglGPcB/F+gycbrS+8a9W2llD/7+ZV8tJjSUPed7RTCQo9XozQ== x-ms-office365-filtering-correlation-id: 75c5e1bd-1640-40d9-6fa5-08d67bbb6365 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:AM6SPR01MB0060; x-ms-traffictypediagnostic: AM6SPR01MB0060: authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ld-processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr x-microsoft-antispam-prvs: x-forefront-prvs: 091949432C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(39860400002)(136003)(376002)(396003)(366004)(199004)(189003)(36756003)(50226002)(66066001)(86362001)(386003)(4326008)(39060400002)(99286004)(53936002)(2906002)(8936002)(102836004)(97736004)(7736002)(305945005)(6506007)(81166006)(26005)(8676002)(186003)(81156014)(71190400001)(71200400001)(446003)(478600001)(2616005)(11346002)(316002)(486006)(476003)(110136005)(54906003)(14454004)(52116002)(6116002)(68736007)(76176011)(3846002)(25786009)(6512007)(105586002)(106356001)(5660300001)(44832011)(6436002)(6486002)(256004)(7416002)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6SPR01MB0060; 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: XPAQMVep0bCkscLr2k627ZAfLN7TDcuw+swCmGLanswtN6Y3Eq7E+egw0KrvZa/5ElCLiEeMQfwqjOhwSaiKXR0f6e2ID2XPQA3QLcKd/gj3wQNWfCnyETVgnWcII6TulZaBO5zq8+pgw5p5UQ7jaOsGWTsCIO/GyTZNoSpWHNo7W6Q0UXhpPuD91psk1CholM710q8QdNrVbEEyTiwxMw/5je642LIz+XyT8o3bbrsIIXymsKY3ToCJG/vTlGxli+0M4Fod6awRkp8fjA3T/zZPg7X8Nhnt36nVQQtv+kXRjqc1+HoqCUA2vTcoudOPbF3rHQBrkDsiNXvLpDrPR+syqxtQr4Nrdv33TwVMKnjF2k8yPCDs06KQ2ctx82LtqPjxfznGCFbFAKL7GpL+dlYo41iYwi3AXVeVMdZMf8E= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75c5e1bd-1640-40d9-6fa5-08d67bbb6365 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Jan 2019 14:03:26.4638 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6SPR01MB0060 X-Mailman-Approved-At: Wed, 16 Jan 2019 14:05:31 +0000 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [RFC 05/17] 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.