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_device.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_device.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_device.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index f989145480c8..ef9ffb8ac912 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -65,7 +65,7 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias, r = clk_get_sys(NULL, clk_name); - if (IS_ERR(r) && of_have_populated_dt()) { + if (IS_ERR(r)) { struct of_phandle_args clkspec; clkspec.np = of_find_node_by_name(NULL, clk_name); @@ -953,9 +953,6 @@ static int __init omap_device_late_init(void) { bus_for_each_dev(&platform_bus_type, NULL, NULL, omap_device_late_idle); - WARN(!of_have_populated_dt(), - "legacy booting deprecated, please update to boot with .dts\n"); - return 0; } omap_late_initcall_sync(omap_device_late_init); |