hwprobe: convert vas_init(), nx_init()

Reviewed-by: Dan Horák <dan@danny.cz>
[npiggin: remove imc_init because it moved later in boot (fbcbd4e47c)]
Signed-off-by: Stewart Smith <stewart@flamingspork.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>

3 files changed, 4 insertions, 6 deletions

diff --git a/core/init.c b/core/init.c
index c3e0c49..6a1c3f0 100644
--- a/core/init.c
+++ b/core/init.c
@@ -1355,12 +1355,6 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt)
 	/* Catalog decompression routine */
 	imc_decompress_catalog();
 
-	/* Virtual Accelerator Switchboard */
-	vas_init();
-
-	/* NX init */
-	nx_init();
-
 	/* Probe all HWPROBE hardware we have code linked for */
 	probe_hardware();
 
diff --git a/hw/nx.c b/hw/nx.c
index fdadf53..b1cab57 100644
--- a/hw/nx.c
+++ b/hw/nx.c
@@ -136,3 +136,5 @@ void nx_init(void)
 	if (proc_gen >= proc_gen_p9)
 		darn_init();
 }
+
+DEFINE_HWPROBE_DEPS(nx, nx_init, "vas");
diff --git a/hw/vas.c b/hw/vas.c
index 0dbe0bc..96ca055 100644
--- a/hw/vas.c
+++ b/hw/vas.c
@@ -637,3 +637,5 @@ out:
 	vas_err("Disabled (failed initialization)\n");
 	return;
 }
+
+DEFINE_HWPROBE(vas, vas_init);