Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1aa8f0cb authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2a26d31b

arch/arm/mach-omap2/omap_device.c

+1 −4
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-omap2/omap_hwmod.c

+10 −13
Original line number Diff line number Diff line
@@ -2334,13 +2334,11 @@ 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;
@@ -2351,7 +2349,6 @@ static int __init _init(struct omap_hwmod *oh, void *data) 
	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) {

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+1 −2
Original line number Diff line number Diff line
@@ -3204,7 +3204,6 @@ 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");



	if (h_sham && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "sham")) {