Pull request: i.MX nand driver updates

Pull request: i.MX nand driver updates

[Sascha Hauer]

Hi Artem,

Please pull the following patches to the i.MX nand driver for -next.
The patches have been reviewed here on the list and on linux-arm-kernel.

Sascha

The following changes since commit da5cabf80e2433131bf0ed8993abc0f7ea618c73:

  Linux 2.6.36-rc1 (2010-08-15 17:41:37 -0700)

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

John Ogness (2):
      mxc_nand: Do not do byte accesses to the NFC buffer.
      mxc_nand: remove unused variables.

Sascha Hauer (10):
      mxc_nand: remove 0xe00 offset from registers
      mxc_nand: rework get_dev_status
      mxc_nand: make some internally used functions overwriteable
      mxc_nand: factor out a check_int function
      mxc_nand: add V1_V2 namespace to registers
      mxc_nand: support 8bit ecc
      mxc_nand: fix correct_data function
      mxc_nand: Add v3 (i.MX51) Support
      mxc_nand: do not depend on disabling the irq in the interrupt handler
      mxc_nand: configure pages per block for v2 controller

 drivers/mtd/nand/Kconfig    |    2 +-
 drivers/mtd/nand/mxc_nand.c |  671 +++++++++++++++++++++++++++++++++----------
 2 files changed, 521 insertions(+), 152 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 |

Re: Pull request: i.MX nand driver updates

[David Woodhouse]

On Mon, 2010-08-23 at 08:40 +0200, Sascha Hauer wrote:
> Hi Artem,
> 
> Please pull the following patches to the i.MX nand driver for -next.
> The patches have been reviewed here on the list and on linux-arm-kernel.
> 
> Sascha
> 
> The following changes since commit da5cabf80e2433131bf0ed8993abc0f7ea618c73:
> 
>   Linux 2.6.36-rc1 (2010-08-15 17:41:37 -0700)
> 
> are available in the git repository at:
>   git://git.pengutronix.de/git/imx/linux-2.6.git mtd-imx-nand
> 
> John Ogness (2):
>       mxc_nand: Do not do byte accesses to the NFC buffer.
>       mxc_nand: remove unused variables.
> 
> Sascha Hauer (10):
>       mxc_nand: remove 0xe00 offset from registers
>       mxc_nand: rework get_dev_status
>       mxc_nand: make some internally used functions overwriteable
>       mxc_nand: factor out a check_int function
>       mxc_nand: add V1_V2 namespace to registers
>       mxc_nand: support 8bit ecc
>       mxc_nand: fix correct_data function
>       mxc_nand: Add v3 (i.MX51) Support
>       mxc_nand: do not depend on disabling the irq in the interrupt handler
>       mxc_nand: configure pages per block for v2 controller

Um, that repo seems to be based on something earlier than 2.6.36-rc1.
And the real -rc1 already contains most of those commits.

I think there are four commits which aren't already included. Of those,
at least one looks like a bug fix which needs to go into 2.6.36. What
about the others?

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation

Re: Pull request: i.MX nand driver updates

[Sascha Hauer]

On Fri, Aug 27, 2010 at 12:37:45AM +0100, David Woodhouse wrote:
> On Mon, 2010-08-23 at 08:40 +0200, Sascha Hauer wrote:
> > Hi Artem,
> > 
> > Please pull the following patches to the i.MX nand driver for -next.
> > The patches have been reviewed here on the list and on linux-arm-kernel.
> > 
> > Sascha
> > 
> > The following changes since commit da5cabf80e2433131bf0ed8993abc0f7ea618c73:
> > 
> >   Linux 2.6.36-rc1 (2010-08-15 17:41:37 -0700)
> > 
> > are available in the git repository at:
> >   git://git.pengutronix.de/git/imx/linux-2.6.git mtd-imx-nand
> > 
> > John Ogness (2):
> >       mxc_nand: Do not do byte accesses to the NFC buffer.
> >       mxc_nand: remove unused variables.
> > 
> > Sascha Hauer (10):
> >       mxc_nand: remove 0xe00 offset from registers
> >       mxc_nand: rework get_dev_status
> >       mxc_nand: make some internally used functions overwriteable
> >       mxc_nand: factor out a check_int function
> >       mxc_nand: add V1_V2 namespace to registers
> >       mxc_nand: support 8bit ecc
> >       mxc_nand: fix correct_data function
> >       mxc_nand: Add v3 (i.MX51) Support
> >       mxc_nand: do not depend on disabling the irq in the interrupt handler
> >       mxc_nand: configure pages per block for v2 controller
> 
> Um, that repo seems to be based on something earlier than 2.6.36-rc1.
> And the real -rc1 already contains most of those commits.
> 
> I think there are four commits which aren't already included. Of those,
> at least one looks like a bug fix which needs to go into 2.6.36. What
> about the others?

The patch from John Ogness is a bug fix. 'configure pages per block for
v2 controller' can be considered a bug fix since before this patch we
relied on some register bits being set correctly by the bootloader.
One patch can wait for the next merge window I think.
I updated the branch to contain the following:


The following changes since commit d1b113bb028999e82a8528e1484be8c23fb5a7d9:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2010-08-23 18:30:30 -0700)

are available in the git repository at:

  git://git.pengutronix.de/git/imx/linux-2.6.git mtd-imx-nand

John Ogness (1):
      mxc_nand: Do not do byte accesses to the NFC buffer.

Sascha Hauer (1):
      mxc_nand: configure pages per block for v2 controller

 drivers/mtd/nand/mxc_nand.c |   47 +++++++++++++++++++++++-------------------
 1 files changed, 26 insertions(+), 21 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 |

Re: Pull request: i.MX nand driver updates

[Artem Bityutskiy]

