Patchwork [GIT,PULL] imx-fixes

login
register
mail settings
Submitter Sascha Hauer
Date Aug. 8, 2011, 6:35 a.m.
Message ID <20110808063549.GL31404@pengutronix.de>
Download mbox
Permalink /patch/108866/
State New
Headers show

Pull-request

git://git.pengutronix.de/git/imx/linux-2.6.git imx-fixes-for-arnd

Comments

Sascha Hauer - Aug. 8, 2011, 6:35 a.m.
Hi Arnd,

Please pull the following fixes for i.MX.

Sascha

PS: The branch is not based on -rc1, I just had to merge it in to apply
the patch from Ben Dooks.

The following changes since commit 322a8b034003c0d46d39af85bf24fee27b902f48:

  Linux 3.1-rc1 (2011-08-07 18:23:30 -0700)

are available in the git repository at:
  git://git.pengutronix.de/git/imx/linux-2.6.git imx-fixes-for-arnd

Arnaud Patard (3):
      efikasb/mx: fix usbh1 initialisation
      efikasb: fix gpio keys.
      efika: Fix board id detection

Ben Dooks (1):
      ARM: mx5: board-cpuimx51.c fixup irq_to_gpio() usage

Eric Miao (1):
      ARM: mx53: add pad configuration for I2C signals

Fabio Estevam (3):
      ARM: mach-imx/mx31ads: Fix section mismatches
      ARM: mach-imx/mx31lilly: Fix section mismatches
      ARM: board-mx51_babbage: Fix UART2 registration

Jason Liu (1):
      ARM: iMX5: Don't enable DPLL if it already enabled

Javier Martin (1):
      Add tlv320aic32x4 platform data to Visstrim_M10.

Mehnert, Torsten (1):
      i.MX25 GPT clock fix: ensure correct the clock source

Sascha Hauer (1):
      Merge commit 'v3.1-rc1' into imx-fixes

 arch/arm/mach-imx/clock-imx25.c             |    3 ++
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c |   13 +++++++++++
 arch/arm/mach-imx/mach-mx31ads.c            |    4 +-
 arch/arm/mach-imx/mach-mx31lilly.c          |    2 +-
 arch/arm/mach-mx5/board-cpuimx51.c          |    2 +-
 arch/arm/mach-mx5/board-mx51_babbage.c      |    2 +-
 arch/arm/mach-mx5/board-mx51_efikamx.c      |    6 ++--
 arch/arm/mach-mx5/board-mx51_efikasb.c      |   15 +++++++------
 arch/arm/mach-mx5/clock-mx51-mx53.c         |    6 ++++-
 arch/arm/mach-mx5/mx51_efika.c              |    2 +-
 arch/arm/plat-mxc/include/mach/iomux-mx53.h |   31 ++++++++++++++------------
 11 files changed, 55 insertions(+), 31 deletions(-)
Sascha Hauer - Aug. 8, 2011, 6:41 a.m.
On Mon, Aug 08, 2011 at 08:35:49AM +0200, Sascha Hauer wrote:
> 
> Hi Arnd,
> 
> Please pull the following fixes for i.MX.

Added one patch from Arnaud Patard to this series:

commit d9c927833a42b4eaae4addd031f780f4530f7a2d
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Date:   Fri Aug 5 09:32:41 2011 +0200

    iMX: Fix build for iMX53

Sascha
Shawn Guo - Aug. 8, 2011, 9:59 p.m.
Hi Sascha,

On Mon, Aug 08, 2011 at 08:41:57AM +0200, Sascha Hauer wrote:
> On Mon, Aug 08, 2011 at 08:35:49AM +0200, Sascha Hauer wrote:
> > 
> > Hi Arnd,
> > 
> > Please pull the following fixes for i.MX.
> 
> Added one patch from Arnaud Patard to this series:
> 
> commit d9c927833a42b4eaae4addd031f780f4530f7a2d
> Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
> Date:   Fri Aug 5 09:32:41 2011 +0200
> 
>     iMX: Fix build for iMX53
> 
I'm fine with the fact that you picked this over mine which I posted
below, as long as we fix the issue.  But it seems that I need to ping
you harder to pick my patch in the future, if somehow you will easily
forget/overlook my patches :)

http://article.gmane.org/gmane.linux.ports.arm.kernel/125945

commit 8065dff7367b6efd9859b223e06e57465a1d3cee
Author: Shawn Guo <shawn.guo@linaro.org>
Date:   Wed Jul 20 20:48:32 2011 +0800

    arm/mxc: add the missing UART_PADDR for i.mx53

    The UART_PADDR definition for i.mx53 and i.mx50 is missing in
    debug-macro.S.  It causes the build of i.mx53/50 fail.

    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
    Reported-by: Troy Kisky <troy.kisky@boundarydevices.com>
Arnd Bergmann - Aug. 12, 2011, 3:40 p.m.
On Monday 08 August 2011, Sascha Hauer wrote:
> 
> Hi Arnd,
> 
> Please pull the following fixes for i.MX.
> 
> Sascha
> 
> PS: The branch is not based on -rc1, I just had to merge it in to apply
> the patch from Ben Dooks.
> 
> The following changes since commit 322a8b034003c0d46d39af85bf24fee27b902f48:
> 
>   Linux 3.1-rc1 (2011-08-07 18:23:30 -0700)
> 

Pulled, thanks!

Sorry for the delay.

	Arnd