Skip to content

Commit

Permalink
[POWERPC] cell: Generalize io-workarounds code
Browse files Browse the repository at this point in the history
This splits cell io-workaround code into spider-pci dependent code and
a generic part, and also moves io-workarounds initialization into
cell_setup_phb.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Ishizaki Kou authored and Paul Mackerras committed Apr 24, 2008
1 parent 36f8a2c commit 7cfb62a
Show file tree
Hide file tree
Showing 8 changed files with 433 additions and 315 deletions.
2 changes: 2 additions & 0 deletions arch/powerpc/kernel/of_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ static int __devinit of_pci_phb_probe(struct of_device *dev,

/* Scan the bus */
scan_phb(phb);
if (phb->bus == NULL)
return -ENXIO;

/* Claim resources. This might need some rework as well depending
* wether we are doing probe-only or not, like assigning unassigned
Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/platforms/cell/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
obj-$(CONFIG_PPC_CELL_NATIVE) += interrupt.o iommu.o setup.o \
cbe_regs.o spider-pic.o \
pervasive.o pmu.o io-workarounds.o
pervasive.o pmu.o io-workarounds.o \
spider-pci.o
obj-$(CONFIG_CBE_RAS) += ras.o

obj-$(CONFIG_CBE_THERM) += cbe_thermal.o
Expand Down
Loading

0 comments on commit 7cfb62a

Please sign in to comment.