On Fri, May 21, 2010 at 10:42:34PM +1000, Benjamin Herrenschmidt wrote: >On Fri, 2010-05-21 at 06:22 -0400, Josh Boyer wrote: >> On Fri, May 21, 2010 at 07:11:28PM +1000, Benjamin Herrenschmidt wrote: >> >Hi Linus ! >> > >> >Here's the powerpc batch for this merge window. >> > >> >Most of it is in arch/powerpc, a few powerpc specific drivers are hit >> >too, including removing one that has been unused (and unselectable in >> >Kconfig) for a long time (hdpuftrs), probably remains of a long dead >> >platform. >> >> You missed my updated pull request. I still have some patches sitting in my >> -next branch that should go in. > >Allright, I'll add them asap. Might have to wait for monday tho.
You still haven't pulled these, so I added another small defconfig change for Icon. Very trivial. Updated diffstat below. josh The following changes since commit 99ec28f183daa450faa7bdad6f932364ae325648: FUJITA Tomonori (1): powerpc: Remove unused 'protect4gb' boot parameter are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git next Anatolij Gustschin (1): powerpc/44x: icon: select SM502 and frame buffer console support 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 | 1451 ++++++++++++++++++++++++++++ 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, 2217 insertions(+), 7 deletions(-) create mode 100644 arch/powerpc/boot/dts/icon.dts create mode 100644 arch/powerpc/configs/44x/icon_defconfig _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev