[GIT PULL] i.MX fixes for -rc

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Arnd, Olof,

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

Thanks
 Sascha

The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9:

  Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)

are available in the git repository at:

  git://git.pengutronix.de/git/imx/linux-2.6.git tags/arm-imx-fixes-for-3.9-rc

for you to fetch changes up to 5dc2eb7da1e387e31ce54f54af580c6a6f512ca6:

  ARM: i.MX35: enable MAX clock (2013-03-15 14:52:54 +0100)

----------------------------------------------------------------
Two small ARM i.MX fixes for v3.9-rc

- Fix i.MX25 DT compilation
- Enable MAX clk on i.MX35

----------------------------------------------------------------
Sascha Hauer (2):
      ARM: i.MX25: Fix DT compilation
      ARM: i.MX35: enable MAX clock

 arch/arm/mach-imx/clk-imx35.c | 1 +
 arch/arm/mach-imx/imx25-dt.c  | 5 +++++
 2 files changed, 6 insertions(+)
-- 
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 |

[GIT PULL] i.MX fixes for -rc

[Arnd Bergmann]

On Friday 15 March 2013, Sascha Hauer wrote:
> The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9:
> 
>   Linux 3.9-rc2 (2013-03-10 16:54:19 -0700)
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/git/imx/linux-2.6.git tags/arm-imx-fixes-for-3.9-rc
> 

Applied to fixes branch

	Arnd

[GIT PULL] i.MX fixes for -rc

[Olof Johansson]

On Tue, Jan 22, 2013 at 12:16 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Hi Arnd, Olof,
>
> Please pull the following fix for -rc.
>
> Sascha
>
> The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:
>
>   Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)
>
> are available in the git repository at:
>
>   git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes-rc


Pulled, thanks.


-Olof

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Arnd, Olof,

Please pull the following fix for -rc.

Sascha

The following changes since commit d1c3ed669a2d452cacfb48c2d171a1f364dae2ed:

  Linux 3.8-rc2 (2013-01-02 18:13:21 -0800)

are available in the git repository at:

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

for you to fetch changes up to e909c682d04e55e77a3c9d158e7dc36027195493:

  [media] coda: Fix build due to iram.h rename (2013-01-08 09:44:06 +0100)

----------------------------------------------------------------
ARM i.MX fixes for -rc.

This contains a single compilation fix for the CODA driver.

----------------------------------------------------------------
Sascha Hauer (1):
      [media] coda: Fix build due to iram.h rename

 arch/arm/mach-imx/iram_alloc.c                                     |    3 +--
 drivers/media/platform/coda.c                                      |    2 +-
 arch/arm/mach-imx/iram.h => include/linux/platform_data/imx-iram.h |    0
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename arch/arm/mach-imx/iram.h => include/linux/platform_data/imx-iram.h (100%)
-- 
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 |

[GIT PULL] i.MX fixes for -rc

[Olof Johansson]

On Mon, Dec 17, 2012 at 11:37:44AM +0100, Sascha Hauer wrote:
> Hi Arnd, Olof,
> 
> Please pull the following i.MX fixes for -rc.
> 
> Thanks
>  Sascha
> 
> 
> The following changes since commit a4f1de176614f634c367e5994a7bcc428c940df0:
> 
>   mm: fix kernel BUG at huge_memory.c:1474! (2012-12-16 19:02:38 -0800)
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes-rc

Thanks, pulled.


-Olof

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Arnd, Olof,

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

Thanks
 Sascha


The following changes since commit a4f1de176614f634c367e5994a7bcc428c940df0:

  mm: fix kernel BUG at huge_memory.c:1474! (2012-12-16 19:02:38 -0800)

are available in the git repository at:

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

for you to fetch changes up to 027c0a6af42efa4f2f6034421349bd26a3ca4923:

  ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices (2012-12-17 10:58:52 +0100)

----------------------------------------------------------------
ARM i.MX fixes for v3.8-rc

This fixes a compile failure on imx_v4_v5_defconfig and a regression
introduced with enabling the MIPI clocks on i.MX51. Also one rather
cosmetic fix for the i.MX27 dts file.

----------------------------------------------------------------
Fabio Estevam (2):
      ARM: dts: mx27: Fix the AIPI bus for FEC
      ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices

