diff options
author | Paul Burton <paul.burton@imgtec.com> | 2016-09-19 22:21:24 +0100 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2016-10-06 17:31:00 +0200 |
commit | ecd76eded07d1ba58bba410ec4bcbd8630fb9b16 (patch) | |
tree | 90f3668fe9840cb62fb177808ebb1dfe1f9254c4 /drivers | |
parent | 38ec82fe21cd99ad4d7f0dc883ef7ce9e9837176 (diff) | |
download | linux-stable-ecd76eded07d1ba58bba410ec4bcbd8630fb9b16.tar.gz linux-stable-ecd76eded07d1ba58bba410ec4bcbd8630fb9b16.tar.bz2 linux-stable-ecd76eded07d1ba58bba410ec4bcbd8630fb9b16.zip |
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')
-rw-r--r-- | drivers/of/platform.c | 1 |
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 */ |