From patchwork Mon Aug 13 11:58:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10705 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9461223F34 for ; Mon, 13 Aug 2012 11:58:35 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6507AA184EF for ; Mon, 13 Aug 2012 11:58:35 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id g10so2893055ghb.11 for ; Mon, 13 Aug 2012 04:58:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=u9addJuEBgI6Z8Sfs6MNwySb7MZkrMTrP6BfnLQc7js=; b=D8mqkLic7Gk1V8wfv9EMWyFH2xSOTBoopubLf8J5y6ot4+dEZ3Js4kW/IfAruB4QYs KnKNlJeJzDw25c/cqsGYtuRY06UPYfNvpeDCKXtlgQD7hDFv4x0m6l1Vv7IB7HDzm3E4 1mcNZHmEqJQKKYnOsUKImNgNqa1Z1ltf39MwIeqSMVcCNHNW2xKXU71bC5qaDSl44/yF A4A49RyN68TrfqN6Xwe4/N26GOF5hObPA37h0u+tmVkefB+lbl8KnUQGP7rRuCI061pD DdSvIvDZJEmP7UQY13flmkIAanEXb1JpWjxpzH14IOYP1o6LFIHijgBBUQUXNod4GWwI sMCw== Received: by 10.50.95.230 with SMTP id dn6mr4995183igb.16.1344859115084; Mon, 13 Aug 2012 04:58:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp173334igc; Mon, 13 Aug 2012 04:58:34 -0700 (PDT) Received: by 10.14.182.69 with SMTP id n45mr9488706eem.28.1344859113988; Mon, 13 Aug 2012 04:58:33 -0700 (PDT) Received: from eu1sys200aog102.obsmtp.com (eu1sys200aog102.obsmtp.com. [207.126.144.113]) by mx.google.com with SMTP id u5si3675390eeo.77.2012.08.13.04.58.31 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Aug 2012 04:58:33 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.113 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.113; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.113 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob102.postini.com ([207.126.147.11]) with SMTP ID DSNKUCjr569oc6eu/0bTx6kfFeqiULYkExsx@postini.com; Mon, 13 Aug 2012 11:58:33 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 8D98611E; Mon, 13 Aug 2012 11:58:26 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 4CA2548F7; Mon, 13 Aug 2012 11:58:26 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 7906E24C07C; Mon, 13 Aug 2012 13:58:19 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Mon, 13 Aug 2012 13:58:25 +0200 From: Linus Walleij To: Cc: Linus Walleij Subject: [PATCH 7/7] ARM: u300: convert to sparse IRQs Date: Mon, 13 Aug 2012 13:58:23 +0200 Message-ID: <1344859103-29517-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmR6hJ5vendyAAqarLVIWt7Tuq/w+0aVhg6vgrwXAc30ym7B2LOG/iBK2x6QPkO64QlI+7d From: Linus Walleij This converts the U300 to use sparse IRQs, which is simple now that the number of machines are reduced. Signed-off-by: Linus Walleij --- arch/arm/Kconfig | 1 + arch/arm/mach-u300/core.c | 3 ++- arch/arm/mach-u300/include/mach/irqs.h | 2 +- arch/arm/mach-u300/timer.c | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e91c7cd..0fb682d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -937,6 +937,7 @@ config ARCH_U300 select COMMON_CLK select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB + select SPARSE_IRQ help Support for ST-Ericsson U300 series mobile platforms. diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 31cc926..ef6f602 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -38,13 +38,13 @@ #include #include #include -#include #include #include #include #include #include +#include #include "timer.h" #include "spi.h" @@ -1807,6 +1807,7 @@ MACHINE_START(U300, "Ericsson AB U335 S335/B335 Prototype Board") /* Maintainer: Linus Walleij */ .atag_offset = 0x100, .map_io = u300_map_io, + .nr_irqs = NR_IRQS_U300, .init_irq = u300_init_irq, .handle_irq = vic_handle_irq, .timer = &u300_timer, diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h index c09386b..e27425a 100644 --- a/arch/arm/mach-u300/include/mach/irqs.h +++ b/arch/arm/mach-u300/include/mach/irqs.h @@ -85,6 +85,6 @@ #define IRQ_U300_GPIO_END (U300_VIC_IRQS_END) #endif -#define NR_IRQS (IRQ_U300_GPIO_END - IRQ_U300_INTCON0_START) +#define NR_IRQS_U300 (IRQ_U300_GPIO_END - IRQ_U300_INTCON0_START) #endif diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c index 146e815..1da10e2 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c @@ -17,14 +17,15 @@ #include #include #include +#include #include +#include /* Generic stuff */ #include #include #include -#include #include "timer.h"