diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-02-22 14:04:25 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-02-28 16:32:09 -0800 |
| commit | 15618256224769621b2c2300f66ad9513135ffaa (patch) | |
| tree | 2e4b944e88dca204da7d6f2cc34ad81b1099b6dd /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | a88443068572aaa79048bc19c741e0edae17faa7 (diff) | |
| download | linux-stable-15618256224769621b2c2300f66ad9513135ffaa.tar.gz linux-stable-15618256224769621b2c2300f66ad9513135ffaa.tar.bz2 linux-stable-15618256224769621b2c2300f66ad9513135ffaa.zip | |
ARM: OMAP2+: Try to parse earlycon from parent too
With ti-sysc driver the "ti,hwmods" property will be moved to the
interconnect target module instead of the child device. To keep
earlycon working, we need to match against the interconnect target
module in the ti-sysc case.
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index fca22f7ac0e3..2d554a48eb61 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -3492,6 +3492,12 @@ static void __init omap_hwmod_setup_earlycon_flags(void) if (np) { uart = of_get_property(np, "ti,hwmods", NULL); oh = omap_hwmod_lookup(uart); + if (!oh) { + uart = of_get_property(np->parent, + "ti,hwmods", + NULL); + oh = omap_hwmod_lookup(uart); + } if (oh) oh->flags |= DEBUG_OMAPUART_FLAGS; } |