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

Commit c4a1ea2c authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Paul Walmsley
Browse files

ARM: OMAP: hwmod: Cleanup !CONFIG_COMMON_CLK parts 



Clean all #ifdef's added as part of fixing the clkdm
accesses from hwmod.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarMike Turquette <mturquette@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent f7f73aab

arch/arm/mach-omap2/omap_hwmod.c

+2 −16
Original line number Diff line number Diff line
@@ -130,11 +130,7 @@ 
#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/io.h>

#ifdef CONFIG_COMMON_CLK

#include <linux/clk-provider.h>

#else

#include <linux/clk.h>

#endif

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/list.h>
@@ -620,17 +616,13 @@ static int _disable_wakeup(struct omap_hwmod *oh, u32 *v) 


static struct clockdomain *_get_clkdm(struct omap_hwmod *oh)

{

	struct clk_hw_omap *clk;



	if (oh->clkdm) {

		return oh->clkdm;

	} else if (oh->_clk) {

#ifdef CONFIG_COMMON_CLK

		struct clk_hw_omap *clk;



		clk = to_clk_hw_omap(__clk_get_hw(oh->_clk));

		return  clk->clkdm;

#else

		return oh->_clk->clkdm;

#endif

	}

	return NULL;

}
@@ -3588,9 +3580,7 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh) 
	struct clk *c;

	struct omap_hwmod_ocp_if *oi;

	struct clockdomain *clkdm;

#ifdef CONFIG_COMMON_CLK

	struct clk_hw_omap *clk;

#endif



	if (!oh)

		return NULL;
@@ -3607,12 +3597,8 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh) 
		c = oi->_clk;

	}



#ifdef CONFIG_COMMON_CLK

	clk = to_clk_hw_omap(__clk_get_hw(c));

	clkdm = clk->clkdm;

#else

	clkdm = c->clkdm;

#endif

	if (!clkdm)

		return NULL;