public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marcel Ziswiler <marcel@ziswiler.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v1 05/10] dm: core: gracefully handle alias seq without of
Date: Mon, 20 May 2019 02:44:57 +0200	[thread overview]
Message-ID: <20190520004502.8924-6-marcel@ziswiler.com> (raw)
In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com>

Gracefully handle alias seq in the platform data rather than OF case.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>

---

 drivers/core/read.c | 4 +++-
 include/dm/read.h   | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/core/read.c b/drivers/core/read.c
index 6bda077a34..670ffe5dc5 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -212,15 +212,17 @@ int dev_read_alias_seq(struct udevice *dev, int *devnump)
 {
 	ofnode node = dev_ofnode(dev);
 	const char *uc_name = dev->uclass->uc_drv->name;
-	int ret;
+	int ret = -ENOTSUPP;
 
 	if (ofnode_is_np(node)) {
 		ret = of_alias_get_id(ofnode_to_np(node), uc_name);
 		if (ret >= 0)
 			*devnump = ret;
 	} else {
+#if CONFIG_IS_ENABLED(OF_CONTROL)
 		ret = fdtdec_get_alias_seq(gd->fdt_blob, uc_name,
 					   ofnode_to_offset(node), devnump);
+#endif
 	}
 
 	return ret;
diff --git a/include/dm/read.h b/include/dm/read.h
index 60b727cbd8..a8ffbe42ac 100644
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -702,8 +702,12 @@ static inline const void *dev_read_prop(struct udevice *dev,
 
 static inline int dev_read_alias_seq(struct udevice *dev, int *devnump)
 {
+#if CONFIG_IS_ENABLED(OF_CONTROL)
 	return fdtdec_get_alias_seq(gd->fdt_blob, dev->uclass->uc_drv->name,
 				    dev_of_offset(dev), devnump);
+#else
+	return -ENOTSUPP;
+#endif
 }
 
 static inline int dev_read_u32_array(struct udevice *dev, const char *propname,
-- 
2.21.0

  parent reply	other threads:[~2019-05-20  0:44 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-20  0:44 [U-Boot] [PATCH v1 00/10] arm: pxa: mmc: add driver model support Marcel Ziswiler
2019-05-20  0:44 ` [U-Boot] [PATCH v1 01/10] mmc: add missing space before comment delimiter Marcel Ziswiler
2019-05-20  7:06   ` Peng Fan
2019-05-20 13:55   ` Igor Opaniuk
2020-06-30 15:21   ` Tom Rini
2019-05-20  0:44 ` [U-Boot] [PATCH v1 02/10] mmc: fsl_esdhc: annotate endifs Marcel Ziswiler
2019-05-20  2:17   ` Fabio Estevam
2019-05-20  7:07   ` Peng Fan
2019-05-20 13:51   ` Igor Opaniuk
2019-05-20  0:44 ` [U-Boot] [PATCH v1 03/10] serial: pxa: clean-up platform data include file Marcel Ziswiler
2019-05-20  0:59   ` Marek Vasut
2020-06-30 15:21   ` Tom Rini
2019-05-20  0:44 ` [U-Boot] [PATCH v1 04/10] Makefile: allow dm_mmc without of_control Marcel Ziswiler
2019-05-20 16:09   ` Simon Glass
2020-06-30 15:21   ` Tom Rini
2019-05-20  0:44 ` Marcel Ziswiler [this message]
2019-05-20 16:09   ` [U-Boot] [PATCH v1 05/10] dm: core: gracefully handle alias seq without of Simon Glass
2020-06-30 15:21   ` Tom Rini
2019-05-20  0:44 ` [U-Boot] [PATCH v1 06/10] kconfig: mmc: move pxa_mmc_generic to kconfig Marcel Ziswiler
2019-05-20 16:09   ` Simon Glass
2020-06-30 15:21   ` Tom Rini
2019-05-20  0:44 ` [U-Boot] [PATCH v1 07/10] arm: pxa: mmc: add driver model support Marcel Ziswiler
2019-05-20  1:04   ` Marek Vasut
2020-06-30 15:21   ` Tom Rini
2019-05-20  0:45 ` [U-Boot] [PATCH v1 08/10] colibri_pxa270_defconfig: enable cmd_dm Marcel Ziswiler
2019-05-20  1:05   ` Marek Vasut
2020-06-30 15:21   ` Tom Rini
2019-05-20  0:45 ` [U-Boot] [PATCH v1 09/10] colibri_pxa270: add mmc platform data Marcel Ziswiler
2019-05-20  1:06   ` Marek Vasut
2020-06-30 15:21   ` Tom Rini
2019-05-20  0:45 ` [U-Boot] [PATCH v1 10/10] colibri_pxa270_defconfig: enable dm_mmc Marcel Ziswiler
2019-05-20 13:57   ` Igor Opaniuk
2020-06-30 15:22   ` 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=20190520004502.8924-6-marcel@ziswiler.com \
    --to=marcel@ziswiler.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox