Commit df6d3916 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

: (77 commits)
  [POWERPC] Abolish powerpc_flash_init()
  [POWERPC] Early serial debug support for PPC44x
  [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
  [POWERPC] Add device tree for Ebony
  [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
  [POWERPC] MPIC U3/U4 MSI backend
  [POWERPC] MPIC MSI allocator
  [POWERPC] Enable MSI mappings for MPIC
  [POWERPC] Tell Phyp we support MSI
  [POWERPC] RTAS MSI implementation
  [POWERPC] PowerPC MSI infrastructure
  [POWERPC] Rip out the existing powerpc msi stubs
  [POWERPC] Remove use of 4level-fixup.h for ppc32
  [POWERPC] Add powerpc PCI-E reset API implementation
  [POWERPC] Holly bootwrapper
  [POWERPC] Holly DTS
  [POWERPC] Holly defconfig
  [POWERPC] Add support for 750CL Holly board
  [POWERPC] Generalize tsi108 PCI setup
  [POWERPC] Generalize tsi108 PHY types
  ...

Fixed conflict in include/asm-powerpc/kdebug.h manually

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parents 74add80c 197686df

Documentation/powerpc/booting-without-of.txt

+4 −0
Original line number Diff line number Diff line
@@ -1560,6 +1560,9 @@ platforms are moved over to use the flattened-device-tree model. 
     network device.  This is used by the bootwrapper to interpret

     MAC addresses passed by the firmware when no information other

     than indices is available to associate an address with a device.

   - phy-connection-type : a string naming the controller/PHY interface type,

     i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "tbi",

     or "rtbi".



   Example:

	ucc@2000 {
@@ -1574,6 +1577,7 @@ platforms are moved over to use the flattened-device-tree model. 
		rx-clock = "none";

		tx-clock = "clk9";

		phy-handle = <212000>;

		phy-connection-type = "gmii";

		pio-handle = <140001>;

	};

arch/powerpc/Kconfig

+17 −2
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ config GENERIC_BUG 
	default y

	depends on BUG



config SYS_SUPPORTS_APM_EMULATION

	bool



#

# Powerpc uses the slab allocator to manage its ptes and the

# page structs of ptes are used for splitting the page table
@@ -136,6 +139,11 @@ config DEFAULT_UIMAGE 
	  Used to allow a board to specify it wants a uImage built by default

	default n



config PPC64_SWSUSP

	bool

	depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))

	default y



menu "Processor support"

choice

	prompt "Processor Type"
@@ -206,6 +214,7 @@ config 40x 
config 44x

	bool "AMCC 44x"

	select PPC_DCR_NATIVE

	select WANT_DEVICE_TREE



config E200

	bool "Freescale e200"
@@ -270,9 +279,14 @@ config PPC_OF_PLATFORM_PCI 
	depends on PPC64 # not supported on 32 bits yet

	default n



config 4xx

	bool

	depends on 40x || 44x

	default y



config BOOKE

	bool

	depends on E200 || E500

	depends on E200 || E500 || 44x

	default y



config FSL_BOOKE
@@ -669,11 +683,12 @@ config MCA 
config PCI

	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \

		|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \

		|| MPC7448HPC2 || PPC_PS3

		|| MPC7448HPC2 || PPC_PS3 || PPC_HOLLY

	default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \

		&& !PPC_85xx && !PPC_86xx

	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS

	default PCI_QSPAN if !4xx && !CPM2 && 8xx

	select ARCH_SUPPORTS_MSI

	help

	  Find out whether your system includes a PCI bus. PCI is the name of

	  a bus system, i.e. the way the CPU talks to the other stuff inside

arch/powerpc/Kconfig.debug

+18 −4
Original line number Diff line number Diff line
@@ -139,10 +139,6 @@ config BOOTX_TEXT 
	  Say Y here to see progress messages from the boot firmware in text

	  mode. Requires either BootX or Open Firmware.



config SERIAL_TEXT_DEBUG

	bool "Support for early boot texts over serial port"

	depends on 4xx



config PPC_EARLY_DEBUG

	bool "Early debugging (dangerous)"
@@ -207,6 +203,24 @@ config PPC_EARLY_DEBUG_BEAT 
	help

	  Select this to enable early debugging for Celleb with Beat.



config PPC_EARLY_DEBUG_44x

	bool "Early serial debugging for IBM/AMCC 44x CPUs"

	depends on 44x

	select PPC_UDBG_16550

	help

	  Select this to enable early debugging for IBM 44x chips via the

	  inbuilt serial port.



endchoice



config PPC_EARLY_DEBUG_44x_PHYSLOW

	hex "Low 32 bits of early debug UART physical address"

	depends PPC_EARLY_DEBUG_44x

	default "0x40000200"



config PPC_EARLY_DEBUG_44x_PHYSHIGH

	hex "EPRN of early debug UART physical address"

	depends PPC_EARLY_DEBUG_44x

	default "0x1"



endmenu

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ all: $(KBUILD_IMAGE) 


CPPFLAGS_vmlinux.lds	:= -Upowerpc



BOOT_TARGETS = zImage zImage.initrd uImage cuImage

BOOT_TARGETS = zImage zImage.initrd uImage



PHONY += $(BOOT_TARGETS)

arch/powerpc/boot/44x.c

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2007 David Gibson, IBM Corporation.

 *

 * Based on earlier code:

 *   Matt Porter <mporter@kernel.crashing.org>

 *   Copyright 2002-2005 MontaVista Software Inc.

 *

 *   Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>

 *   Copyright (c) 2003, 2004 Zultys Technologies

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#include <stddef.h>

#include "types.h"

#include "string.h"

#include "stdio.h"

#include "ops.h"

#include "reg.h"

#include "dcr.h"



/* Read the 44x memory controller to get size of system memory. */

void ibm44x_fixup_memsize(void)

{

	int i;

	unsigned long memsize, bank_config;



	memsize = 0;

	for (i = 0; i < ARRAY_SIZE(sdram_bxcr); i++) {

		mtdcr(DCRN_SDRAM0_CFGADDR, sdram_bxcr[i]);

		bank_config = mfdcr(DCRN_SDRAM0_CFGDATA);



		if (bank_config & SDRAM_CONFIG_BANK_ENABLE)

			memsize += SDRAM_CONFIG_BANK_SIZE(bank_config);

	}



	dt_fixup_memory(0, memsize);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE