2.6.33 -next tree

[Grant Likely-2]

Hi Ben, Stephen.

I just prepared my next branch for 2.6.33:
git://git.secretlab.ca/git/linux-2.6 next

Steven, can you please add this tree to your linux-next pull list?
This is the branch where I put stuff that gets fed up to Ben.  This is
separate from the branch that I'm using to collect OF related changes
and that you are already pulling in.

Ben, can you please pull this branch into your -next tree for 2.6.33?

Andrew & David, you'll notice that I've also got some SPI and MMC
changes in this branch (PPC and OF related stuff) since there is no
current MMC maintainer, and some of these SPI patches have been
hanging around for a while now.  Let me know if you object to me
pushing these changes personally instead of going through another
maintainer.

Thanks,
g.

The following changes since commit b419148e567728f6af0c3b01965c1cc141e3e13a:
  Linus Torvalds (1):
        Linux 2.6.32-rc6

are available in the git repository at:

  git://git.secretlab.ca/git/linux-2.6 next

Albrecht Dreß (1):
      powerpc: tiny memcpy_(to|from)io optimisation

Grant Likely (4):
      spi/mpc5200: Register SPI devices described in device tree
      powerpc/5200: Add mpc5200-spi (non-PSC) device driver
      powerpc/5200: add general purpose timer API for the MPC5200
      mmc: fix missing module license declaration in of_mmc_spi.c

John Bonesio (1):
      powerpc/5200: add LocalPlus bus FIFO device driver

John Linn (1):
      Xilinx: SPI: Fix bits_per_word for transfers

Wolfram Sang (2):
      spi/mpc52xx-psc-spi: check for valid PSC
      spi/mpc52xx: replace printk with dev_err

 arch/powerpc/include/asm/mpc52xx.h            |   46 ++
 arch/powerpc/kernel/io.c                      |    4 +-
 arch/powerpc/platforms/52xx/Kconfig           |    5 +
 arch/powerpc/platforms/52xx/Makefile          |    1 +
 arch/powerpc/platforms/52xx/mpc52xx_gpt.c     |  133 ++++++-
 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c |  560 +++++++++++++++++++++++++
 drivers/mmc/host/of_mmc_spi.c                 |    2 +
 drivers/spi/Kconfig                           |    8 +
 drivers/spi/Makefile                          |    1 +
 drivers/spi/mpc52xx_psc_spi.c                 |   25 +-
 drivers/spi/mpc52xx_spi.c                     |  520 +++++++++++++++++++++++
 drivers/spi/xilinx_spi.c                      |    3 +-
 include/linux/spi/mpc52xx_spi.h               |   10 +
 13 files changed, 1297 insertions(+), 21 deletions(-)
 create mode 100644 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
 create mode 100644 drivers/spi/mpc52xx_spi.c
 create mode 100644 include/linux/spi/mpc52xx_spi.h


--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Stephen Rothwell]

Hi Grant,

On Wed, 4 Nov 2009 23:10:21 -0700 Grant Likely <grant.likely@...> wrote:
>
> I just prepared my next branch for 2.6.33:
> git://git.secretlab.ca/git/linux-2.6 next
>
> Steven, can you please add this tree to your linux-next pull list?
> This is the branch where I put stuff that gets fed up to Ben.  This is
> separate from the branch that I'm using to collect OF related changes
> and that you are already pulling in.

What would you like this called?  If you don't think of anything, I will
call it "52xx", but it seems like it may be of wider scope than that.

--
Cheers,
Stephen Rothwell                    sfr@...
http://www.canb.auug.org.au/~sfr/


_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Grant Likely-2]

On Thu, Nov 5, 2009 at 1:02 AM, Stephen Rothwell <sfr@...> wrote:
> On Wed, 4 Nov 2009 23:10:21 -0700 Grant Likely <grant.likely@...> wrote:
>> Steven, can you please add this tree to your linux-next pull list?
>> This is the branch where I put stuff that gets fed up to Ben.  This is
>> separate from the branch that I'm using to collect OF related changes
>> and that you are already pulling in.
>
> What would you like this called?  If you don't think of anything, I will
> call it "52xx", but it seems like it may be of wider scope than that.