Sascha Hauer (1):
      ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks

 arch/arm/boot/dts/imx27-3ds.dts                        |    8 ++++----
 arch/arm/boot/dts/imx27-phytec-phycore.dts             |   13 +++++++------
 arch/arm/boot/dts/imx27.dtsi                           |   11 ++++++++++-
 arch/arm/mach-imx/clk-imx51-imx53.c                    |   16 ++++++++++++++++
 .../{plat-mxc => mach-imx}/devices/platform-mx2-emma.c |    4 ++--
 5 files changed, 39 insertions(+), 13 deletions(-)
 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-emma.c (94%)
-- 
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 |

[GIT PULL] i.MX fixes for -rc

[Arnd Bergmann]

On Friday 16 November 2012, Sascha Hauer wrote:
> 
> Hi Arnd, Olof,
> 
> Please pull the following i.MX fixes for -rc.
> 
> Sascha
> 
> The following changes since commit 77b67063bb6bce6d475e910d3b886a606d0d91f7:
> 
>   Linux 3.7-rc5 (2012-11-11 13:44:33 +0100)
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes-rc
> 
> for you to fetch changes up to 3d5e2abe6e265acc5e1fda810301243e9bac92b2:
> 
>   ARM: imx: ehci: fix host power mask bit (2012-11-16 15:55:05 +0100)
> 
> ----------------------------------------------------------------
> ARM i.MX fixes for 3.7-rc
> 
> ----------------------------------------------------------------

Pulled, thanks!

	Arnd

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Arnd, Olof,

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

Sascha

The following changes since commit 77b67063bb6bce6d475e910d3b886a606d0d91f7:

  Linux 3.7-rc5 (2012-11-11 13:44:33 +0100)

are available in the git repository at:

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

for you to fetch changes up to 3d5e2abe6e265acc5e1fda810301243e9bac92b2:

  ARM: imx: ehci: fix host power mask bit (2012-11-16 15:55:05 +0100)

----------------------------------------------------------------
ARM i.MX fixes for 3.7-rc

----------------------------------------------------------------
Christoph Fritz (1):
      ARM: imx: ehci: fix host power mask bit

Wei Yongjun (1):
      ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()

 arch/arm/mach-imx/clk-gate2.c  |    2 +-
 arch/arm/mach-imx/ehci-imx25.c |    2 +-
 arch/arm/mach-imx/ehci-imx35.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
-- 
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 |

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

On Fri, Oct 26, 2012 at 09:01:44PM +0000, Arnd Bergmann wrote:
> On Wednesday 24 October 2012, Sascha Hauer wrote:
> >       ARM i.MX25: Fix PWM per clock lookups
> 
> This patch is now causing build errors in imx_v4_v5_defconfig:
> 
> arch/arm/mach-imx/clk-imx25.c: In function 'mx25_clocks_init':
> arch/arm/mach-imx/clk-imx25.c:206:26: error: 'pwm_ipg_per' undeclared (first use in this function)
> arch/arm/mach-imx/clk-imx25.c:206:26: note: each undeclared identifier is reported only once for each function it appears in
> 
> Any idea what went wrong? The symbol doesn't seem to exist anywhere in
> v3.7-rc2. Should I revert this patch for now?

Yes, please revert it for now.

There are several gates missing in clk-imx25.c. I have a patch which
adds support for them and I seem to have missed that the above depends
on it.

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 |

[GIT PULL] i.MX fixes for -rc

[Arnd Bergmann]

On Wednesday 24 October 2012, Sascha Hauer wrote:
>       ARM i.MX25: Fix PWM per clock lookups

This patch is now causing build errors in imx_v4_v5_defconfig:

arch/arm/mach-imx/clk-imx25.c: In function 'mx25_clocks_init':
arch/arm/mach-imx/clk-imx25.c:206:26: error: 'pwm_ipg_per' undeclared (first use in this function)
arch/arm/mach-imx/clk-imx25.c:206:26: note: each undeclared identifier is reported only once for each function it appears in

Any idea what went wrong? The symbol doesn't seem to exist anywhere in
v3.7-rc2. Should I revert this patch for now?

	Arnd

[GIT PULL] i.MX fixes for -rc

[Arnd Bergmann]

On Wednesday 24 October 2012, Sascha Hauer wrote:

> The following changes since commit a0d271cbfed1dd50278c6b06bead3d00ba0a88f9:
> 
>   Linux 3.6 (2012-09-30 16:47:46 -0700)
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes

