From patchwork Thu Nov 10 00:06:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Moffett X-Patchwork-Id: 124745 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 0AAAD100D92 for ; Thu, 10 Nov 2011 11:08:22 +1100 (EST) Received: from border.exmeritus.com (border.exmeritus.com [IPv6:2002:46a7:f11a:ffff::]) by ozlabs.org (Postfix) with ESMTP id B5D0110087E for ; Thu, 10 Nov 2011 11:08:12 +1100 (EST) Received: from ysera.exmeritus.com (firewall2.exmeritus.com [10.13.38.2]) by border.exmeritus.com (Postfix) with ESMTP id AD3FCAC06E; Wed, 9 Nov 2011 19:08:10 -0500 (EST) From: Kyle Moffett To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 01/17] powerpc/mpic: Fix bogus CONFIG_BOOKE conditional Date: Wed, 9 Nov 2011 19:06:59 -0500 Message-Id: <1320883635-17194-2-git-send-email-Kyle.D.Moffett@boeing.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <4E42AB6F.1050900@freescale.com> References: <4E42AB6F.1050900@freescale.com> Cc: Baruch Siach , Sonny Rao , Timur Tabi , linux-kernel@vger.kernel.org, Milton Miller , Paul Gortmaker , Paul Mackerras , Kyle Moffett , Scott Wood , Timur Tabi , Paul Bolle X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org 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 --- 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) {