Patchwork powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB

login
register
mail settings
Submitter Michael Ellerman
Date April 23, 2009, 8:43 a.m.
Message ID <cf386cee8d45e3aac21cfc8af3dc17c5335c516b.1240476177.git.michael@ellerman.id.au>
Download mbox | patch
Permalink /patch/26355/
State Accepted
Commit ff61e5ccc35b7159a50741fc4b992817785acd5c
Delegated to: Paul Mackerras
Headers show

Comments

Michael Ellerman - April 23, 2009, 8:43 a.m.
Currently PPC_CELL_NATIVE selects PPC_OF_PLATFORM_PCI, but does not
select PCI. This can lead to a config with the former and the latter
disabled, which does not build.

To fix this PPC_CELL_NATIVE should select PCI. However, that would
force PCI on for QPACE, which also selects PPC_CELL_NATIVE. So
instead move the select of PPC_OF_PLATFORM_PCI and PCI under both
IBM_CELL_BLADE and CELLEB.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
 arch/powerpc/platforms/cell/Kconfig |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
Arnd Bergmann - April 23, 2009, 11:07 a.m.
On Thursday 23 April 2009, Michael Ellerman wrote:
> Currently PPC_CELL_NATIVE selects PPC_OF_PLATFORM_PCI, but does not
> select PCI. This can lead to a config with the former and the latter
> disabled, which does not build.
> 
> To fix this PPC_CELL_NATIVE should select PCI. However, that would
> force PCI on for QPACE, which also selects PPC_CELL_NATIVE. So
> instead move the select of PPC_OF_PLATFORM_PCI and PCI under both
> IBM_CELL_BLADE and CELLEB.
> 
> Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

Yes, this one looks right, thanks for following up on this.

Acked-by: Arnd Bergmann <arnd@arndb.de>

Patch

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 40e24c3..50f17bd 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -13,7 +13,6 @@  config PPC_CELL_COMMON
 config PPC_CELL_NATIVE
 	bool
 	select PPC_CELL_COMMON
-	select PPC_OF_PLATFORM_PCI
 	select MPIC
 	select IBM_NEW_EMAC_EMAC4
 	select IBM_NEW_EMAC_RGMII
@@ -25,6 +24,8 @@  config PPC_IBM_CELL_BLADE
 	bool "IBM Cell Blade"
 	depends on PPC64 && PPC_BOOK3S
 	select PPC_CELL_NATIVE
+	select PPC_OF_PLATFORM_PCI
+	select PCI
 	select MMIO_NVRAM
 	select PPC_UDBG_16550
 	select UDBG_RTAS_CONSOLE
@@ -33,6 +34,8 @@  config PPC_CELLEB
 	bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
 	depends on PPC64 && PPC_BOOK3S
 	select PPC_CELL_NATIVE
+	select PPC_OF_PLATFORM_PCI
+	select PCI
 	select HAS_TXX9_SERIAL
 	select PPC_UDBG_BEAT
 	select USB_OHCI_BIG_ENDIAN_MMIO