Fwd: Please pull linux-2.6-mpc52xx.git

Fwd: Please pull linux-2.6-mpc52xx.git

[Grant Likely]

Paulus, please pull the following mpc52xx related changes.

The following changes since commit 2fb59d623ad85dfdb8ce03a660051743f7361896:
  Linus Torvalds (1):
        Merge branch 'audit.b43' of git://git.kernel.org/.../viro/audit-current

are available in the git repository at:

  git://git.secretlab.ca/git/linux-2.6-mpc52xx.git for-2.6.24

Grant Likely (1):
      [POWERPC] bestcomm: Restrict bus prefetch bugfix to original
mpc5200 silicon.

Marian Balakowicz (4):
      [POWERPC] Add mpc52xx_find_and_map_path(), refactor utility functions
      [POWERPC] Update device tree binding for mpc5200 gpt
      [POWERPC] Add restart support for mpc52xx based platforms
      [POWERPC] Enable restart support for lite5200 board

 .../powerpc/mpc52xx-device-tree-bindings.txt       |    4 +-
 arch/powerpc/boot/dts/lite5200.dts                 |   26 +++-----
 arch/powerpc/boot/dts/lite5200b.dts                |   26 +++-----
 arch/powerpc/platforms/52xx/lite5200.c             |    4 +
 arch/powerpc/platforms/52xx/mpc52xx_common.c       |   71 ++++++++++++++++++-
 arch/powerpc/sysdev/bestcomm/bestcomm.c            |    9 ++-
 drivers/watchdog/mpc5200_wdt.c                     |    3 +
 include/asm-powerpc/mpc52xx.h                      |    9 +++
 8 files changed, 109 insertions(+), 43 deletions(-)


--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195

Fwd: Please pull linux-2.6-mpc52xx.git

[Grant Likely]

(resend; including the mailing list this time)

Paul,

Please pull my mpc52xx tree.  It contains the MPC512x work which John
Rigby has been doing.  I should have got these out to you sooner, but
I forgot about them.  :-(

Cheers,
g.

The following changes since commit 99e139126ab2e84be67969650f92eb37c12ab5cd:
  Michael Ellerman (1):
        [POWERPC] Cell IOMMU fixed mapping support

are available in the git repository at:

  git://git.secretlab.ca/git/linux-2.6-mpc52xx.git for-2.6.25

John Rigby (4):
      [POWERPC] mpc512x: Basic platform support
      [POWERPC] mpc512x: Device tree for MPC5121 ADS
      [POWERPC] mpc512x: Factor out 5200 dependencies from 52xx psc driver
      [POWERPC] mpc512x: Add MPC512x PSC support to MPC52xx psc driver

 arch/powerpc/Kconfig                      |    2 +-
 arch/powerpc/boot/dts/mpc5121ads.dts      |  122 ++++++++
 arch/powerpc/platforms/512x/Kconfig       |   20 ++
 arch/powerpc/platforms/512x/Makefile      |    4 +
 arch/powerpc/platforms/512x/mpc5121_ads.c |  104 +++++++
 arch/powerpc/platforms/Kconfig            |    1 +
 arch/powerpc/platforms/Kconfig.cputype    |    6 +-
 arch/powerpc/platforms/Makefile           |    1 +
 drivers/serial/Kconfig                    |   12 +-
 drivers/serial/mpc52xx_uart.c             |  431 ++++++++++++++++++++++++-----
 include/asm-powerpc/mpc512x.h             |   22 ++
 include/asm-powerpc/mpc52xx_psc.h         |   48 ++++
 12 files changed, 694 insertions(+), 79 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/mpc5121ads.dts
 create mode 100644 arch/powerpc/platforms/512x/Kconfig
 create mode 100644 arch/powerpc/platforms/512x/Makefile
 create mode 100644 arch/powerpc/platforms/512x/mpc5121_ads.c
 create mode 100644 include/asm-powerpc/mpc512x.h


--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Re: Fwd: Please pull linux-2.6-mpc52xx.git

[Olof Johansson]

Hi,

On Wed, Feb 06, 2008 at 02:34:24PM -0700, Grant Likely wrote:

> John Rigby (4):
>       [POWERPC] mpc512x: Basic platform support
>       [POWERPC] mpc512x: Device tree for MPC5121 ADS
>       [POWERPC] mpc512x: Factor out 5200 dependencies from 52xx psc driver
>       [POWERPC] mpc512x: Add MPC512x PSC support to MPC52xx psc driver

mpc52xx_defconfig no longer builds for me, and the two latter of the
above patches are the ones that touch that file:

(from powerpc.git HEAD=de0723dcca6e593a12a259798a54eb0e82628fb8, seems
to include this pull):

drivers/serial/mpc52xx_uart.c:137: error: 'mpc52xx_psc_ops' undeclared here (not in a function)
drivers/serial/mpc52xx_uart.c:149: error: conflicting types for 'mpc52xx_uart_of _match'
drivers/serial/mpc52xx_uart.c:135: error: previous definition of 'mpc52xx_uart_of_match' was here
drivers/serial/mpc52xx_uart.c:153: warning: braces around scalar initializer
drivers/serial/mpc52xx_uart.c:153: warning: (near initialization for 'mpc52xx_uart_of_match[0].data')
drivers/serial/mpc52xx_uart.c:153: error: empty scalar initializer
drivers/serial/mpc52xx_uart.c:153: error: (near initialization for 'mpc52xx_uart_of_match[0].data')
drivers/serial/mpc52xx_uart.c:154: error: expected '}' before ';' token
drivers/serial/mpc52xx_uart.c:157:2: error: #endif without #if


-Olof

Re: Fwd: Please pull linux-2.6-mpc52xx.git

[Grant Likely]

On 2/6/08, Olof Johansson <olof@lixom.net> wrote:
> Hi,
>
> On Wed, Feb 06, 2008 at 02:34:24PM -0700, Grant Likely wrote:
>
> > John Rigby (4):
> >       [POWERPC] mpc512x: Basic platform support
> >       [POWERPC] mpc512x: Device tree for MPC5121 ADS
> >       [POWERPC] mpc512x: Factor out 5200 dependencies from 52xx psc driver
> >       [POWERPC] mpc512x: Add MPC512x PSC support to MPC52xx psc driver
>
> mpc52xx_defconfig no longer builds for me, and the two latter of the
> above patches are the ones that touch that file:

Gah!  I caused some patch damage when I rebased the patches.  I'll
send a fixup patch ASAP.

Cheers,
g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.