From caec05b6688284bd9745804d54aab5ef62b7ac78 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 27 Aug 2019 21:39:43 +0200 Subject: [PATCH] Revert "of/platform: Disable generic device linking code for PowerPC" This reverts commit 9c1c5e0bc5ec032e78bf15c302f3b20152f865ad. Based on a lot of email and in-person discussions, this patch series is being reworked to address a number of issues that were pointed out that needed to be taken care of before it should be merged. It will be resubmitted with those changes hopefully soon. Cc: Frank Rowand Cc: Saravana Kannan Signed-off-by: Greg Kroah-Hartman --- drivers/of/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index e5f7e40df439..a3cd69772264 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -506,7 +506,6 @@ int of_platform_default_populate(struct device_node *root, } EXPORT_SYMBOL_GPL(of_platform_default_populate); -#ifndef CONFIG_PPC static bool of_link_is_valid(struct device_node *con, struct device_node *sup) { of_node_get(sup); @@ -684,6 +683,7 @@ static int of_link_to_suppliers(struct device *dev) return __of_link_to_suppliers(dev, dev->of_node); } +#ifndef CONFIG_PPC static const struct of_device_id reserved_mem_matches[] = { { .compatible = "qcom,rmtfs-mem" }, { .compatible = "qcom,cmd-db" }, -- 2.45.2