linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* Please pull 'next' branch of 4xx (again)
@ 2010-05-07 19:54 Josh Boyer
  2010-05-12 12:22 ` Josh Boyer
  0 siblings, 1 reply; 2+ messages in thread
From: Josh Boyer @ 2010-05-07 19:54 UTC (permalink / raw)
  To: benh; +Cc: linuxppc-dev

Hi Ben,

Two more quick patches from me for -next.  Stefrano's is the Katmai usage of
the reset type change that just went in.  The 460SX PCI-e patch has been sitting
for a while and seems to have been skipped over.

josh

The following changes since commit 1ed31d6db90d51010545921e59d369d2f92b7ac2:
  Benjamin Herrenschmidt (1):
        Merge commit 'origin/master' into next

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git next

Stefan Roese (1):
      powerpc/44x: Add reset-type to katmai.dts

Tirumala Marri (1):
      powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC.

 arch/powerpc/boot/dts/katmai.dts  |    1 +
 arch/powerpc/boot/dts/redwood.dts |  122 +++++++++++++++++++++++++++++++++++++
 arch/powerpc/sysdev/ppc4xx_pci.c  |  119 ++++++++++++++++++++++++++++++++++++
 arch/powerpc/sysdev/ppc4xx_pci.h  |   58 +++++++++++++++++
 4 files changed, 300 insertions(+), 0 deletions(-)

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Please pull 'next' branch of 4xx (again)
  2010-05-07 19:54 Please pull 'next' branch of 4xx (again) Josh Boyer
@ 2010-05-12 12:22 ` Josh Boyer
  0 siblings, 0 replies; 2+ messages in thread
From: Josh Boyer @ 2010-05-12 12:22 UTC (permalink / raw)
  To: benh; +Cc: linuxppc-dev

On Fri, May 07, 2010 at 03:54:53PM -0400, Josh Boyer wrote:
>Hi Ben,
>
>Two more quick patches from me for -next.  Stefrano's is the Katmai usage of
>the reset type change that just went in.  The 460SX PCI-e patch has been sitting
>for a while and seems to have been skipped over.

I've updated my next branch with two more patches.  Yours for the 440SPe UART
clock fix, and the new platform addition of Icon 440SPe from Stefan.  Updated
diffstat below.

Thanks,
josh

The following changes since commit 1ed31d6db90d51010545921e59d369d2f92b7ac2:
  Benjamin Herrenschmidt (1):
        Merge commit 'origin/master' into next

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git next

Benjamin Herrenschmidt (1):
      powerpc/44x: Fix UART clocks on 440SPe

Stefan Roese (2):
      powerpc/44x: Add reset-type to katmai.dts
      powerpc/44x: Add basic ICON PPC440SPe board support

Tirumala Marri (1):
      powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC.

 arch/powerpc/boot/4xx.c                    |   12 +-
 arch/powerpc/boot/dts/icon.dts             |  447 ++++++++++
 arch/powerpc/boot/dts/katmai.dts           |    1 +
 arch/powerpc/boot/dts/redwood.dts          |  122 +++
 arch/powerpc/configs/44x/icon_defconfig    | 1316 ++++++++++++++++++++++++++++
 arch/powerpc/platforms/44x/Kconfig         |   11 +
 arch/powerpc/platforms/44x/ppc44x_simple.c |    3 +-
 arch/powerpc/sysdev/ppc4xx_pci.c           |  119 +++
 arch/powerpc/sysdev/ppc4xx_pci.h           |   58 ++
 9 files changed, 2082 insertions(+), 7 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/icon.dts
 create mode 100644 arch/powerpc/configs/44x/icon_defconfig

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-05-12 12:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-07 19:54 Please pull 'next' branch of 4xx (again) Josh Boyer
2010-05-12 12:22 ` Josh Boyer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).