It is 5xxx and virtex related stuff, plus a smattering of generic ppc
changes.  "5xxx-and-virtex" perhaps?

g.

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Stephen Rothwell]

Hi Grant,

On Thu, 5 Nov 2009 01:08:53 -0700 Grant Likely <grant.likely@...> wrote:
>
> It is 5xxx and virtex related stuff, plus a smattering of generic ppc
> changes.  "5xxx-and-virtex" perhaps?

OK, done.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgment of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
        Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

--
Cheers,
Stephen Rothwell
sfr@...

Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees.  You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next.  These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc.  The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc.  If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.


_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Grant Likely-2]

On Wed, Nov 4, 2009 at 11:10 PM, Grant Likely <grant.likely@...> wrote:

> Hi Ben, Stephen.
>
> I just prepared my next branch for 2.6.33:
> git://git.secretlab.ca/git/linux-2.6 next
>
> Steven, can you please add this tree to your linux-next pull list?
> This is the branch where I put stuff that gets fed up to Ben.  This is
> separate from the branch that I'm using to collect OF related changes
> and that you are already pulling in.
>
> Ben, can you please pull this branch into your -next tree for 2.6.33?

Ben: ping?

Are you able to pull this tree, or should I ask Linus to pull it directly?

It contains mpc5200 and xilinx stuff.  Some of it is SPI related, but
I'm now the SPI co-maintainer, so I have no problem with it going in
via your tree.  :-)  Regardless, I want to get it out to Linus ASAP.

This tree has also been in linux-next for a while now, so it should be
a safe pull.

Thanks,
g.

> Andrew & David, you'll notice that I've also got some SPI and MMC
> changes in this branch (PPC and OF related stuff) since there is no
> current MMC maintainer, and some of these SPI patches have been
> hanging around for a while now.  Let me know if you object to me
> pushing these changes personally instead of going through another
> maintainer.
>
> Thanks,
> g.
>
> The following changes since commit b419148e567728f6af0c3b01965c1cc141e3e13a:
>  Linus Torvalds (1):
>        Linux 2.6.32-rc6
>
> are available in the git repository at:
>
>  git://git.secretlab.ca/git/linux-2.6 next
>
> Albrecht Dreß (1):
>      powerpc: tiny memcpy_(to|from)io optimisation
>
> Grant Likely (4):
>      spi/mpc5200: Register SPI devices described in device tree
>      powerpc/5200: Add mpc5200-spi (non-PSC) device driver
>      powerpc/5200: add general purpose timer API for the MPC5200
>      mmc: fix missing module license declaration in of_mmc_spi.c
>
> John Bonesio (1):
>      powerpc/5200: add LocalPlus bus FIFO device driver
>
> John Linn (1):
>      Xilinx: SPI: Fix bits_per_word for transfers
>
> Wolfram Sang (2):
>      spi/mpc52xx-psc-spi: check for valid PSC
>      spi/mpc52xx: replace printk with dev_err
>
>  arch/powerpc/include/asm/mpc52xx.h            |   46 ++
>  arch/powerpc/kernel/io.c                      |    4 +-
>  arch/powerpc/platforms/52xx/Kconfig           |    5 +
>  arch/powerpc/platforms/52xx/Makefile          |    1 +
>  arch/powerpc/platforms/52xx/mpc52xx_gpt.c     |  133 ++++++-
>  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c |  560 +++++++++++++++++++++++++
>  drivers/mmc/host/of_mmc_spi.c                 |    2 +
>  drivers/spi/Kconfig                           |    8 +
>  drivers/spi/Makefile                          |    1 +
>  drivers/spi/mpc52xx_psc_spi.c                 |   25 +-
>  drivers/spi/mpc52xx_spi.c                     |  520 +++++++++++++++++++++++
>  drivers/spi/xilinx_spi.c                      |    3 +-
>  include/linux/spi/mpc52xx_spi.h               |   10 +
>  13 files changed, 1297 insertions(+), 21 deletions(-)
>  create mode 100644 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
>  create mode 100644 drivers/spi/mpc52xx_spi.c
>  create mode 100644 include/linux/spi/mpc52xx_spi.h
>
>
> --
> Grant Likely, B.Sc., P.Eng.
> Secret Lab Technologies Ltd.
>

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Grant Likely-2]

