diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-03 10:15:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-03 10:15:19 -0700 |
| commit | ccc20a3317c4985febbcb7e3d9e73ab639f45c0a (patch) | |
| tree | c603d002596fe04b7a378c89ad549ae29d47588c | |
| parent | b010a0f77a9b3b05d6268d863695694c3d377847 (diff) | |
| parent | 41d9489319f28f06cf51731131bc353d5a6bce59 (diff) | |
| download | ibft-ccc20a3317c4985febbcb7e3d9e73ab639f45c0a.tar.gz | |
Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux
Pull devicetree fix from Grant Likely:
"Simple bugfix for bad device tree data on the PA-Semi platform"
* tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
drivers/of: Add empty ranges quirk for PA-Semi
| -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 ad2906919d458..78a7dcbec7d89 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -450,12 +450,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") || @@ -490,7 +495,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_debug("OF: no ranges; cannot translate\n"); return 1; } |