From patchwork Mon Jun 8 20:56:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 6568101 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8DAB8C0020 for ; Mon, 8 Jun 2015 21:06:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3DAD20452 for ; Mon, 8 Jun 2015 21:06:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D2C3520451 for ; Mon, 8 Jun 2015 21:06:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z24CD-0005s3-EG; Mon, 08 Jun 2015 21:03:01 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z247G-0000uN-25 for linux-arm-kernel@bombadil.infradead.org; Mon, 08 Jun 2015 20:57:54 +0000 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z247E-00005g-1j for linux-arm-kernel@lists.infradead.org; Mon, 08 Jun 2015 20:57:52 +0000 Received: by lbbqq2 with SMTP id qq2so88389080lbb.3 for ; Mon, 08 Jun 2015 13:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LiXiWi3j/aCWoMF9U5U3gXifpJKzzdRXRHNpNeaW4eA=; b=akzefn5vVh8EVHGDI4IYcyqIdWVKG0nTvYOOQrMN0nxrgQI0xZzIUdJQfDroivkP0P m1zzH/fjnH7yDXRlF2tSqZ5UUB8uYm5YnfowRUBKqKKV6MOS6Di9Rx30RTrcodTwkT5b hkpY/TRPxvpvyEK/YoeX38/678S9VAYOiwpIgYBz5kK+F3HrdbmsRuBv716baSRa/DOI Rr3NXxSL1co3LxwtG+tM8+bdmeLuxl5DqD79OcYyLB6yRTwBK42swAe5zauTDJZAnLHt p1aFUy7v1j4IVHJJMShCdTlaP7SzQcaoTccovNT6xwjHJtp31OuvjDQRMT7tPr5bAXDl eVJw== X-Received: by 10.152.4.98 with SMTP id j2mr19340997laj.42.1433797047104; Mon, 08 Jun 2015 13:57:27 -0700 (PDT) Received: from anuminas.rup.mentorg.com (ppp89-110-20-81.pppoe.avangarddsl.ru. [89.110.20.81]) by mx.google.com with ESMTPSA id s8sm892556las.29.2015.06.08.13.57.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Jun 2015 13:57:26 -0700 (PDT) From: Dmitry Eremin-Solenikov To: Russell King , Lee Jones Subject: [PATCH v5 12/17] ARM: sa1100: don't preallocate IRQ space for locomo Date: Mon, 8 Jun 2015 23:56:43 +0300 Message-Id: <1433797008-6246-13-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433797008-6246-1-git-send-email-dbaryshkov@gmail.com> References: <1433797008-6246-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150608_165752_418891_820227AB X-CRM114-Status: GOOD ( 11.18 ) X-Spam-Score: -2.7 (--) Cc: Andrea Adami , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As new locomo driver properly supports SPARSE_IRQ, stop playing with NR_IRQS on sa1100 (locomo was the last chip requiring NR_IRQ tricks). Signed-off-by: Dmitry Eremin-Solenikov --- arch/arm/mach-sa1100/include/mach/irqs.h | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h index 734e30e..b4b9608 100644 --- a/arch/arm/mach-sa1100/include/mach/irqs.h +++ b/arch/arm/mach-sa1100/include/mach/irqs.h @@ -79,22 +79,7 @@ #define IRQ_BOARD_START 61 #define IRQ_BOARD_END 77 -/* - * Figure out the MAX IRQ number. - * - * Neponset, SA1111 and UCB1x00 are sparse IRQ aware, so can dynamically - * allocate their IRQs above NR_IRQS. - * - * LoCoMo has 4 additional IRQs, but is not sparse IRQ aware, and so has - * to be included in the NR_IRQS calculation. - */ -#ifdef CONFIG_SHARP_LOCOMO -#define NR_IRQS_LOCOMO 4 -#else -#define NR_IRQS_LOCOMO 0 -#endif - #ifndef NR_IRQS -#define NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO) +#define NR_IRQS IRQ_BOARD_START #endif -#define SA1100_NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO) +#define SA1100_NR_IRQS IRQ_BOARD_START