diff options
| author | Tony Lindgren <[email protected]> | 2017-06-12 00:07:44 -0700 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2017-06-12 00:07:44 -0700 |
| commit | 018b732458ac39c4858d9840c0e32310bc0930dd (patch) | |
| tree | 84f178b1fe40e67eeb8dc523686f73a02dc5cb00 /arch/arm/mach-omap2/omap_hwmod_3xxx_data.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_3xxx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 1c6ca4d5fa2d..c3276436b0ae 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -3204,8 +3204,7 @@ int __init omap3xxx_hwmod_init(void) * If DT information is missing, enable them only for GP devices. */ - if (of_have_populated_dt()) - bus = of_find_node_by_name(NULL, "ocp"); + bus = of_find_node_by_name(NULL, "ocp"); if (h_sham && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "sham")) { r = omap_hwmod_register_links(h_sham); |