From patchwork Thu Jun 11 19:45:02 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Pratyush Yadav <p.yadav@ti.com>
X-Patchwork-Id: 242148
List-Id: U-Boot discussion <u-boot.lists.denx.de>
From: p.yadav at ti.com (Pratyush Yadav)
Date: Fri, 12 Jun 2020 01:15:02 +0530
Subject: [PATCH v3 2/6] dm: board: complete the initialization of the muxes
 in initr_dm()
In-Reply-To: <20200611194506.7263-1-p.yadav@ti.com>
References: <20200611194506.7263-1-p.yadav@ti.com>
Message-ID: <20200611194506.7263-3-p.yadav@ti.com>

From: Jean-Jacques Hiblot <jjhiblot at ti.com>

This will probe the multiplexer devices that have a "u-boot,mux-autoprobe"
property. As a consequence they will be put in their idle state.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot at ti.com>
Signed-off-by: Pratyush Yadav <p.yadav at ti.com>
Reviewed-by: Simon Glass <sjg at chromium.org>
---
 common/board_r.c         | 12 ++++++++++++
 drivers/mux/mux-uclass.c | 23 +++++++++++++++++++++++
 include/mux.h            | 12 ++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/common/board_r.c b/common/board_r.c
index fa57fa9b69..aa1f98e851 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -46,6 +46,7 @@
 #include <miiphy.h>
 #endif
 #include <mmc.h>
+#include <mux.h>
 #include <nand.h>
 #include <of_live.h>
 #include <onenand_uboot.h>
@@ -334,6 +335,17 @@ static int initr_dm_devices(void)
 			return ret;
 	}
 
+	if (IS_ENABLED(CONFIG_MULTIPLEXER)) {
+		/*
+		 * Initialize the multiplexer controls to their default state.
+		 * This must be done early as other drivers may unknowingly
+		 * rely on it.
+		 */
+		ret = dm_mux_init();
+		if (ret)
+			return ret;
+	}
+
 	return 0;
 }
 
diff --git a/drivers/mux/mux-uclass.c b/drivers/mux/mux-uclass.c
index 3c89e0a389..3dad466101 100644
--- a/drivers/mux/mux-uclass.c
+++ b/drivers/mux/mux-uclass.c
@@ -303,6 +303,29 @@ static int mux_uclass_post_probe(struct udevice *dev)
 	return 0;
 }
 
+int dm_mux_init(void)
+{
+	struct uclass *uc;
+	struct udevice *dev;
+	int ret;
+
+	ret = uclass_get(UCLASS_MUX, &uc);
+	if (ret < 0) {
+		log_debug("unable to get MUX uclass\n");
+		return ret;
+	}
+	uclass_foreach_dev(dev, uc) {
+		if (dev_read_bool(dev, "u-boot,mux-autoprobe")) {
+			ret = device_probe(dev);
+			if (ret)
+				log_debug("unable to probe device %s\n",
+					  dev->name);
+		}
+	}
+
+	return 0;
+}
+
 UCLASS_DRIVER(mux) = {
 	.id		= UCLASS_MUX,
 	.name		= "mux",
diff --git a/include/mux.h b/include/mux.h
index 85eb7d42fc..23844f480a 100644
--- a/include/mux.h
+++ b/include/mux.h
@@ -109,6 +109,13 @@ void mux_control_put(struct mux_control *mux);
  */
 struct mux_control *devm_mux_control_get(struct udevice *dev,
 					 const char *mux_name);
+/**
+ * dm_mux_init() - Initialize the multiplexer controls to their default state.
+ *
+ * Return: 0 if OK, -errno otherwise.
+ */
+int dm_mux_init(void);
+
 #else
 unsigned int mux_control_states(struct mux_control *mux)
 {
@@ -142,6 +149,11 @@ struct mux_control *devm_mux_control_get(struct udevice *dev,
 {
 	return NULL;
 }
+
+int dm_mux_init(void)
+{
+	return -ENOSYS;
+}
 #endif
 
 #endif