Patchwork [GIT,PULL] i.MX fixes

login
register
mail settings
Submitter Sascha Hauer
Date June 7, 2012, 8:04 p.m.
Message ID <20120607200451.GQ30400@pengutronix.de>
Download mbox
Permalink /patch/163668/
State New
Headers show

Pull-request

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

Comments

Sascha Hauer - June 7, 2012, 8:04 p.m.
Hi Olof, Arnd,

Please pull the following i.MX fixes for -rc.

Sascha

The following changes since commit 76e10d158efb6d4516018846f60c2ab5501900bc:

  Linux 3.4 (2012-05-20 15:29:13 -0700)

are available in the git repository at:

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

for you to fetch changes up to 350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a:

  ARM i.MX imx21ads: Fix overlapping static i/o mappings (2012-06-07 21:34:22 +0200)

----------------------------------------------------------------
Fabio Estevam (1):
      ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSI

Jaccon Bastiaansen (1):
      ARM i.MX imx21ads: Fix overlapping static i/o mappings

Javier Martin (1):
      ARM i.MX27 Visstrim M10: fix gpio handling.

Uwe Kleine-König (2):
      ARM: imx: only specify i2c device type once
      ARM: imx: only call l2x0_init if it's available

 arch/arm/mach-imx/Kconfig                   |    1 +
 arch/arm/mach-imx/mach-cpuimx35.c           |    1 -
 arch/arm/mach-imx/mach-cpuimx51sd.c         |    1 -
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c |   36 +++++++++++++++++++--------
 arch/arm/mach-imx/mach-mx21ads.c            |    2 +-
 arch/arm/mach-imx/mm-imx3.c                 |    2 ++
 6 files changed, 29 insertions(+), 14 deletions(-)
Olof Johansson - June 8, 2012, 8:23 a.m.
On Thu, Jun 7, 2012 at 1:04 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Hi Olof, Arnd,
>
> Please pull the following i.MX fixes for -rc.
>
> Sascha
>
> The following changes since commit 76e10d158efb6d4516018846f60c2ab5501900bc:
>
>  Linux 3.4 (2012-05-20 15:29:13 -0700)
>
> are available in the git repository at:
>
>  git://git.pengutronix.de/git/imx/linux-2.6.git imx/fixes

Pulled, thanks. In the future, for fixes you can aggregate them in one
branch -- we normally just care about topics for merge window staging.

Also, have you noticed that imx_v4_v5_defconfig has a build failure in
mx2_camera.c?

drivers/media/video/mx2_camera.c: In function 'mx2_camera_set_bus_param':
drivers/media/video/mx2_camera.c:1032:42: error: 'pixfmt' undeclared
(first use in this function)
drivers/media/video/mx2_camera.c:1032:42: note: each undeclared
identifier is reported only once for each function it appears in


-Olof
Fabio Estevam - June 8, 2012, 8:24 p.m.
On Fri, Jun 8, 2012 at 5:23 AM, Olof Johansson <olof@lixom.net> wrote:
>
> Also, have you noticed that imx_v4_v5_defconfig has a build failure in
> mx2_camera.c?
>
> drivers/media/video/mx2_camera.c: In function 'mx2_camera_set_bus_param':
> drivers/media/video/mx2_camera.c:1032:42: error: 'pixfmt' undeclared
> (first use in this function)
> drivers/media/video/mx2_camera.c:1032:42: note: each undeclared
> identifier is reported only once for each function it appears in
ux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

This has already been addressed by the following patch:
http://patchwork.linuxtv.org/patch/11504/
Sascha Hauer - June 9, 2012, 9:44 a.m.
On Fri, Jun 08, 2012 at 01:23:19AM -0700, Olof Johansson wrote:
> On Thu, Jun 7, 2012 at 1:04 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> > Hi Olof, Arnd,
> >
> > Please pull the following i.MX fixes for -rc.
> >
> > Sascha
> >
> > The following changes since commit 76e10d158efb6d4516018846f60c2ab5501900bc:
> >
> >  Linux 3.4 (2012-05-20 15:29:13 -0700)
> >
> > are available in the git repository at:
> >
> >  git://git.pengutronix.de/git/imx/linux-2.6.git imx/fixes
> 
> Pulled, thanks. In the future, for fixes you can aggregate them in one
> branch -- we normally just care about topics for merge window staging.

Ok, thanks

Sascha