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

Commit 60c99c77 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v4.16/soc' into omap-for-v4.16/fixes

parents 7928b2cb 392ea5dd

arch/arm/mach-omap2/omap_hwmod.c

+3 −3
Original line number Diff line number Diff line
@@ -977,6 +977,9 @@ static int _enable_clocks(struct omap_hwmod *oh) 


	pr_debug("omap_hwmod: %s: enabling clocks\n", oh->name);



	if (oh->flags & HWMOD_OPT_CLKS_NEEDED)

		_enable_optional_clocks(oh);



	if (oh->_clk)

		clk_enable(oh->_clk);
@@ -985,9 +988,6 @@ static int _enable_clocks(struct omap_hwmod *oh) 
			clk_enable(os->_clk);

	}



	if (oh->flags & HWMOD_OPT_CLKS_NEEDED)

		_enable_optional_clocks(oh);



	/* The opt clocks are controlled by the device driver. */



	return 0;