Pulled into fixes branch now, thanks!

	Arnd

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Arnd, Olof,

Please pull the following, mostly clock related, i.MX fixes for -rc.

Thanks
 Sascha

The following changes since commit a0d271cbfed1dd50278c6b06bead3d00ba0a88f9:

  Linux 3.6 (2012-09-30 16:47:46 -0700)

are available in the git repository at:

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

for you to fetch changes up to 92063cee118655d25b50d04eb77b012f3287357a:

  ARM i.MX25: Fix PWM per clock lookups (2012-10-10 10:02:42 +0200)

----------------------------------------------------------------
ARM i.MX fixes for 3.7-rc

----------------------------------------------------------------
Fabio Estevam (3):
      ARM: imx_v6_v7_defconfig: Enable CONFIG_GPIO_MC9S08DZ60
      ARM: imx: clk-imx27: Fix divider width field
      ARM: mxc: platform-mxc-mmc: Fix register region size

Sascha Hauer (3):
      ARM i.MX25: Fix lcdc_ipg_per parent clock
      ARM i.MX25 clk: Fix nfc_ipg_per parent
      ARM i.MX25: Fix PWM per clock lookups

Wei Yongjun (2):
      ARM: imx: fix return value check in imx3_init_l2x0()
      ARM: imx: fix the return value check in imx_clk_busy_divider()

 arch/arm/configs/imx_v6_v7_defconfig         |    2 ++
 arch/arm/mach-imx/clk-busy.c                 |    2 +-
 arch/arm/mach-imx/clk-imx25.c                |   12 ++++++------
 arch/arm/mach-imx/clk-imx27.c                |    4 ++--
 arch/arm/mach-imx/mm-imx3.c                  |    5 ++---
 arch/arm/plat-mxc/devices/platform-mxc-mmc.c |    2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)
-- 
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 |

[GIT PULL] i.MX fixes for -rc

[Arnd Bergmann]

On Wednesday 04 July 2012, Sascha Hauer wrote:
> > Is this something that should have been marked for stable, or was
> > it just recently introduced? The description suggests the former.
> 
> The bug was introduced in the last merge window, so not suitable for
> stable.

Ok, thanks for the confirmation.

	Arnd

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

On Wed, Jul 04, 2012 at 11:49:22AM +0000, Arnd Bergmann wrote:
> On Wednesday 04 July 2012, Sascha Hauer wrote:
> > Hi Arnd, Olof,
> > 
> > Please pull the following i.MX fixes for -rc
> > 
> 
> Thanks, pulled into the fixes branch. I plan to send out fixes tomorrow
> to Linus.
> 
> 
> > Uwe Kleine-K?nig (1):
> >       ARM: imx: assert SCC gate stays enabled
> 
> Is this something that should have been marked for stable, or was
> it just recently introduced? The description suggests the former.

The bug was introduced in the last merge window, so not suitable for
stable.

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 |

[GIT PULL] i.MX fixes for -rc

[Arnd Bergmann]

On Wednesday 04 July 2012, Sascha Hauer wrote:
> Hi Arnd, Olof,
> 
> Please pull the following i.MX fixes for -rc
> 

Thanks, pulled into the fixes branch. I plan to send out fixes tomorrow
to Linus.


> Uwe Kleine-K?nig (1):
>       ARM: imx: assert SCC gate stays enabled

Is this something that should have been marked for stable, or was
it just recently introduced? The description suggests the former.

	Arnd

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Arnd, Olof,

Please pull the following i.MX fixes for -rc

Thanks
 Sascha


The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:

  Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)

are available in the git repository at:

  git://git.pengutronix.de/git/imx/linux-2.6.git tags/v3.5-imx-fixes

for you to fetch changes up to c520c921eacdced7e2095ba6cbbb9921906c7b67:

  ARM: imx: assert SCC gate stays enabled (2012-07-04 09:38:29 +0200)

----------------------------------------------------------------
ARM i.MX fixes for v3.5-rc5

----------------------------------------------------------------
Fabio Estevam (1):
      ARM: imx27_visstrim_m10: Do not include <asm/system.h>

Uwe Kleine-K?nig (1):
      ARM: imx: assert SCC gate stays enabled

 arch/arm/mach-imx/clk-imx35.c               |    9 ++++++++-
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

-- 
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 |

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Arnd, Olof,

Please pull the following i.MX fixes for -rc

Thanks
 Sascha


