diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2015-03-23 14:16:38 +1100 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-05-06 10:36:23 +0100 |
| commit | 2e3e9f18a9b6ab13c295008af868b3d1044bc533 (patch) | |
| tree | ac1de2fc62e4432f3b710162ff84b9b04ac115b7 /drivers/of | |
| parent | 4216710d205676839ae425c45041232ed83b984d (diff) | |
| download | linux-stable-2e3e9f18a9b6ab13c295008af868b3d1044bc533.tar.gz linux-stable-2e3e9f18a9b6ab13c295008af868b3d1044bc533.tar.bz2 linux-stable-2e3e9f18a9b6ab13c295008af868b3d1044bc533.zip | |
drivers/of: Add empty ranges quirk for PA-Semi
commit a5ed1ad07b3a75894311e12fdd401bf64d0667fe upstream.
The "sdc" node is missing the ranges property, it needs to be treated
as having an empty one otherwise translation fails for its children.
Fixes 746c9e9f92dd, "of/base: Fix PowerPC address parsing hack"
Tested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/address.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 22ce1572af38..bab28871b992 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -403,12 +403,17 @@ static struct of_bus *of_match_bus(struct device_node *np) return NULL; } -static int of_empty_ranges_quirk(void) +static int of_empty_ranges_quirk(struct device_node *np) { if (IS_ENABLED(CONFIG_PPC)) { - /* To save cycles, we cache the result */ + /* To save cycles, we cache the result for global "Mac" setting */ static int quirk_state = -1; + /* PA-SEMI sdc DT bug */ + if (of_device_is_compatible(np, "1682m-sdc")) + return true; + + /* Make quirk cached */ if (quirk_state < 0) quirk_state = of_machine_is_compatible("Power Macintosh") || @@ -443,7 +448,7 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus, * This code is only enabled on powerpc. --gcl */ ranges = of_get_property(parent, rprop, &rlen); - if (ranges == NULL && !of_empty_ranges_quirk()) { + if (ranges == NULL && !of_empty_ranges_quirk(parent)) { pr_err("OF: no ranges; cannot translate\n"); return 1; } |