diff options
| author | Tony Lindgren <tony@atomide.com> | 2020-11-16 11:57:13 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2020-11-16 11:57:18 +0100 |
| commit | 9261c5b2f51996e7d4e10089f73ea472ae9e996f (patch) | |
| tree | 7d71d60360aa32048a8c236ba8815fd8611fc0a3 /arch/arm/mach-omap2 | |
| parent | bus: ti-sysc: Assert reset only after disabling clocks (diff) | |
| download | linux-9261c5b2f51996e7d4e10089f73ea472ae9e996f.tar.xz linux-9261c5b2f51996e7d4e10089f73ea472ae9e996f.zip | |
ARM: OMAP2+: Check for inited flag
If we have no hwmods configured and omap_hwmod_init() is not called,
we don't want to call omap_hwmod_setup_all() as it will fail with
checks for configured MPU at least.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -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 15b29a179c8a..2310cd56e99b 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -627,6 +627,9 @@ static struct clockdomain *_get_clkdm(struct omap_hwmod *oh) { struct clk_hw_omap *clk; + if (!oh) + return NULL; + if (oh->clkdm) { return oh->clkdm; } else if (oh->_clk) { @@ -3677,6 +3680,9 @@ static void __init omap_hwmod_setup_earlycon_flags(void) */ static int __init omap_hwmod_setup_all(void) { + if (!inited) + return 0; + _ensure_mpu_hwmod_is_setup(NULL); omap_hwmod_for_each(_init, NULL); |