From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933161AbaLDV1z (ORCPT ); Thu, 4 Dec 2014 16:27:55 -0500 Received: from smtp02.smtpout.orange.fr ([80.12.242.124]:39341 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932905AbaLDV1y (ORCPT ); Thu, 4 Dec 2014 16:27:54 -0500 X-ME-Helo: beldin X-ME-Date: Thu, 04 Dec 2014 22:27:53 +0100 X-ME-IP: 109.214.46.91 From: Robert Jarzmik To: Daniel Mack Cc: Haojian Zhuang , Russell King , Rob Herring , Marc Zyngier , Dmitry Eremin-Solenikov , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: pxa: arbitrarily set first interrupt number References: <1416867502-6877-1-git-send-email-robert.jarzmik@free.fr> X-URL: http://belgarath.falguerolles.org/ Date: Thu, 04 Dec 2014 22:27:50 +0100 In-Reply-To: <1416867502-6877-1-git-send-email-robert.jarzmik@free.fr> (Robert Jarzmik's message of "Mon, 24 Nov 2014 23:18:22 +0100") Message-ID: <87zjb3xfzd.fsf@free.fr> User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.92 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Robert Jarzmik writes: > As IRQ0, the legacy timer interrupt should not be used as an interrupt > number, shift the interrupts by a fixed number. > > As we had in a special case a shift of 16 when ISA bus was used on a > PXA, use that value as the first interrupt number, regardless of ISA or > not. > > Signed-off-by: Robert Jarzmik > --- > arch/arm/mach-pxa/Kconfig | 5 ----- > arch/arm/mach-pxa/include/mach/irqs.h | 9 ++------- > 2 files changed, 2 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig > index e6690a4..bfca4ead 100644 > --- a/arch/arm/mach-pxa/Kconfig > +++ b/arch/arm/mach-pxa/Kconfig > @@ -73,14 +73,12 @@ config ARCH_VIPER > select I2C_GPIO if I2C=y > select ISA > select PXA25x > - select PXA_HAVE_ISA_IRQS > > config MACH_ARCOM_ZEUS > bool "Arcom/Eurotech ZEUS SBC" > select ARCOM_PCMCIA > select ISA > select PXA27x > - select PXA_HAVE_ISA_IRQS > > config MACH_BALLOON3 > bool "Balloon 3 board" > @@ -680,9 +678,6 @@ config SHARPSL_PM_MAX1111 > select SPI > select SPI_MASTER > > -config PXA_HAVE_ISA_IRQS > - bool > - > config PXA310_ULPI > bool > > diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h > index 48c2fd8..83e04d4 100644 > --- a/arch/arm/mach-pxa/include/mach/irqs.h > +++ b/arch/arm/mach-pxa/include/mach/irqs.h > @@ -12,14 +12,9 @@ > #ifndef __ASM_MACH_IRQS_H > #define __ASM_MACH_IRQS_H > > -#ifdef CONFIG_PXA_HAVE_ISA_IRQS > -#define PXA_ISA_IRQ(x) (x) > -#define PXA_ISA_IRQ_NUM (16) > -#else > -#define PXA_ISA_IRQ_NUM (0) > -#endif > +#include > > -#define PXA_IRQ(x) (PXA_ISA_IRQ_NUM + (x)) > +#define PXA_IRQ(x) (NR_IRQS_LEGACY + (x)) > > #define IRQ_SSP3 PXA_IRQ(0) /* SSP3 service request */ > #define IRQ_MSL PXA_IRQ(1) /* MSL Interface interrupt */ OK, nobody objected nor acked. I'll queue that up in pxa/for-next then. -- Robert