diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-06-12 00:07:44 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-06-12 00:07:44 -0700 |
| commit | 018b732458ac39c4858d9840c0e32310bc0930dd (patch) | |
| tree | 84f178b1fe40e67eeb8dc523686f73a02dc5cb00 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | c76e4d2e50068ddd82fe18f86d05a33733877059 (diff) | |
| parent | 0e78b1218df37f1a1834dff853d967444e332bab (diff) | |
Merge branch 'omap-for-v4.13/legacy-v2' into omap-for-v4.13/soc-v3
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 8bcea0d83fa0..0f7afdaf80d3 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2334,24 +2334,21 @@ static int __init _init(struct omap_hwmod *oh, void *data) { int r, index; struct device_node *np = NULL; + struct device_node *bus; if (oh->_state != _HWMOD_STATE_REGISTERED) return 0; - if (of_have_populated_dt()) { - struct device_node *bus; - - bus = of_find_node_by_name(NULL, "ocp"); - if (!bus) - return -ENODEV; + bus = of_find_node_by_name(NULL, "ocp"); + if (!bus) + return -ENODEV; - r = of_dev_hwmod_lookup(bus, oh, &index, &np); - if (r) - pr_debug("omap_hwmod: %s missing dt data\n", oh->name); - else if (np && index) - pr_warn("omap_hwmod: %s using broken dt data from %s\n", - oh->name, np->name); - } + r = of_dev_hwmod_lookup(bus, oh, &index, &np); + if (r) + pr_debug("omap_hwmod: %s missing dt data\n", oh->name); + else if (np && index) + pr_warn("omap_hwmod: %s using broken dt data from %s\n", + oh->name, np->name); r = _init_mpu_rt_base(oh, NULL, index, np); if (r < 0) { |