openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: OMAP2+: Remove unused legacy code for interconnects 

We are now booting all mach-omap2 in device tree only mode.
Any code that is only called in legacy boot mode where
of_have_populated_dt() is not set is safe to remove now.

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2017-05-31 15:51:37 -07:00
parent 2a26d31b1b
commit 1aa8f0cb19
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-omap2/omap_device.c
View File

@ -65,7 +65,7 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias,
r = clk_get_sys(NULL, clk_name); r = clk_get_sys(NULL, clk_name);
if (IS_ERR(r) && of_have_populated_dt()) { if (IS_ERR(r)) {
struct of_phandle_args clkspec; struct of_phandle_args clkspec;
clkspec.np = of_find_node_by_name(NULL, clk_name); 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); 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; return 0;
} }
omap_late_initcall_sync(omap_device_late_init); omap_late_initcall_sync(omap_device_late_init);

23
arch/arm/mach-omap2/omap_hwmod.c
View File

@ -2334,24 +2334,21 @@ static int __init _init(struct omap_hwmod *oh, void *data)
{ {
int r, index; int r, index;
struct device_node *np = NULL; struct device_node *np = NULL;
struct device_node *bus;
if (oh->_state != _HWMOD_STATE_REGISTERED) if (oh->_state != _HWMOD_STATE_REGISTERED)
return 0; return 0;
if (of_have_populated_dt()) { bus = of_find_node_by_name(NULL, "ocp");
struct device_node *bus; if (!bus)
return -ENODEV;
bus = of_find_node_by_name(NULL, "ocp"); r = of_dev_hwmod_lookup(bus, oh, &index, &np);
if (!bus) if (r)
return -ENODEV; pr_debug("omap_hwmod: %s missing dt data\n", oh->name);
else if (np && index)
r = of_dev_hwmod_lookup(bus, oh, &index, &np); pr_warn("omap_hwmod: %s using broken dt data from %s\n",
if (r) oh->name, np->name);
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); r = _init_mpu_rt_base(oh, NULL, index, np);
if (r < 0) { if (r < 0) {

3
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
View File

@ -3204,8 +3204,7 @@ int __init omap3xxx_hwmod_init(void)
* If DT information is missing, enable them only for GP devices. * 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")) { if (h_sham && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "sham")) {
r = omap_hwmod_register_links(h_sham); r = omap_hwmod_register_links(h_sham);