Ben, here's an updated pull request.  Can you please pull and send
them up to Linus?

I've added 4 more commits related to the 5200 GPT timer.  These
commits have also have linux-next exposure, I just had them in the
wrong branch.  One commit touches drivers/watchdog, but I got an ack
from Wim to merge it.

Cheers,
g.

The following changes since commit 22763c5cf3690a681551162c15d34d935308c8d7:
  Linus Torvalds (1):
        Linux 2.6.32

are available in the git repository at:

  git://git.secretlab.ca/git/linux-2.6 next

Albrecht Dreß (5):
      powerpc: tiny memcpy_(to|from)io optimisation
      mpc5200/gpt: tiny fix for gpt period limitation
      mpc52xx/wdt: OF property to enable the WDT on boot
      mpc52xx/wdt: merge WDT code into the GPT driver
      mpc52xx/wdt: remove obsolete old WDT implementation

Grant Likely (4):
      spi/mpc5200: Register SPI devices described in device tree
      powerpc/5200: Add mpc5200-spi (non-PSC) device driver
      powerpc/5200: add general purpose timer API for the MPC5200
      mmc: fix missing module license declaration in of_mmc_spi.c

John Bonesio (1):
      powerpc/5200: add LocalPlus bus FIFO device driver

John Linn (1):
      Xilinx: SPI: Fix bits_per_word for transfers

Wolfram Sang (2):
      spi/mpc52xx-psc-spi: check for valid PSC
      spi/mpc52xx: replace printk with dev_err

 Documentation/powerpc/dts-bindings/fsl/mpc5200.txt |   17 +-
 arch/powerpc/include/asm/mpc52xx.h                 |   47 ++
 arch/powerpc/kernel/io.c                           |    4 +-
 arch/powerpc/platforms/52xx/Kconfig                |    5 +
 arch/powerpc/platforms/52xx/Makefile               |    1 +
 arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |  428 +++++++++++++++-
 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |  560 ++++++++++++++++++++
 drivers/mmc/host/of_mmc_spi.c                      |    2 +
 drivers/spi/Kconfig                                |    8 +
 drivers/spi/Makefile                               |    1 +
 drivers/spi/mpc52xx_psc_spi.c                      |   25 +-
 drivers/spi/mpc52xx_spi.c                          |  520 ++++++++++++++++++
 drivers/spi/xilinx_spi.c                           |    3 +-
 drivers/watchdog/Kconfig                           |    4 +-
 drivers/watchdog/Makefile                          |    1 -
 drivers/watchdog/mpc5200_wdt.c                     |  293 ----------
 include/linux/spi/mpc52xx_spi.h                    |   10 +
 17 files changed, 1609 insertions(+), 320 deletions(-)
 create mode 100644 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
 create mode 100644 drivers/spi/mpc52xx_spi.c
 delete mode 100644 drivers/watchdog/mpc5200_wdt.c
 create mode 100644 include/linux/spi/mpc52xx_spi.h


On Tue, Dec 8, 2009 at 2:33 PM, Grant Likely <grant.likely@...> wrote:

