Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 867a89e0 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:
  [RAPIDIO] Change RapidIO doorbell source and target ID field to 16-bit
  [RAPIDIO] Add RapidIO connection info print out and re-training for broken connections
  [RAPIDIO] Add serial RapidIO controller support, which includes MPC8548, MPC8641
  [RAPIDIO] Add RapidIO node probing into MPC86xx_HPCN board id table
  [RAPIDIO] Add RapidIO node into MPC8641HPCN dts file
  [RAPIDIO] Auto-probe the RapidIO system size
  [RAPIDIO] Add OF-tree support to RapidIO controller driver
  [RAPIDIO] Add RapidIO multi mport support
  [RAPIDIO] Move include/asm-ppc/rio.h to asm-powerpc
  [RAPIDIO] Add RapidIO option to kernel configuration
  [RAPIDIO] Change RIO function mpc85xx_ to fsl_
  [POWERPC] Provide walk_memory_resource() for powerpc
  [POWERPC] Update lmb data structures for hotplug memory add/remove
  [POWERPC] Hotplug memory remove notifications for powerpc
  [POWERPC] windfarm: Add PowerMac 12,1 support
  [POWERPC] Fix building of pmac32 when CONFIG_NVRAM=m
  [POWERPC] Add IRQSTACKS support on ppc32
  [POWERPC] Use __always_inline for xchg* and cmpxchg*
  [POWERPC] Add fast little-endian switch system call
parents 44473d99 6c39103c

arch/powerpc/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -608,6 +608,19 @@ source "drivers/pcmcia/Kconfig" 


source "drivers/pci/hotplug/Kconfig"



config HAS_RAPIDIO

	bool

	default n



config RAPIDIO

	bool "RapidIO support"

	depends on HAS_RAPIDIO

	help

	  If you say Y here, the kernel will include drivers and

	  infrastructure code to support RapidIO interconnect devices.



source "drivers/rapidio/Kconfig"



endmenu



menu "Advanced setup"

arch/powerpc/Kconfig.debug

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ config XMON_DISASSEMBLY 


config IRQSTACKS

	bool "Use separate kernel stacks when processing interrupts"

	depends on PPC64

	help

	  If you say Y here the kernel will use separate kernel stacks

	  for handling hard and soft interrupts.  This can help avoid

arch/powerpc/boot/dts/mpc8641_hpcn.dts

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
		serial1 = &serial1;

		pci0 = &pci0;

		pci1 = &pci1;

		rapidio0 = &rapidio0;

	};



	cpus {
@@ -500,4 +501,15 @@ 
				  0x0 0x00100000>;

		};

	};

	rapidio0: rapidio@f80c0000 {

		#address-cells = <2>;

		#size-cells = <2>;

		compatible = "fsl,rapidio-delta";

		reg = <0xf80c0000 0x20000>;

		ranges = <0 0 0xc0000000 0 0x20000000>;

		interrupt-parent = <&mpic>;

		/* err_irq bell_outb_irq bell_inb_irq

			msg1_tx_irq msg1_rx_irq	msg2_tx_irq msg2_rx_irq */

		interrupts = <48 2 49 2 50 2 53 2 54 2 55 2 56 2>;

	};

};

arch/powerpc/configs/g5_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -696,6 +696,7 @@ CONFIG_WINDFARM=y 
CONFIG_WINDFARM_PM81=y

CONFIG_WINDFARM_PM91=y

CONFIG_WINDFARM_PM112=y

CONFIG_WINDFARM_PM121=y

# CONFIG_PMAC_RACKMETER is not set

CONFIG_NETDEVICES=y

# CONFIG_NETDEVICES_MULTIQUEUE is not set

arch/powerpc/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ pci64-$(CONFIG_PPC64) += pci_dn.o isa-bridge.o 
obj-$(CONFIG_PCI)		+= pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \

				   pci-common.o

obj-$(CONFIG_PCI_MSI)		+= msi.o

obj-$(CONFIG_RAPIDIO)		+= rio.o

obj-$(CONFIG_KEXEC)		+= machine_kexec.o crash.o \

				   machine_kexec_$(CONFIG_WORD_SIZE).o

obj-$(CONFIG_AUDIT)		+= audit.o