From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: John Rigby <jrigby@freescale.com>
Cc: linuxppc-dev@ozlabs.org
Subject: Re: [PATCH 1/2] powerpc: pci config cleanup
Date: Thu, 26 Jun 2008 08:53:42 +1000 [thread overview]
Message-ID: <1214434422.8011.423.camel@pasglop> (raw)
In-Reply-To: <1214425164-1267-2-git-send-email-jrigby@freescale.com>
On Wed, 2008-06-25 at 14:19 -0600, John Rigby wrote:
> change
> bool "PCI support" if <long ugly expression>
> to
> bool "PCI support" if PPC_HAS_PCI
>
> and add select PPC_HAS_PCI to all the config nodes that
> were previously in the PCI if expression
>
> Signed-off-by: John Rigby <jrigby@freescale.com>
> ---
> arch/powerpc/Kconfig | 9 +++++----
> arch/powerpc/platforms/52xx/Kconfig | 1 +
> arch/powerpc/platforms/83xx/Kconfig | 1 +
> arch/powerpc/platforms/85xx/Kconfig | 2 +-
> arch/powerpc/platforms/86xx/Kconfig | 2 ++
> arch/powerpc/platforms/Kconfig | 1 +
> arch/powerpc/platforms/Kconfig.cputype | 2 ++
> arch/powerpc/platforms/iseries/Kconfig | 1 +
> arch/powerpc/platforms/ps3/Kconfig | 1 +
> arch/powerpc/platforms/pseries/Kconfig | 1 +
> 10 files changed, 16 insertions(+), 5 deletions(-)
Out of curiosity... what is causing PCI to be enabled for powermac,
maple and cell ?
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 3934e26..fa9bd91 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -542,11 +542,12 @@ config FSL_LBC
> config MCA
> bool
>
> +config PPC_HAS_PCI
> + bool
> +
> config PCI
> - bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
> - || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
> - || PPC_PS3 || 44x
> - default y if !40x && !CPM2 && !8xx && !PPC_MPC512x && !PPC_83xx \
> + bool "PCI support" if PPC_HAS_PCI
> + default y if !40x && !CPM2 && !8xx && !PPC_83xx \
> && !PPC_85xx && !PPC_86xx
> default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
> default PCI_QSPAN if !4xx && !CPM2 && 8xx
> diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
> index acd2fc8..fb4b19a 100644
> --- a/arch/powerpc/platforms/52xx/Kconfig
> +++ b/arch/powerpc/platforms/52xx/Kconfig
> @@ -3,6 +3,7 @@ config PPC_MPC52xx
> depends on PPC_MULTIPLATFORM && PPC32
> select FSL_SOC
> select PPC_CLOCK
> + select PPC_HAS_PCI
>
> config PPC_MPC5200_SIMPLE
> bool "Generic support for simple MPC5200 based boards"
> diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
> index 583b0c7..ccac363 100644
> --- a/arch/powerpc/platforms/83xx/Kconfig
> +++ b/arch/powerpc/platforms/83xx/Kconfig
> @@ -2,6 +2,7 @@ menuconfig MPC83xx
> bool "83xx Board Type"
> depends on PPC_83xx
> select PPC_UDBG_16550
> + select PPC_HAS_PCI
> select PPC_INDIRECT_PCI
>
> if MPC83xx
> diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
> index 7ff29d5..8b38ff7 100644
> --- a/arch/powerpc/platforms/85xx/Kconfig
> +++ b/arch/powerpc/platforms/85xx/Kconfig
> @@ -2,8 +2,8 @@ menuconfig MPC85xx
> bool "Machine Type"
> depends on PPC_85xx
> select PPC_UDBG_16550
> - select PPC_INDIRECT_PCI if PCI
> select MPIC
> + select PPC_HAS_PCI
> select FSL_PCI if PCI
> select SERIAL_8250_SHARE_IRQ if SERIAL_8250
> default y
> diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
> index 053f49a..efea617 100644
> --- a/arch/powerpc/platforms/86xx/Kconfig
> +++ b/arch/powerpc/platforms/86xx/Kconfig
> @@ -28,6 +28,7 @@ endchoice
>
> config MPC8641
> bool
> + select PPC_HAS_PCI
> select FSL_PCI if PCI
> select PPC_UDBG_16550
> select MPIC
> @@ -35,6 +36,7 @@ config MPC8641
>
> config MPC8610
> bool
> + select PPC_HAS_PCI
> select FSL_PCI if PCI
> select PPC_UDBG_16550
> select MPIC
> diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
> index 87454c5..cc68ab3 100644
> --- a/arch/powerpc/platforms/Kconfig
> +++ b/arch/powerpc/platforms/Kconfig
> @@ -280,6 +280,7 @@ config CPM2
> depends on MPC85xx || 8260
> select CPM
> select PPC_LIB_RHEAP
> + select PPC_PCI
> help
> The CPM2 (Communications Processor Module) is a coprocessor on
> embedded CPUs made by Freescale. Selecting this option means that
> diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
> index f7efaa9..db8add6 100644
> --- a/arch/powerpc/platforms/Kconfig.cputype
> +++ b/arch/powerpc/platforms/Kconfig.cputype
> @@ -42,12 +42,14 @@ config 40x
> select PPC_DCR_NATIVE
> select PPC_UDBG_16550
> select 4xx_SOC
> + select PPC_HAS_PCI
>
> config 44x
> bool "AMCC 44x"
> select PPC_DCR_NATIVE
> select PPC_UDBG_16550
> select 4xx_SOC
> + select PPC_HAS_PCI
>
> config E200
> bool "Freescale e200"
> diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
> index 761d9e9..c19c455 100644
> --- a/arch/powerpc/platforms/iseries/Kconfig
> +++ b/arch/powerpc/platforms/iseries/Kconfig
> @@ -2,6 +2,7 @@ config PPC_ISERIES
> bool "IBM Legacy iSeries"
> depends on PPC_MULTIPLATFORM && PPC64
> select PPC_INDIRECT_IO
> + select PPC_HAS_PCI if EMBEDDED
>
> menu "iSeries device drivers"
> depends on PPC_ISERIES
> diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
> index a5f4e95..b50ea02 100644
> --- a/arch/powerpc/platforms/ps3/Kconfig
> +++ b/arch/powerpc/platforms/ps3/Kconfig
> @@ -8,6 +8,7 @@ config PPC_PS3
> select USB_ARCH_HAS_EHCI
> select USB_EHCI_BIG_ENDIAN_MMIO
> select MEMORY_HOTPLUG
> + select PPC_PCI
> help
> This option enables support for the Sony PS3 game console
> and other platforms using the PS3 hypervisor. Enabling this
> diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
> index 07fe5b6..e205066 100644
> --- a/arch/powerpc/platforms/pseries/Kconfig
> +++ b/arch/powerpc/platforms/pseries/Kconfig
> @@ -7,6 +7,7 @@ config PPC_PSERIES
> select RTAS_ERROR_LOGGING
> select PPC_UDBG_16550
> select PPC_NATIVE
> + select PPC_HAS_PCI if EMBEDDED
> default y
>
> config PPC_SPLPAR
next prev parent reply other threads:[~2008-06-25 22:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-25 20:19 [PATCH 0/2] powerpc: pci cleanup John Rigby
2008-06-25 20:19 ` [PATCH 1/2] powerpc: pci config cleanup John Rigby
2008-06-25 20:19 ` [PATCH 2/2] powerpc: Move mpc83xx_add_bridge to fsl_pci.c John Rigby
2008-06-25 22:53 ` Benjamin Herrenschmidt [this message]
2008-06-26 0:53 ` [PATCH 1/2] powerpc: pci config cleanup Michael Ellerman
2008-06-26 3:32 ` John Rigby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1214434422.8011.423.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=jrigby@freescale.com \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).