From: Kyle Moffett <Kyle.D.Moffett@boeing.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>,
Timur Tabi <B04825@freescale.com>,
Kumar Gala <galak@kernel.crashing.org>,
Scott Wood <scottwood@freescale.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Kyle Moffett <Kyle.D.Moffett@boeing.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Paul Bolle <pebolle@tiscali.nl>,
Sonny Rao <sonnyrao@linux.vnet.ibm.com>,
Milton Miller <miltonm@bga.com>, Timur Tabi <timur@freescale.com>
Subject: [RFC PATCH 01/17] powerpc/mpic: Fix bogus CONFIG_BOOKE conditional
Date: Wed, 9 Nov 2011 19:06:59 -0500 [thread overview]
Message-ID: <1320883635-17194-2-git-send-email-Kyle.D.Moffett@boeing.com> (raw)
In-Reply-To: <4E42AB6F.1050900@freescale.com>
The code inside the conditional is only used by 85xx CoreNet fabric
platforms, so add a new config define and use it where necessary.
Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
---
arch/powerpc/platforms/85xx/Kconfig | 5 +++++
arch/powerpc/platforms/85xx/Makefile | 11 ++++++-----
arch/powerpc/platforms/Kconfig.cputype | 3 +++
arch/powerpc/sysdev/mpic.c | 6 ++----
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 45023e2..9088381 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -181,6 +181,7 @@ config P2041_RDB
select GPIO_MPC8XXX
select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC
+ select FSL_CORENET
help
This option enables support for the P2041 RDB board
@@ -194,6 +195,7 @@ config P3041_DS
select GPIO_MPC8XXX
select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC
+ select FSL_CORENET
help
This option enables support for the P3041 DS board
@@ -206,6 +208,7 @@ config P3060_QDS
select MPC8xxx_GPIO
select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC
+ select FSL_CORENET
help
This option enables support for the P3060 QDS board
@@ -219,6 +222,7 @@ config P4080_DS
select GPIO_MPC8XXX
select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC
+ select FSL_CORENET
help
This option enables support for the P4080 DS board
@@ -235,6 +239,7 @@ config P5020_DS
select GPIO_MPC8XXX
select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC
+ select FSL_CORENET
help
This option enables support for the P5020 DS board
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index bc5acb9..c6d1334 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -13,11 +13,12 @@ obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o
obj-$(CONFIG_P1010_RDB) += p1010rdb.o
obj-$(CONFIG_P1022_DS) += p1022_ds.o
obj-$(CONFIG_P1023_RDS) += p1023_rds.o
-obj-$(CONFIG_P2041_RDB) += p2041_rdb.o corenet_ds.o
-obj-$(CONFIG_P3041_DS) += p3041_ds.o corenet_ds.o
-obj-$(CONFIG_P3060_QDS) += p3060_qds.o corenet_ds.o
-obj-$(CONFIG_P4080_DS) += p4080_ds.o corenet_ds.o
-obj-$(CONFIG_P5020_DS) += p5020_ds.o corenet_ds.o
+obj-$(CONFIG_P2041_RDB) += p2041_rdb.o
+obj-$(CONFIG_P3041_DS) += p3041_ds.o
+obj-$(CONFIG_P3060_QDS) += p3060_qds.o
+obj-$(CONFIG_P4080_DS) += p4080_ds.o
+obj-$(CONFIG_P5020_DS) += p5020_ds.o
+obj-$(CONFIG_FSL_CORENET) += corenet_ds.o
obj-$(CONFIG_STX_GP3) += stx_gp3.o
obj-$(CONFIG_TQM85xx) += tqm85xx.o
obj-$(CONFIG_SBC8560) += sbc8560.o
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index fbecae0..9210e94 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -177,6 +177,9 @@ config FSL_BOOKE
select SYS_SUPPORTS_HUGETLBFS if PHYS_64BIT
default y
+config FSL_CORENET
+ bool
+
# this is for common code between PPC32 & PPC64 FSL BOOKE
config PPC_FSL_BOOK3E
bool
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 0842c6f..1a3d84a 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1642,9 +1642,9 @@ unsigned int mpic_get_irq(void)
return mpic_get_one_irq(mpic);
}
+#ifdef CONFIG_FSL_CORENET
unsigned int mpic_get_coreint_irq(void)
{
-#ifdef CONFIG_BOOKE
struct mpic *mpic = mpic_primary;
u32 src;
@@ -1664,10 +1664,8 @@ unsigned int mpic_get_coreint_irq(void)
}
return irq_linear_revmap(mpic->irqhost, src);
-#else
- return NO_IRQ;
-#endif
}
+#endif
unsigned int mpic_get_mcirq(void)
{
--
1.7.2.5
next prev parent reply other threads:[~2011-11-10 0:08 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4E42AB6F.1050900@freescale.com>
2011-11-10 0:03 ` [RFC PATCH 00/17] powerpc/e500: separate e500 from e500mc Kyle Moffett
2011-11-10 13:59 ` Kumar Gala
2011-11-10 16:17 ` Moffett, Kyle D
2011-11-10 16:30 ` Kumar Gala
2011-11-10 16:54 ` Scott Wood
2011-11-11 0:38 ` Moffett, Kyle D
2011-11-11 4:40 ` Benjamin Herrenschmidt
2011-11-15 2:32 ` [RFC PATCH 0/2] powerpc: CPU cache op cleanup Kyle Moffett
2011-11-15 22:29 ` Benjamin Herrenschmidt
2011-11-15 22:45 ` Moffett, Kyle D
2011-11-15 23:46 ` Benjamin Herrenschmidt
2011-11-16 0:25 ` Moffett, Kyle D
2011-11-16 4:40 ` Paul Mackerras
2011-11-16 20:52 ` Moffett, Kyle D
2011-11-15 2:32 ` [RFC PATCH 1/2] powerpc: Remove duplicate cacheable_memcpy/memzero functions Kyle Moffett
2011-11-15 22:31 ` Benjamin Herrenschmidt
2011-11-15 2:36 ` [RFC PATCH 00/17] powerpc/e500: separate e500 from e500mc Moffett, Kyle D
2011-11-15 2:41 ` Tabi Timur-B04825
2011-11-15 3:40 ` Kyle Moffett
2011-11-15 22:41 ` Benjamin Herrenschmidt
2011-11-10 0:06 ` Kyle Moffett
2011-11-10 0:06 ` Kyle Moffett [this message]
2011-11-10 13:33 ` [RFC PATCH 01/17] powerpc/mpic: Fix bogus CONFIG_BOOKE conditional Kumar Gala
2011-11-10 0:07 ` [RFC PATCH 02/17] powerpc: Split up PHYS_64BIT config option to fix "select" issues Kyle Moffett
2011-11-10 13:36 ` Kumar Gala
2011-11-10 14:04 ` Timur Tabi
2011-11-10 16:31 ` Moffett, Kyle D
2011-11-10 16:50 ` Timur Tabi
2011-11-11 4:50 ` Benjamin Herrenschmidt
2011-11-11 13:12 ` Tabi Timur-B04825
2011-11-10 0:07 ` [RFC PATCH 03/17] fsl_rio: Remove FreeScale e500 conditionals Kyle Moffett
2011-11-10 0:07 ` [RFC PATCH 04/17] powerpc: Allow multiple machine-check handlers Kyle Moffett
2011-11-10 13:37 ` Kumar Gala
2011-11-10 16:33 ` Moffett, Kyle D
2011-11-10 0:07 ` [RFC PATCH 05/17] powerpc/e500: Remove unused "default e500" from CPU table Kyle Moffett
2011-11-10 0:07 ` [RFC PATCH 06/17] powerpc/e500: Split FreeScale e500v1/v2 and e500mc config options Kyle Moffett
2011-11-10 0:07 ` [RFC PATCH 07/17] powerpc/e200: Rename CONFIG_E200 => CONFIG_FSL_E200 Kyle Moffett
2011-11-10 0:07 ` [RFC PATCH 08/17] powerpc/e500: Remove conditional "lwsync" substitution Kyle Moffett
2011-11-10 13:40 ` Kumar Gala
2011-11-10 16:31 ` Scott Wood
2011-11-10 16:42 ` Kumar Gala
2011-11-10 17:03 ` Scott Wood
2011-11-10 20:27 ` Moffett, Kyle D
2011-11-10 20:34 ` Kumar Gala
2011-11-11 4:45 ` Benjamin Herrenschmidt
2011-11-11 4:43 ` Benjamin Herrenschmidt
2011-11-10 0:07 ` [RFC PATCH 09/17] powerpc/e500: Split idle handlers for e500v1/v2 and e500mc Kyle Moffett
2011-11-10 0:07 ` [RFC PATCH 10/17] powerpc/e500: Fix up the last references to CONFIG_PPC_E500MC Kyle Moffett
2011-11-10 0:07 ` [RFC PATCH 11/17] powerpc/e500: Use the correct assembler flags for e500mc and e5500 Kyle Moffett
2011-11-10 0:07 ` [RFC PATCH 12/17] powerpc/e500: Separate e500mc CPU table entries from e500v1/e500v2 Kyle Moffett
2011-11-10 0:07 ` [RFC PATCH 13/17] powerpc/e500: Add a new CONFIG_FSL_E5500 option for the e5500 Kyle Moffett
2011-11-10 13:46 ` Kumar Gala
2011-11-10 16:49 ` Scott Wood
2011-11-10 0:07 ` [RFC PATCH 14/17] powerpc/e500: Don't make kgdb use e500v1/e500v2 registers on e500mc Kyle Moffett
2011-11-10 16:46 ` Scott Wood
2011-11-10 0:07 ` [RFC PATCH 15/17] powerpc/e500: Fix up all remaining code uses of CONFIG_E500 Kyle Moffett
2011-11-10 0:07 ` [RFC PATCH 16/17] powerpc/e500: Make __setup_cpu_{e200,e500,e500mc,e5500} optional Kyle Moffett
2011-11-10 16:47 ` Scott Wood
2011-11-10 18:52 ` Kumar Gala
2011-11-10 0:07 ` [RFC PATCH 17/17] powerpc/e500: Finally remove "CONFIG_E500" Kyle Moffett
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=1320883635-17194-2-git-send-email-Kyle.D.Moffett@boeing.com \
--to=kyle.d.moffett@boeing.com \
--cc=B04825@freescale.com \
--cc=baruch@tkos.co.il \
--cc=benh@kernel.crashing.org \
--cc=galak@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=miltonm@bga.com \
--cc=paul.gortmaker@windriver.com \
--cc=paulus@samba.org \
--cc=pebolle@tiscali.nl \
--cc=scottwood@freescale.com \
--cc=sonnyrao@linux.vnet.ibm.com \
--cc=timur@freescale.com \
/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
all inboxes | Powered by JetHome®