]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: integrator: fix OF-related regression
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 24 Jun 2014 12:08:07 +0000 (14:08 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 24 Jun 2014 12:27:03 +0000 (14:27 +0200)
commit49c260313313764be9fbac5e70ba3a1dad22925a
treef2501c3fabdfb46ab0d9508b78c509988cef553f
parent9fbc57023f5a26645f37cbff0ade2c5b4bf3e349
ARM: integrator: fix OF-related regression

Commit d8a3c81870002a53bdbace5a769367191992cc7a
"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>
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c