The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:

  Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)

are available in the git repository at:

  git://git.pengutronix.de/git/imx/linux-2.6.git tags/v3.5-imx-fixes

for you to fetch changes up to c520c921eacdced7e2095ba6cbbb9921906c7b67:

  ARM: imx: assert SCC gate stays enabled (2012-07-04 09:38:29 +0200)

----------------------------------------------------------------
ARM i.MX fixes for v3.5-rc5

----------------------------------------------------------------
Fabio Estevam (1):
      ARM: imx27_visstrim_m10: Do not include <asm/system.h>

Uwe Kleine-K?nig (1):
      ARM: imx: assert SCC gate stays enabled

 arch/arm/mach-imx/clk-imx35.c               |    9 ++++++++-
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
-- 
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 |

[GIT PULL] i.MX fixes for -rc

[Olof Johansson]

On Wed, Apr 18, 2012 at 3:17 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Hi Olof, Arnd,
>
> Please pull the following for -rc.
>
> Thanks
> ?Sascha
>
>
> The following changes since commit e816b57a337ea3b755de72bec38c10c864f23015:
>
> ?Linux 3.4-rc3 (2012-04-15 18:28:29 -0700)
>
> are available in the git repository at:
>
> ?git://git.pengutronix.de/git/imx/linux-2.6.git tags/v3.4-rc3-imx-fixes

Thanks, pulled.


-Olof

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Olof, Arnd,

Please pull the following for -rc.

Thanks
 Sascha


The following changes since commit e816b57a337ea3b755de72bec38c10c864f23015:

  Linux 3.4-rc3 (2012-04-15 18:28:29 -0700)

are available in the git repository at:

  git://git.pengutronix.de/git/imx/linux-2.6.git tags/v3.4-rc3-imx-fixes

for you to fetch changes up to 4659b7f1fa3eb33a8f9a9dd209a5823602dc6dcf:

  ARM: imx: Fix imx5 idle logic bug (2012-04-18 11:52:24 +0200)

----------------------------------------------------------------
ARM i.MX misc fixes for -rc

----------------------------------------------------------------
Fabio Estevam (2):
      ARM: imx_v4_v5_defconfig: Add support for CONFIG_REGULATOR_FIXED_VOLTAGE
      ARM: imx27-dt: Fix build due to removal of irq_domain_add_simple()

Robert Lee (1):
      ARM: imx: Fix imx5 idle logic bug

 arch/arm/configs/imx_v4_v5_defconfig |    1 +
 arch/arm/mach-imx/imx27-dt.c         |    6 ++++--
 arch/arm/mach-imx/mm-imx5.c          |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
-- 
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 |

[GIT PULL] i.MX fixes for -rc

[Fabio Estevam]

On Mon, Feb 6, 2012 at 10:43 PM, Olof Johansson <olof@lixom.net> wrote:

> Just to clarify; is this a fix to functionality that used to work but
> is now broken, and if so, what broke it? Having that in the patch
> description when reposted is very useful.

No, it never worked.

> Fixes for features that never worked is generally not -rc material.
> Sometimes during the first -rcs it could be OK, but not later on in
> the release cycle. It should instead be queued up in a
> fixes-non-critical type branch for the next merge window instead.

Ok, understood. Thanks for the clarification.

I sent a v2 based on your previous feedback.

Regards,

Fabio Estevam

[GIT PULL] i.MX fixes for -rc

[Olof Johansson]

Hi,

On Tue, Jan 31, 2012 at 2:53 AM, Fabio Estevam <festevam@gmail.com> wrote:
> On Tue, Jan 31, 2012 at 6:56 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
>
>>
>> I understood that the second patch is a bugfix and that it depends on
>> the first one. Fabio, can you comment on this?
>
> Yes, this is correct.
>
> The bugfix that my patch addresses is the fact that mx35 is not
> entering LPM (low power mode) in WFI.
> It is using the same behaviour of mx31 and this is not correct for
> mx35 due to the different LPM field.
>
> I saw Olof?s feedback about the patch and will address it soon.

Just to clarify; is this a fix to functionality that used to work but
is now broken, and if so, what broke it? Having that in the patch
description when reposted is very useful.

Fixes for features that never worked is generally not -rc material.
Sometimes during the first -rcs it could be OK, but not later on in
the release cycle. It should instead be queued up in a
fixes-non-critical type branch for the next merge window instead.


