ARM: OMAP4: PM: Remove the checks preventing OMAP4 clockdomain validation
PATCH 1/1 ARM: OMAP4: PM: Remove the checks preventing OMAP4 clockdomain validation
The clockdomain related code beng in place it is now not necessary to have some of the clock code commented out. This would help the validation of the clockdomain functions using the clock level interfaces.
--- arch/arm/mach-omap2/clock.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
arch/arm/mach-omap2/clock.c +0 -8
@@ -181,7 +181,6 @@ static int _dpll_test_fint(struct clk *clk, u8 n)* clockdomain pointer, and save it into the struct clk. Intended to be * called during clk_register(). No return value. */ -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ void omap2_init_clk_clkdm (struct clk *clk) {struct clockdomain *clkdm;
@@ -199,7 +198,6 @@ void omap2_init_clk_clkdm(struct clk *clk) "clkdm %s\n", clk->name, clk->clkdm_name); } } -#endif /** * omap2_init_clksel_parent - set a clksel clk's parent field from the hardware
@@ -476,10 +474,8 @@ void omap2_clk_disable(struct clk *clk)_omap2_clk_disable (clk);if (clk->parent)omap2_clk_disable (clk->parent); -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ if (clk->clkdm)omap2_clkdm_clk_disable (clk->clkdm, clk); -#endif } }
@@ -489,10 +485,8 @@ int omap2_clk_enable(struct clk *clk)int ret =0 ;if (clk->usecount++ ==0 ) { -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ if (clk->clkdm)omap2_clkdm_clk_enable (clk->clkdm, clk); -#endif if (clk->parent) { ret =omap2_clk_enable (clk->parent);
@@ -511,10 +505,8 @@ int omap2_clk_enable(struct clk *clk)return ret; err: -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ if (clk->clkdm)omap2_clkdm_clk_disable (clk->clkdm, clk); -#endif clk->usecount--;return ret; }
Signature · 1 line
1.5.4.7
Paul Walmsley
maintainerPATCH 1/1 ARM: OMAP4: PM: Remove the checks preventing OMAP4 clockdomain validation
Hello Abhijit,
Quoted 8 lines · Abhijit Pagare
The clockdomain related code beng in place it is now not necessary to have some of the clock code commented out. This would help the validation of the clockdomain functions using the clock level interfaces.
Signed-off-by Abhijit Pagare <[email protected]>Cc Paul Walmsley <[email protected]>Cc Benoit Cousson <[email protected]>Cc Rajendra Nayak <[email protected]>
Could you also deal with the TODO in mach-omap2/clock44xx_data.c ?
Also, has this patch been tested? If so, please list the platform it was tested on in the commit message.
thanks,
- Paul
PATCH 1/1 ARM: OMAP4: PM: Remove the checks preventing OMAP4 clockdomain validation
Paul,
While testing after the below change I found out that some sleep/wakeup dependency related checks have to be avoided for OMAP4 to boot up properly as the dependencies have not been populated currently for OMAP4. Also I was validating the clock->clockdomain registering and noticed that one of the clock-domains is missing in the auto-generated file. So along with the current patch in discussion I am sending two separate patches for fixing the above things as well.
Best Regards,
Abhijit Pagare
Quoted 32 lines
-----Original Message-----
From: Paul Walmsley [mailto:paul at pwsan.com]
Sent: Tuesday, December 22, 2009 9:43 PM
To: Pagare, Abhijit
Cc: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Cousson, Benoit; Nayak, Rajendra
Subject: Re: [PATCH 1/1] ARM: OMAP4: PM: Remove the checks preventing OMAP4 clockdomain validationHello Abhijit,
Quoted 1 line · Abhijit Pagare
The clockdomain related code beng in place it is now not necessary to
have
Quoted 1 line
some of the clock code commented out. This would help the validation of
the
Quoted 6 lines
clockdomain functions using the clock level interfaces.
Signed-off-by Abhijit Pagare <[email protected]>Cc Paul Walmsley <[email protected]>Cc Benoit Cousson <[email protected]>Cc Rajendra Nayak <[email protected]>Could you also deal with the TODO in
mach-omap2/clock44xx_data.c?Also, has this patch been tested? If so, please list the platform it was tested on in the commit message.
thanks,
- Paul
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP4: PM: Remove the checks preventing OMAP4 clockdomain validation
In reply to Abhijit PagareQuoted 3 lines · Abhijit Pagare
The clockdomain related code beng in place it is now not necessary to have some of the clock code commented out. This would help the validation of the clockdomain functions using the clock level interfaces.
Why are tagging clock related patches as "PM" in the subject?
All the clock related patches should be done directly against the mainline kernel.
If there is some dependency to the pm branch, that should be fixed and removed ASAP.
Regards,
Tony
Quoted 68 lines
Signed-off-by Abhijit Pagare <[email protected]>Cc Paul Walmsley <[email protected]>Cc Benoit Cousson <[email protected]>Cc Rajendra Nayak <[email protected]>--- arch/arm/mach-omap2/clock.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)arch/arm/mach-omap2/clock.c +0
-8@@ -181,7 +181,6 @@ static int _dpll_test_fint(struct clk *clk, u8 n)* clockdomain pointer, and save it into the struct clk. Intended to be * called during clk_register(). No return value. */ -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ void omap2_init_clk_clkdm (struct clk *clk) {struct clockdomain *clkdm;@@ -199,7 +198,6 @@ void omap2_init_clk_clkdm(struct clk *clk) "clkdm %s\n", clk->name, clk->clkdm_name); } } -#endif /** * omap2_init_clksel_parent - set a clksel clk's parent field from the hardware @@ -476,10 +474,8 @@ void omap2_clk_disable(struct clk *clk)_omap2_clk_disable (clk);if (clk->parent)omap2_clk_disable (clk->parent); -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ if (clk->clkdm)omap2_clkdm_clk_disable (clk->clkdm, clk); -#endif } }@@ -489,10 +485,8 @@ int omap2_clk_enable(struct clk *clk)int ret =0 ;if (clk->usecount++ ==0 ) { -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ if (clk->clkdm)omap2_clkdm_clk_enable (clk->clkdm, clk); -#endif if (clk->parent) { ret =omap2_clk_enable (clk->parent);@@ -511,10 +505,8 @@ int omap2_clk_enable(struct clk *clk)return ret; err: -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ if (clk->clkdm)omap2_clkdm_clk_disable (clk->clkdm, clk); -#endif clk->usecount--;return ret; }Signature · 6 lines
1.5.4.7 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html