On Fri, 2010-08-27 at 12:55 +0200, Sascha Hauer wrote:
> > > are available in the git repository at:
> > >   git://git.pengutronix.de/git/imx/linux-2.6.git mtd-imx-nand
> > > 
> > > John Ogness (2):
> > >       mxc_nand: Do not do byte accesses to the NFC buffer.
> > >       mxc_nand: remove unused variables.
> > > 
> > > Sascha Hauer (10):
> > >       mxc_nand: remove 0xe00 offset from registers
> > >       mxc_nand: rework get_dev_status
> > >       mxc_nand: make some internally used functions overwriteable
> > >       mxc_nand: factor out a check_int function
> > >       mxc_nand: add V1_V2 namespace to registers
> > >       mxc_nand: support 8bit ecc
> > >       mxc_nand: fix correct_data function
> > >       mxc_nand: Add v3 (i.MX51) Support
> > >       mxc_nand: do not depend on disabling the irq in the interrupt handler
> > >       mxc_nand: configure pages per block for v2 controller
> > 
> > Um, that repo seems to be based on something earlier than 2.6.36-rc1.
> > And the real -rc1 already contains most of those commits.
> > 
> > I think there are four commits which aren't already included. Of those,
> > at least one looks like a bug fix which needs to go into 2.6.36. What
> > about the others?
> 
> The patch from John Ogness is a bug fix. 'configure pages per block for
> v2 controller' can be considered a bug fix since before this patch we
> relied on some register bits being set correctly by the bootloader.
> One patch can wait for the next merge window I think.
> I updated the branch to contain the following:

Not sure if David is confused or not, but I'm confused. Could you please
sent 2 separate pull requests: one pull request with stuff you want to
go to 2.6.36 (important fixes) and one request with 2.6.37 material.
Please, base both on the mtd-2.6.git tree. And make it clear in the
subject and the e-mail body which request contains what. This will make
things easier and will probably speed them up. And do not forget to
refresh the patches and add all Acks, if any :-)

Thanks!

-- 
Best Regards,
Artem Bityutskiy (Битюцкий Артём)

Pull request for 2.6.36

[Sascha Hauer]

Hi Artem,

> 
> Not sure if David is confused or not, but I'm confused. Could you please
> sent 2 separate pull requests: one pull request with stuff you want to
> go to 2.6.36 (important fixes) and one request with 2.6.37 material.
> Please, base both on the mtd-2.6.git tree. And make it clear in the
> subject and the e-mail body which request contains what. This will make
> things easier and will probably speed them up. And do not forget to
> refresh the patches and add all Acks, if any :-)

The mtd-2.6.git tree seems empty at the moment, so the branch is based
on linus/master.

Ok, please pull for 2.6.36:


The following changes since commit d1b113bb028999e82a8528e1484be8c23fb5a7d9:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2010-08-23 18:30:30 -0700)

are available in the git repository at:

  git://git.pengutronix.de/git/imx/linux-2.6.git mtd-imx-nand

John Ogness (1):
      mxc_nand: Do not do byte accesses to the NFC buffer.

Sascha Hauer (1):
      mxc_nand: configure pages per block for v2 controller

 drivers/mtd/nand/mxc_nand.c |   47 +++++++++++++++++++++++-------------------
 1 files changed, 26 insertions(+), 21 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 |

Re: Pull request for 2.6.36

[Artem Bityutskiy]

On Mon, 2010-08-30 at 14:43 +0200, Sascha Hauer wrote:
> The following changes since commit d1b113bb028999e82a8528e1484be8c23fb5a7d9:
> 
>   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2010-08-23 18:30:30 -0700)
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/git/imx/linux-2.6.git mtd-imx-nand
> 
> John Ogness (1):
>       mxc_nand: Do not do byte accesses to the NFC buffer.
> 
> Sascha Hauer (1):
>       mxc_nand: configure pages per block for v2 controller
> 
>  drivers/mtd/nand/mxc_nand.c |   47 +++++++++++++++++++++++-------------------
>  1 files changed, 26 insertions(+), 21 deletions(-)

FYI, both patches were merged upstream.

-- 
Best Regards,
Artem Bityutskiy (Битюцкий Артём)

Re: Pull request: i.MX nand driver updates

[Artem Bityutskiy]

On Fri, 2010-08-27 at 12:55 +0200, Sascha Hauer wrote:
> The patch from John Ogness is a bug fix. 'configure pages per block for
> v2 controller' can be considered a bug fix since before this patch we
> relied on some register bits being set correctly by the bootloader.
> One patch can wait for the next merge window I think.
> I updated the branch to contain the following:

I do not know what dwmw2 would answer, but I think it is wrong to send a
pull request based on something which is not in the tree you want to get
it. If dwmw2 pulls your tree, he will also pull all the other stuff, and
then get beaten by Linus for basing things on a random commit.

Anyway, I cherry-picked those 2 patches and put them to my
l2-mtd-2.6.git tree to the for-2.6.36 branch, and will bug dwmw2.

Please, send the rest of your stuff for 2.6.37 as well.

Also, please, use "mtd:" prefix for all your patches.

-- 
Best Regards,
Artem Bityutskiy (Битюцкий Артём)

Re: Pull request: i.MX nand driver updates

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

Hi Artem,

Sascha is away for two weeks, maybe he was in a hurry to get this request out
before he left. We are sorry for the problems that might have caused!

> Anyway, I cherry-picked those 2 patches and put them to my
> l2-mtd-2.6.git tree to the for-2.6.36 branch, and will bug dwmw2.

Thanks for doing that!

> Please, send the rest of your stuff for 2.6.37 as well.
> 
> Also, please, use "mtd:" prefix for all your patches.

Will try to get this properly done in the next days.

Thanks again,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]