• Linus Walleij's avatar
    ARM: integrator: fix OF-related regression · 11f9323a
    Linus Walleij authored
    Commit 07e461cd
    "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: default avatarLinus Walleij <linus.walleij@linaro.org>
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    11f9323a
integrator_cp.c 8.36 KB