* [GIT PULL] i.MX3 patches
@ 2012-03-02 8:01 Sascha Hauer
2012-03-02 15:07 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Sascha Hauer @ 2012-03-02 8:01 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Please pull the following i.MX3 specific patches for -next. Note
that 1/2 depends on your imx/cleanup branch since it includes
crmregs-imx3.h which is created in this branch.
Sascha
The following changes since commit d65b4e98d7ea3038b767b70fe8be959b2913f16d:
Linux 3.3-rc3 (2012-02-08 19:21:53 -0800)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git features/imx3
for you to fetch changes up to bb07d7511e0884f913a0610d5f9a2f8a27914042:
ARM: mx3: Setup AIPS registers (2012-03-02 08:49:37 +0100)
----------------------------------------------------------------
Fabio Estevam (2):
ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
ARM: mx3: Setup AIPS registers
arch/arm/mach-imx/Makefile | 4 +-
arch/arm/mach-imx/crmregs-imx31.h | 1 +
arch/arm/mach-imx/mm-imx3.c | 5 ++++
arch/arm/mach-imx/pm-imx3.c | 37 +++++++++++++++++++++++++++++++
arch/arm/plat-mxc/cpu.c | 24 ++++++++++++++++++++
arch/arm/plat-mxc/include/mach/common.h | 9 +++++++
6 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/mach-imx/pm-imx3.c
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL] i.MX3 patches
2012-03-02 8:01 [GIT PULL] i.MX3 patches Sascha Hauer
@ 2012-03-02 15:07 ` Arnd Bergmann
2012-03-02 15:11 ` Sascha Hauer
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2012-03-02 15:07 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 02 March 2012, Sascha Hauer wrote:
> Hi Arnd,
>
> Please pull the following i.MX3 specific patches for -next. Note
> that 1/2 depends on your imx/cleanup branch since it includes
> crmregs-imx3.h which is created in this branch.
>
> The following changes since commit d65b4e98d7ea3038b767b70fe8be959b2913f16d:
>
> Linux 3.3-rc3 (2012-02-08 19:21:53 -0800)
>
> are available in the git repository at:
>
> git://git.pengutronix.de/git/imx/linux-2.6.git features/imx3
Pulled into next/soc.
I got a merge conflict against Nico's 4a3ea244 "ARM: plat-mxc: hook special idle
handlers to arm_pm_idle" and did the obvious merge below. Please complain
if this needs some other resolution.
Thanks,
Arnd
diff --cc arch/arm/mach-imx/mm-imx3.c
index 8404ee7,35ce8b5..b23bd3f
--- a/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@@ -34,29 -34,33 +34,31 @@@ static void imx3_idle(void
{
unsigned long reg = 0;
+ mx3_cpu_lp_set(MX3_WAIT);
+
- if (!need_resched())
- __asm__ __volatile__(
- /* disable I and D cache */
- "mrc p15, 0, %0, c1, c0, 0\n"
- "bic %0, %0, #0x00001000\n"
- "bic %0, %0, #0x00000004\n"
- "mcr p15, 0, %0, c1, c0, 0\n"
- /* invalidate I cache */
- "mov %0, #0\n"
- "mcr p15, 0, %0, c7, c5, 0\n"
- /* clear and invalidate D cache */
- "mov %0, #0\n"
- "mcr p15, 0, %0, c7, c14, 0\n"
- /* WFI */
- "mov %0, #0\n"
- "mcr p15, 0, %0, c7, c0, 4\n"
- "nop\n" "nop\n" "nop\n" "nop\n"
- "nop\n" "nop\n" "nop\n"
- /* enable I and D cache */
- "mrc p15, 0, %0, c1, c0, 0\n"
- "orr %0, %0, #0x00001000\n"
- "orr %0, %0, #0x00000004\n"
- "mcr p15, 0, %0, c1, c0, 0\n"
- : "=r" (reg));
- local_irq_enable();
+ __asm__ __volatile__(
+ /* disable I and D cache */
+ "mrc p15, 0, %0, c1, c0, 0\n"
+ "bic %0, %0, #0x00001000\n"
+ "bic %0, %0, #0x00000004\n"
+ "mcr p15, 0, %0, c1, c0, 0\n"
+ /* invalidate I cache */
+ "mov %0, #0\n"
+ "mcr p15, 0, %0, c7, c5, 0\n"
+ /* clear and invalidate D cache */
+ "mov %0, #0\n"
+ "mcr p15, 0, %0, c7, c14, 0\n"
+ /* WFI */
+ "mov %0, #0\n"
+ "mcr p15, 0, %0, c7, c0, 4\n"
+ "nop\n" "nop\n" "nop\n" "nop\n"
+ "nop\n" "nop\n" "nop\n"
+ /* enable I and D cache */
+ "mrc p15, 0, %0, c1, c0, 0\n"
+ "orr %0, %0, #0x00001000\n"
+ "orr %0, %0, #0x00000004\n"
+ "mcr p15, 0, %0, c1, c0, 0\n"
+ : "=r" (reg));
}
static void __iomem *imx3_ioremap(unsigned long phys_addr, size_t size,
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL] i.MX3 patches
2012-03-02 15:07 ` Arnd Bergmann
@ 2012-03-02 15:11 ` Sascha Hauer
0 siblings, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2012-03-02 15:11 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Mar 02, 2012 at 03:07:56PM +0000, Arnd Bergmann wrote:
> On Friday 02 March 2012, Sascha Hauer wrote:
> > Hi Arnd,
> >
> > Please pull the following i.MX3 specific patches for -next. Note
> > that 1/2 depends on your imx/cleanup branch since it includes
> > crmregs-imx3.h which is created in this branch.
> >
> > The following changes since commit d65b4e98d7ea3038b767b70fe8be959b2913f16d:
> >
> > Linux 3.3-rc3 (2012-02-08 19:21:53 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.pengutronix.de/git/imx/linux-2.6.git features/imx3
>
> Pulled into next/soc.
>
> I got a merge conflict against Nico's 4a3ea244 "ARM: plat-mxc: hook special idle
> handlers to arm_pm_idle" and did the obvious merge below. Please complain
> if this needs some other resolution.
Looks good.
Thanks
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-02 15:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-02 8:01 [GIT PULL] i.MX3 patches Sascha Hauer
2012-03-02 15:07 ` Arnd Bergmann
2012-03-02 15:11 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).