> On Wed, Nov 4, 2009 at 11:10 PM, Grant Likely <grant.likely@...> wrote:
>> Hi Ben, Stephen.
>>
>> I just prepared my next branch for 2.6.33:
>> git://git.secretlab.ca/git/linux-2.6 next
>>
>> Steven, can you please add this tree to your linux-next pull list?
>> This is the branch where I put stuff that gets fed up to Ben.  This is
>> separate from the branch that I'm using to collect OF related changes
>> and that you are already pulling in.
>>
>> Ben, can you please pull this branch into your -next tree for 2.6.33?
>
> Ben: ping?
>
> Are you able to pull this tree, or should I ask Linus to pull it directly?
>
> It contains mpc5200 and xilinx stuff.  Some of it is SPI related, but
> I'm now the SPI co-maintainer, so I have no problem with it going in
> via your tree.  :-)  Regardless, I want to get it out to Linus ASAP.
>
> This tree has also been in linux-next for a while now, so it should be
> a safe pull.
>
> Thanks,
> g.
>
>> Andrew & David, you'll notice that I've also got some SPI and MMC
>> changes in this branch (PPC and OF related stuff) since there is no
>> current MMC maintainer, and some of these SPI patches have been
>> hanging around for a while now.  Let me know if you object to me
>> pushing these changes personally instead of going through another
>> maintainer.
>>
>> Thanks,
>> g.
>>
>> The following changes since commit b419148e567728f6af0c3b01965c1cc141e3e13a:
>>  Linus Torvalds (1):
>>        Linux 2.6.32-rc6
>>
>> are available in the git repository at:
>>
>>  git://git.secretlab.ca/git/linux-2.6 next
>>
>> Albrecht Dreß (1):
>>      powerpc: tiny memcpy_(to|from)io optimisation
>>
>> Grant Likely (4):
>>      spi/mpc5200: Register SPI devices described in device tree
>>      powerpc/5200: Add mpc5200-spi (non-PSC) device driver
>>      powerpc/5200: add general purpose timer API for the MPC5200
>>      mmc: fix missing module license declaration in of_mmc_spi.c
>>
>> John Bonesio (1):
>>      powerpc/5200: add LocalPlus bus FIFO device driver
>>
>> John Linn (1):
>>      Xilinx: SPI: Fix bits_per_word for transfers
>>
>> Wolfram Sang (2):
>>      spi/mpc52xx-psc-spi: check for valid PSC
>>      spi/mpc52xx: replace printk with dev_err
>>
>>  arch/powerpc/include/asm/mpc52xx.h            |   46 ++
>>  arch/powerpc/kernel/io.c                      |    4 +-
>>  arch/powerpc/platforms/52xx/Kconfig           |    5 +
>>  arch/powerpc/platforms/52xx/Makefile          |    1 +
>>  arch/powerpc/platforms/52xx/mpc52xx_gpt.c     |  133 ++++++-
>>  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c |  560 +++++++++++++++++++++++++
>>  drivers/mmc/host/of_mmc_spi.c                 |    2 +
>>  drivers/spi/Kconfig                           |    8 +
>>  drivers/spi/Makefile                          |    1 +
>>  drivers/spi/mpc52xx_psc_spi.c                 |   25 +-
>>  drivers/spi/mpc52xx_spi.c                     |  520 +++++++++++++++++++++++
>>  drivers/spi/xilinx_spi.c                      |    3 +-
>>  include/linux/spi/mpc52xx_spi.h               |   10 +
>>  13 files changed, 1297 insertions(+), 21 deletions(-)
>>  create mode 100644 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
>>  create mode 100644 drivers/spi/mpc52xx_spi.c
>>  create mode 100644 include/linux/spi/mpc52xx_spi.h
>>
>>
>> --
>> Grant Likely, B.Sc., P.Eng.
>> Secret Lab Technologies Ltd.
>>
>
>
>
> --
> Grant Likely, B.Sc., P.Eng.
> Secret Lab Technologies Ltd.
>

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Benjamin Herrenschmidt]

On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote:

>
> Are you able to pull this tree, or should I ask Linus to pull it
> directly?
>
> It contains mpc5200 and xilinx stuff.  Some of it is SPI related, but
> I'm now the SPI co-maintainer, so I have no problem with it going in
> via your tree.  :-)  Regardless, I want to get it out to Linus ASAP.
>
> This tree has also been in linux-next for a while now, so it should be
> a safe pull.

I'll pull it, I'll pull it, stop nagging :-)

Cheers,
Ben.


_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Andrew Morton-9]

On Wed, 09 Dec 2009 09:29:43 +1100
Benjamin Herrenschmidt <benh@...> wrote:

> On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote:
> >
> > Are you able to pull this tree, or should I ask Linus to pull it
> > directly?
> >
> > It contains mpc5200 and xilinx stuff.  Some of it is SPI related, but
> > I'm now the SPI co-maintainer, so I have no problem with it going in
> > via your tree.  :-)  Regardless, I want to get it out to Linus ASAP.
> >
> > This tree has also been in linux-next for a while now, so it should be
> > a safe pull.
>
> I'll pull it, I'll pull it, stop nagging :-)
>

