All of lore.kernel.org
 help / color / mirror / Atom feed
From: Abel Vesa <abel.vesa@nxp.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 05/22] mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds
Date: Wed, 30 Jan 2019 13:39:55 +0000	[thread overview]
Message-ID: <1548855578-12529-6-git-send-email-abel.vesa@nxp.com> (raw)
In-Reply-To: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com>

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 <abel.vesa@nxp.com>
---
 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 b8171ba..47f2a8f 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.
-- 
2.7.4

  parent reply	other threads:[~2019-01-30 13:39 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-30 13:39 [U-Boot] [PATCH v3 00/22] mx6sabre: Add DM and SPL FIT support Abel Vesa
2019-01-30 13:39 ` [U-Boot] [PATCH v3 01/22] usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE Abel Vesa
2019-01-30 13:39 ` [U-Boot] [PATCH v3 02/22] usb: ehci-mx6: Make regulator DM_REGULATOR dependent Abel Vesa
2019-01-30 13:39 ` [U-Boot] [PATCH v3 03/22] configs: imx6sabreauto: Add DM_MMC support Abel Vesa
2019-01-30 13:39 ` [U-Boot] [PATCH v3 04/22] configs: imx6sabreauto: Add DM_USB support Abel Vesa
2019-01-30 13:39 ` Abel Vesa [this message]
2019-01-30 13:39 ` [U-Boot] [PATCH v3 06/22] board: mx6sabresd: Add board_fit_config_name_match to support FIT in SPL Abel Vesa
2019-01-30 13:39 ` [U-Boot] [PATCH v3 07/22] board: mx6sabreauto: " Abel Vesa
2019-01-30 13:39 ` [U-Boot] [PATCH v3 08/22] arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files Abel Vesa
2019-01-30 13:39 ` [U-Boot] [PATCH v3 09/22] arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 10/22] arm: imx: Add FIT SPL its Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 11/22] configs: mx6sabreauto: Add SPL FIT and DM support Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 12/22] configs: mx6sabresd: " Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 13/22] mx6sabreauto: Add DM_GPIO support Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 14/22] mx6sabresd: " Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 15/22] configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 16/22] configs: mx6sabresd: " Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 17/22] board: mx6sabreauto: Remove the non-DM code Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 18/22] board: mx6sabresd: Remove " Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 19/22] board: mx6sabresd: Remove the enet reset gpio handling Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 20/22] configs: mx6sabresd: Reduce size for SPL by disabling SPL_DOS and SPL_EFI Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 21/22] board: mx6sabreauto: Update README with the SPL DM FIT info Abel Vesa
2019-01-30 13:40 ` [U-Boot] [PATCH v3 22/22] board: mx6sabresd: " Abel Vesa
2019-01-30 18:58 ` [U-Boot] [PATCH v3 00/22] mx6sabre: Add DM and SPL FIT support Tom Rini
2019-01-31 12:59   ` Abel Vesa
2019-01-31 14:41     ` Tom Rini
2019-01-31 15:13       ` Abel Vesa
2019-01-31 15:45         ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1548855578-12529-6-git-send-email-abel.vesa@nxp.com \
    --to=abel.vesa@nxp.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.