From patchwork Tue Jul 20 04:07:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cory Maccarrone X-Patchwork-Id: 112950 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6K480h8019242 for ; Tue, 20 Jul 2010 04:08:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751584Ab0GTEH7 (ORCPT ); Tue, 20 Jul 2010 00:07:59 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:60023 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269Ab0GTEH6 (ORCPT ); Tue, 20 Jul 2010 00:07:58 -0400 Received: by iwn7 with SMTP id 7so5354123iwn.19 for ; Mon, 19 Jul 2010 21:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=Oz7XcEHtg3Jogv1q89qNPEJ+Uq9gtc3aHGn+a2TXZtw=; b=Q0ZwfThVrKAUZoGtgYYZE9PVaqcV9Jctq0kc3N48CjMAZ/DhYCkrh02AfU2FU+mOs7 Vjab6w7ZAn97x/CBaPt9b74WFeya7JSUGRgMPgMhxYg85MUUeGakdDW2M7Wgs7qC4iUy Yid2MHScU35ig4aY7pxoDeM3WuzVGgt9L6ejc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=ZKZwxST1SGf+3pGIgVCVXjxKeIpuN5pyVHSNyP8kpIYnse54EaHNHVHDFS0wIVvDtu LnioOmA5wmlMidtN6szIfwhDS77cJEU+nrmYTcUVqnEuNz3wasNk/w3C1jhx/kG8c8JW tAWFNiDtzVsCLAlTZLVP9WmPYwmXFINdOILMI= Received: by 10.231.144.15 with SMTP id x15mr6229658ibu.73.1279598877745; Mon, 19 Jul 2010 21:07:57 -0700 (PDT) Received: from localhost ([12.130.106.87]) by mx.google.com with ESMTPS id r3sm27121754ibk.1.2010.07.19.21.07.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 19 Jul 2010 21:07:57 -0700 (PDT) From: Cory Maccarrone To: linux-omap@vger.kernel.org Cc: Cory Maccarrone Subject: [PATCH 2/7] [OMAP] Add allowance for extra IRQ space Date: Mon, 19 Jul 2010 21:07:41 -0700 Message-Id: <1279598866-18716-1-git-send-email-darkstar6262@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Jul 2010 04:08:00 +0000 (UTC) diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 5bc7a79..5ebbd91 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -20,6 +20,24 @@ config OMAP_GPIO_EXTRA128 Add an extra 128 gpio numbers to the available GPIO pool. This is available for boards that need extra gpios for external devices. +config OMAP_IRQ_EXTRA + int + default 128 if OMAP_IRQ_EXTRA128 + default 64 if OMAP_IRQ_EXTRA64 + default 0 + +config OMAP_IRQ_EXTRA64 + bool + help + Add an extra 64 irq numbers to the available IRQ pool. This is + available for boards that need extra interrupts for external devices. + +config OMAP_IRQ_EXTRA128 + bool + help + Add an extra 128 irq numbers to the available IRQ pool. This is + available for boards that need extra interrupts for external devices. + config ARCH_OMAP_OTG bool diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index c01d9f0..2f14c78 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -409,7 +409,11 @@ #define TWL_IRQ_END TWL6030_IRQ_END #endif -#define NR_IRQS TWL_IRQ_END +/* + * Some boards require extra irq capacity to support external + * devices that generate interrupts. + */ +#define NR_IRQS (TWL_IRQ_END + CONFIG_OMAP_IRQ_EXTRA) #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32))