summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2016-09-20 00:21:24 +0300
committerRalf Baechle <ralf@linux-mips.org>2016-10-06 18:31:00 +0300
commitecd76eded07d1ba58bba410ec4bcbd8630fb9b16 (patch)
tree90f3668fe9840cb62fb177808ebb1dfe1f9254c4 /drivers/of
parent38ec82fe21cd99ad4d7f0dc883ef7ce9e9837176 (diff)
downloadlinux-ecd76eded07d1ba58bba410ec4bcbd8630fb9b16.tar.xz
of/platform: Probe "isa" busses by default
Since commit 44a7185c2ae6 ("of/platform: Add common method to populate default bus") platforms calling of_platform_bus_probe from an initcall is either a rather unsafe race with of_platform_default_populate_init or a no-op. The MIPS Malta board needs to probe devices under an ISA bus, which we do support in the of_busses array but until now haven't included in of_default_bus_match_table. Add an "isa" entry to of_default_bus_match_table such that we can just accept use of of_platform_default_populate_init & remove the Malta-specific match table in a later patch. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Acked-by: Rob Herring <robh@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: linux-mips@linux-mips.org Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/14275/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/platform.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index f39ccd5aa701..d85e4318b099 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -29,6 +29,7 @@
const struct of_device_id of_default_bus_match_table[] = {
{ .compatible = "simple-bus", },
{ .compatible = "simple-mfd", },
+ { .compatible = "isa", },
#ifdef CONFIG_ARM_AMBA
{ .compatible = "arm,amba-bus", },
#endif /* CONFIG_ARM_AMBA */