diff mbox

[GIT,PULL] i.MX6Q support

Message ID 20111021180158.GI23421@pengutronix.de
State New
Headers show

Commit Message

Sascha Hauer Oct. 21, 2011, 6:01 p.m. UTC 
On Fri, Oct 21, 2011 at 12:23:33AM +0200, Arnd Bergmann wrote:
> On Thursday 20 October 2011 22:18:34 Russell King - ARM Linux wrote:
> > On Fri, Oct 21, 2011 at 01:11:59AM +0800, Shawn Guo wrote:
> > > Please pull imx6q series.  It's based on v3.1-rc10 with the following
> > > branches merged plus a number of cache-l2x0 patches currently sitting
> > > on rmk/for-next.
> > 
> > Don't do that.  If there's something you need, ask me.  The L2x0
> > patches got shuffled out into their own branch when the SMP and debug
> > patches got split out of the 'misc' branch.
> 
> Since I already had the branches at hand for the highbank tree, I
> gave this a go and rebased the imx6q branch on top of the stable branches
> that are there and confirmed that it actually builds.
> 
> I have pulled the result into the next/soc branch along with highbank
> and picoxcell.
> 
> Shawn and Sascha, can you confirm that this is correct?

Adding the following at least gives a compilable result. Works on i.MX3,
I couldn't test on i.MX6 though. BTW your patch exporting imx_ioremap is
missing in your for-next branch.

Sascha



>From cf38e81255b5a8b576b0ea8dc6679f7ca9af9e25 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 21 Oct 2011 19:59:32 +0200
Subject: [PATCH] ARM i.MX avic: add missing include

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/plat-mxc/avic.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Shawn Guo Oct. 22, 2011, 12:58 a.m. UTC | #1 
On Fri, Oct 21, 2011 at 08:01:58PM +0200, Sascha Hauer wrote:
> On Fri, Oct 21, 2011 at 12:23:33AM +0200, Arnd Bergmann wrote:
> > On Thursday 20 October 2011 22:18:34 Russell King - ARM Linux wrote:
> > > On Fri, Oct 21, 2011 at 01:11:59AM +0800, Shawn Guo wrote:
> > > > Please pull imx6q series.  It's based on v3.1-rc10 with the following
> > > > branches merged plus a number of cache-l2x0 patches currently sitting
> > > > on rmk/for-next.
> > > 
> > > Don't do that.  If there's something you need, ask me.  The L2x0
> > > patches got shuffled out into their own branch when the SMP and debug
> > > patches got split out of the 'misc' branch.
> > 
> > Since I already had the branches at hand for the highbank tree, I
> > gave this a go and rebased the imx6q branch on top of the stable branches
> > that are there and confirmed that it actually builds.
> > 
> > I have pulled the result into the next/soc branch along with highbank
> > and picoxcell.
> > 
> > Shawn and Sascha, can you confirm that this is correct?
> 
> Adding the following at least gives a compilable result. Works on i.MX3,
> I couldn't test on i.MX6 though.

It works for imx6q.
Arnd Bergmann Oct. 30, 2011, 10:55 p.m. UTC | #2 
On Saturday 22 October 2011, Shawn Guo wrote:
> On Fri, Oct 21, 2011 at 08:01:58PM +0200, Sascha Hauer wrote:
> > 
> > Adding the following at least gives a compilable result. Works on i.MX3,
> > I couldn't test on i.MX6 though.
> 
> It works for imx6q.

I had to rebase the branch after pulling the updated gic series.
Sorry to bother you again, but can you check the new branch one more time?

	Arnd
diff mbox

Patch

diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c
index 8875fb4..ff31c22 100644
--- a/arch/arm/plat-mxc/avic.c
+++ b/arch/arm/plat-mxc/avic.c
@@ -23,6 +23,7 @@ 
 #include <mach/common.h>
 #include <asm/mach/irq.h>
 #include <mach/hardware.h>
+#include <asm/exception.h>
 
 #include "irq-common.h"