ooh, does nagging work?

<writes that down somewhere>
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Grant Likely-2]

On Tue, Dec 8, 2009 at 3:45 PM, Andrew Morton <akpm@...> wrote:

> On Wed, 09 Dec 2009 09:29:43 +1100
> Benjamin Herrenschmidt <benh@...> wrote:
>
>> On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote:
>> >
>> > Are you able to pull this tree, or should I ask Linus to pull it
>> > directly?
>> >
>> > It contains mpc5200 and xilinx stuff.  Some of it is SPI related, but
>> > I'm now the SPI co-maintainer, so I have no problem with it going in
>> > via your tree.  :-)  Regardless, I want to get it out to Linus ASAP.
>> >
>> > This tree has also been in linux-next for a while now, so it should be
>> > a safe pull.
>>
>> I'll pull it, I'll pull it, stop nagging :-)
>>
>
> ooh, does nagging work?
>
> <writes that down somewhere>

w00t!

g.

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Olof Johansson-2]

On Tue, Dec 08, 2009 at 02:45:05PM -0800, Andrew Morton wrote:

> On Wed, 09 Dec 2009 09:29:43 +1100
> Benjamin Herrenschmidt <benh@...> wrote:
>
> > On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote:
> > > This tree has also been in linux-next for a while now, so it should be
> > > a safe pull.
> >
> > I'll pull it, I'll pull it, stop nagging :-)
> >
>
> ooh, does nagging work?
>
> <writes that down somewhere>

Remains to be seen. He hasn't actually pulled it yet, has he? :)


-Olof
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Benjamin Herrenschmidt]

On Tue, 2009-12-08 at 22:25 -0600, Olof Johansson wrote:

> On Tue, Dec 08, 2009 at 02:45:05PM -0800, Andrew Morton wrote:
> > On Wed, 09 Dec 2009 09:29:43 +1100
> > Benjamin Herrenschmidt <benh@...> wrote:
> >
> > > On Tue, 2009-12-08 at 14:33 -0700, Grant Likely wrote:
> > > > This tree has also been in linux-next for a while now, so it should be
> > > > a safe pull.
> > >
> > > I'll pull it, I'll pull it, stop nagging :-)
> > >
> >
> > ooh, does nagging work?
> >
> > <writes that down somewhere>
>
> Remains to be seen. He hasn't actually pulled it yet, has he? :)

Well, actually I have ... but I haven't pushed the result out yet :-)

Cheers,
Ben.


_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Luotao Fu]

Hi Grant,

Grant Likely wrote:
> Hi Ben, Stephen.
>
> I just prepared my next branch for 2.6.33:
> git://git.secretlab.ca/git/linux-2.6 next
>

Just for curiosity: I noticed that you keep so far the further patches for the
dedicated spi controller on mpc5200 in the next-spi tree. Any plan when they
will be merged to the -next tree? Like mentioned before, some of them are
essential, without which the driver doesn't work (at least on my board)

sorry for nagging. ;-)

thanks

cheers
Luotao Fu
--
Pengutronix e.K.                           | Dipl.-Ing. Luotao Fu        |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: [phone]    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   [phone]-5555 |
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev

[Grant Likely-2]

On Wed, Dec 9, 2009 at 2:26 AM, Luotao Fu <l.fu@...> wrote:

> Hi Grant,
>
> Grant Likely wrote:
>> Hi Ben, Stephen.
>>
>> I just prepared my next branch for 2.6.33:
>> git://git.secretlab.ca/git/linux-2.6 next
>>
>
> Just for curiosity: I noticed that you keep so far the further patches for the
> dedicated spi controller on mpc5200 in the next-spi tree. Any plan when they
> will be merged to the -next tree? Like mentioned before, some of them are
> essential, without which the driver doesn't work (at least on my board)

I based the next-spi tree on my regular next tree (which was
convenient, but lead to it looking like I had inappropriate stuff in
my spi tree).  Once Ben asks Linus to pull his tree it will all look
correct.  I'll ask Linux to pull my next-spi tree directly after Ben's
tree is in.

g.

--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@...
https://lists.ozlabs.org/listinfo/linuxppc-dev