Patchwork [GIT,PULL] i.MX6Q support

login
register
mail settings
Submitter Shawn Guo
Date Oct. 20, 2011, 5:11 p.m.
Message ID <20111020171158.GJ32007@S2100-06.ap.freescale.net>
Download mbox
Permalink /patch/120843/
State New
Headers show

Pull-request

git://git.linaro.org/people/shawnguo/linux-2.6.git imx6q/for-arnd

Comments

Shawn Guo - Oct. 20, 2011, 5:11 p.m.
Hi Arnd,

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.

  rmk/devel-stable
  rmk/smp
  arnd/cross-platform/debug_ll
  arnd/next/dt
  arnd/imx/devel

I will need to send a follow-up patch to update the series if Marc's
PPI series gets in for for this merge window.

Regards,
Shawn

The following changes since commit c4a23e643f240875124d56cafd242ca9ba58e045:

  Merge branch 'unstable-tree/rmk/for-next' into imx6q/base (2011-10-21 00:21:32 +0800)

are available in the git repository at:

  git://git.linaro.org/people/shawnguo/linux-2.6.git imx6q/for-arnd

Sascha Hauer (1):
      arm/imx: merge i.MX3 and i.MX6

Shawn Guo (8):
      arm/imx6q: add device tree source
      arm/imx6q: add core definitions and low-level debug uart
      arm/imx: add gic_handle_irq function
      arm/imx6q: add core drivers clock, gpc, mmdc and src
      arm/imx6q: add smp and cpu hotplug support
      arm/imx6q: add device tree machine support
      arm/imx6q: add suspend/resume support
      MAINTAINERS: add ARM/FREESCALE IMX6 entry

 Documentation/devicetree/bindings/arm/fsl.txt |    6 +
 MAINTAINERS                                   |    7 +
 arch/arm/Kconfig                              |    2 +-
 arch/arm/Kconfig.debug                        |    7 +
 arch/arm/Makefile                             |    2 +-
 arch/arm/boot/dts/imx6q-sabreauto.dts         |   62 +
 arch/arm/boot/dts/imx6q.dtsi                  |  575 +++++++
 arch/arm/mach-imx/Kconfig                     |   30 +-
 arch/arm/mach-imx/Makefile                    |   11 +
 arch/arm/mach-imx/Makefile.boot               |   14 +-
 arch/arm/mach-imx/clock-imx6q.c               | 2012 +++++++++++++++++++++++++
 arch/arm/mach-imx/gpc.c                       |  113 ++
 arch/arm/mach-imx/head-v7.S                   |   99 ++
 arch/arm/mach-imx/hotplug.c                   |   44 +
 arch/arm/mach-imx/lluart.c                    |   32 +
 arch/arm/mach-imx/localtimer.c                |   35 +
 arch/arm/mach-imx/mach-imx6q.c                |   84 +
 arch/arm/mach-imx/mmdc.c                      |   72 +
 arch/arm/mach-imx/platsmp.c                   |   85 ++
 arch/arm/mach-imx/pm-imx6q.c                  |   70 +
 arch/arm/mach-imx/src.c                       |   49 +
 arch/arm/mm/Kconfig                           |    2 +-
 arch/arm/plat-mxc/Kconfig                     |   11 +-
 arch/arm/plat-mxc/Makefile                    |    2 +-
 arch/arm/plat-mxc/gic.c                       |   48 +
 arch/arm/plat-mxc/include/mach/common.h       |   29 +
 arch/arm/plat-mxc/include/mach/debug-macro.S  |    2 +
 arch/arm/plat-mxc/include/mach/entry-macro.S  |    6 +
 arch/arm/plat-mxc/include/mach/hardware.h     |    6 +
 arch/arm/plat-mxc/include/mach/irqs.h         |   10 +-
 arch/arm/plat-mxc/include/mach/mx6q.h         |   33 +
 31 files changed, 3546 insertions(+), 14 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/fsl.txt
 create mode 100644 arch/arm/boot/dts/imx6q-sabreauto.dts
 create mode 100644 arch/arm/boot/dts/imx6q.dtsi
 create mode 100644 arch/arm/mach-imx/clock-imx6q.c
 create mode 100644 arch/arm/mach-imx/gpc.c
 create mode 100644 arch/arm/mach-imx/head-v7.S
 create mode 100644 arch/arm/mach-imx/hotplug.c
 create mode 100644 arch/arm/mach-imx/lluart.c
 create mode 100644 arch/arm/mach-imx/localtimer.c
 create mode 100644 arch/arm/mach-imx/mach-imx6q.c
 create mode 100644 arch/arm/mach-imx/mmdc.c
 create mode 100644 arch/arm/mach-imx/platsmp.c
 create mode 100644 arch/arm/mach-imx/pm-imx6q.c
 create mode 100644 arch/arm/mach-imx/src.c
 create mode 100644 arch/arm/plat-mxc/gic.c
 create mode 100644 arch/arm/plat-mxc/include/mach/mx6q.h
Russell King - ARM Linux - Oct. 20, 2011, 9:18 p.m.
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.
Arnd Bergmann - Oct. 20, 2011, 10:23 p.m.
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?

	Arnd
Barry Song - Oct. 24, 2011, 1:15 a.m.
2011/10/21 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> 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.

does it mean i can rebase the prima2 l2 patch based on the rmk/l2
branch with the two commits i need:
ARM: 7090/1: CACHE-L2X0: filter start address can be 0 and is often 0;
ARM: 7114/1: cache-l2x0: add resume entry for l2 in secure mode

and let Arnd pull my prima2 l2 patches?
>
Thanks
barry
Russell King - ARM Linux - Oct. 24, 2011, 9:11 a.m.
On Mon, Oct 24, 2011 at 09:15:38AM +0800, Barry Song wrote:
> 2011/10/21 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> > 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.
> 
> does it mean i can rebase the prima2 l2 patch based on the rmk/l2
> branch with the two commits i need:
> ARM: 7090/1: CACHE-L2X0: filter start address can be 0 and is often 0;
> ARM: 7114/1: cache-l2x0: add resume entry for l2 in secure mode

The l2x0 branch contains these commits, so you can use that as a basis
for your work.  If you have other dependencies, you may have to merge
this with other branches.

Note - an issue which came up with the GIC PPI pull request - if
you're merging by commit ID, please go back and edit the commit
message using git commit --amend and make it _more_ informative.  This
is far from a useful commit message:

	Merge commit '32cffdd' into ppi-irq-core-for-rmk

What this is actually doing is merging Thomas' IRQ tree, but that message
gives no clue that's what happened.  On the other hand, a real pull gives
this kind of message:

	Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable

And this says exactly what tree is being merged from where - and such
a line explains why the other commits (which come from someone elses
tree) are there.