diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-06-24 14:08:07 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-06-24 14:27:03 +0200 |
commit | 11f9323a48875101bc4de6077155c17aed82cfc8 (patch) | |
tree | f2501c3fabdfb46ab0d9508b78c509988cef553f /arch/arm/boot | |
parent | f340a59f38b59ac77f6c2cce86f5690c1d2ecc7a (diff) |
ARM: integrator: fix OF-related regression
Commit 07e461cd7e73a84f0e3757932b93cc80976fd749
"of: Ensure unique names without sacrificing determinism"
caused a boot failure regression on the Integrator machines.
The problem is probably caused by fiddling too much with
the device tree population in the OF init function, such
as passing the SoC bus device as parent when populating
the device tree.
This patch fixes the problem by:
- Avoiding to explicitly look up the tree root
- Look up devices needed before device population from
the match only, passing NULL as root
- Passing NULL as root and parent when calling
of_platform_populate()
After this the Integrators boot again. Tested on
Integrator/AP and Integrator/CP.
Cc: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
0 files changed, 0 insertions, 0 deletions