-Olof

[GIT PULL] i.MX fixes for -rc

[Fabio Estevam]

On Tue, Jan 31, 2012 at 6:56 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:

>
> I understood that the second patch is a bugfix and that it depends on
> the first one. Fabio, can you comment on this?

Yes, this is correct.

The bugfix that my patch addresses is the fact that mx35 is not
entering LPM (low power mode) in WFI.
It is using the same behaviour of mx31 and this is not correct for
mx35 due to the different LPM field.

I saw Olof?s feedback about the patch and will address it soon.

Thanks,

Fabio Estevam

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

On Sun, Jan 29, 2012 at 02:32:46PM -0800, Olof Johansson wrote:
> Hi,
> 
> On Fri, Jan 27, 2012 at 3:10 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> 
> > Fabio Estevam (3):
> > ? ? ?ARM: mx3: Let mx31 and mx35 share the same CCM header file
> > ? ? ?ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
> > ? ? ?ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board
> 
> The first two don't seem like fixes to me from a quick glance at them
> -- one is a cleanup, the other is a feature. If they are fixes, please
> help us out by motivating why they should go in during -rc instead of
> in the next merge window. Thanks!

I understood that the second patch is a bugfix and that it depends on
the first one. Fabio, can you comment on this?

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 |

[GIT PULL] i.MX fixes for -rc

[Olof Johansson]

Hi,

On Fri, Jan 27, 2012 at 3:10 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:

> Fabio Estevam (3):
> ? ? ?ARM: mx3: Let mx31 and mx35 share the same CCM header file
> ? ? ?ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
> ? ? ?ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board

The first two don't seem like fixes to me from a quick glance at them
-- one is a cleanup, the other is a feature. If they are fixes, please
help us out by motivating why they should go in during -rc instead of
in the next merge window. Thanks!


Also, see separate comment on the second patch (replied in that thread).


Regards,

-Olof

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Olof, Arnd,

Another round of small fixes for -rc, please pull

Sascha

The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f:

  Linux 3.3-rc1 (2012-01-19 15:04:48 -0800)

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

Fabio Estevam (3):
      ARM: mx3: Let mx31 and mx35 share the same CCM header file
      ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
      ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board

 arch/arm/configs/imx_v4_v5_defconfig               |    1 +
 arch/arm/mach-imx/Makefile                         |    4 +-
 arch/arm/mach-imx/clock-imx31.c                    |    2 +-
 arch/arm/mach-imx/clock-imx35.c                    |  166 +++++++++-----------
 .../mach-imx/{crmregs-imx31.h => crmregs-imx3.h}   |   16 ++-
 arch/arm/mach-imx/mach-armadillo5x0.c              |    2 +-
 arch/arm/mach-imx/mm-imx3.c                        |    4 +-
 arch/arm/mach-imx/pm-imx3.c                        |   36 +++++
 arch/arm/plat-mxc/include/mach/common.h            |    8 +
 9 files changed, 142 insertions(+), 97 deletions(-)
 rename arch/arm/mach-imx/{crmregs-imx31.h => crmregs-imx3.h} (93%)
 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 |

[GIT PULL] i.MX fixes for -rc

[Olof Johansson]

Hi,

On Thu, Jan 26, 2012 at 3:58 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Hi Arnd, Olof,
>
> Please pull the following i.MX fixes for -rc.
>
> Sascha
>
> The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f:
>
> ?Linux 3.3-rc1 (2012-01-19 15:04:48 -0800)
>
> are available in the git repository at:
> ?git://git.pengutronix.de/git/imx/linux-2.6.git imx-fixes
>
> Fabio Estevam (1):
> ? ? ?ARM: imx: iomux-v1.h: Fix build error due to __init annotation
>
> Julia Lawall (1):
> ? ? ?arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap

Thanks, pulled.


-Olof

[GIT PULL] i.MX fixes for -rc

[Sascha Hauer]

Hi Arnd, Olof,

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

Sascha

The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f:

  Linux 3.3-rc1 (2012-01-19 15:04:48 -0800)

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

Fabio Estevam (1):
      ARM: imx: iomux-v1.h: Fix build error due to __init annotation

Julia Lawall (1):
      arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap

 arch/arm/mach-mx5/board-mx53_ard.c        |    4 +++-
 arch/arm/plat-mxc/include/mach/iomux-v1.h |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
-- 
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 |