| Message ID | 1315288107-14689-3-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | Accepted |
| Commit | 26a527e69d6e6077bff9e2cddcb08337ac33a52d |
| Headers | show |
On Tue, Sep 06, 2011 at 01:48:27PM +0800, Shawn Guo wrote: > When Cortex-A9 MPCore resumes from Dormant or Shutdown modes, > SCU needs to be re-enabled. This patch removes __init annotation > from function scu_enable(), so that platform resume procedure can > call it to re-enable SCU. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > --- Hi Russell, Do you have any comment on this patch? Can I put it into patch tracker? Regards, Shawn > arch/arm/kernel/smp_scu.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c > index 79ed5e7..5b6d536 100644 > --- a/arch/arm/kernel/smp_scu.c > +++ b/arch/arm/kernel/smp_scu.c > @@ -33,7 +33,7 @@ unsigned int __init scu_get_core_count(void __iomem *scu_base) > /* > * Enable the SCU > */ > -void __init scu_enable(void __iomem *scu_base) > +void scu_enable(void __iomem *scu_base) > { > u32 scu_ctrl; > > -- > 1.7.4.1
On Sat, Sep 17, 2011 at 04:32:37PM +0800, Shawn Guo wrote: > On Tue, Sep 06, 2011 at 01:48:27PM +0800, Shawn Guo wrote: > > When Cortex-A9 MPCore resumes from Dormant or Shutdown modes, > > SCU needs to be re-enabled. This patch removes __init annotation > > from function scu_enable(), so that platform resume procedure can > > call it to re-enable SCU. > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > --- > > Hi Russell, > > Do you have any comment on this patch? Can I put it into patch tracker? > Ping x 2. As imx6q suspend support depends on this patch, I really need to know if you will merge it. Otherwise, I will probably have to copy the code into imx6q platform code just like exynos4 is doing.
On Thu, Sep 22, 2011 at 11:04:01PM +0800, Shawn Guo wrote: > On Sat, Sep 17, 2011 at 04:32:37PM +0800, Shawn Guo wrote: > > On Tue, Sep 06, 2011 at 01:48:27PM +0800, Shawn Guo wrote: > > > When Cortex-A9 MPCore resumes from Dormant or Shutdown modes, > > > SCU needs to be re-enabled. This patch removes __init annotation > > > from function scu_enable(), so that platform resume procedure can > > > call it to re-enable SCU. > > > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > > --- > > > > Hi Russell, > > > > Do you have any comment on this patch? Can I put it into patch tracker? > > > Ping x 2. > > As imx6q suspend support depends on this patch, I really need to know > if you will merge it. Otherwise, I will probably have to copy the code > into imx6q platform code just like exynos4 is doing. It's fine.
On Sat, Sep 24, 2011 at 06:39:09PM +0800, Shawn Guo wrote: > On Fri, Sep 23, 2011 at 09:49:55PM +0100, Russell King - ARM Linux wrote: > > On Thu, Sep 22, 2011 at 11:04:01PM +0800, Shawn Guo wrote: > > > On Sat, Sep 17, 2011 at 04:32:37PM +0800, Shawn Guo wrote: > > > > On Tue, Sep 06, 2011 at 01:48:27PM +0800, Shawn Guo wrote: > > > > > When Cortex-A9 MPCore resumes from Dormant or Shutdown modes, > > > > > SCU needs to be re-enabled. This patch removes __init annotation > > > > > from function scu_enable(), so that platform resume procedure can > > > > > call it to re-enable SCU. > > > > > > > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > > > > --- > > > > > > > > Hi Russell, > > > > > > > > Do you have any comment on this patch? Can I put it into patch tracker? > > > > > > > Ping x 2. > > > > > > As imx6q suspend support depends on this patch, I really need to know > > > if you will merge it. Otherwise, I will probably have to copy the code > > > into imx6q platform code just like exynos4 is doing. > > > > It's fine. > > > I'm unsure about this comment. Does it mean that the patch looks fine > for being merged, or it's fine to duplicate the code in imx6q platform? The patch looks fine.
On Fri, Sep 23, 2011 at 09:49:55PM +0100, Russell King - ARM Linux wrote: > On Thu, Sep 22, 2011 at 11:04:01PM +0800, Shawn Guo wrote: > > On Sat, Sep 17, 2011 at 04:32:37PM +0800, Shawn Guo wrote: > > > On Tue, Sep 06, 2011 at 01:48:27PM +0800, Shawn Guo wrote: > > > > When Cortex-A9 MPCore resumes from Dormant or Shutdown modes, > > > > SCU needs to be re-enabled. This patch removes __init annotation > > > > from function scu_enable(), so that platform resume procedure can > > > > call it to re-enable SCU. > > > > > > > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > > > > --- > > > > > > Hi Russell, > > > > > > Do you have any comment on this patch? Can I put it into patch tracker? > > > > > Ping x 2. > > > > As imx6q suspend support depends on this patch, I really need to know > > if you will merge it. Otherwise, I will probably have to copy the code > > into imx6q platform code just like exynos4 is doing. > > It's fine. > I'm unsure about this comment. Does it mean that the patch looks fine for being merged, or it's fine to duplicate the code in imx6q platform?
diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c index 79ed5e7..5b6d536 100644 --- a/arch/arm/kernel/smp_scu.c +++ b/arch/arm/kernel/smp_scu.c @@ -33,7 +33,7 @@ unsigned int __init scu_get_core_count(void __iomem *scu_base) /* * Enable the SCU */ -void __init scu_enable(void __iomem *scu_base) +void scu_enable(void __iomem *scu_base) { u32 scu_ctrl;
When Cortex-A9 MPCore resumes from Dormant or Shutdown modes, SCU needs to be re-enabled. This patch removes __init annotation from function scu_enable(), so that platform resume procedure can call it to re-enable SCU. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- arch/arm/kernel/smp_scu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)