From patchwork Thu Mar 14 22:07:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 15357 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 D3D1F23E39 for ; Thu, 14 Mar 2013 22:07:47 +0000 (UTC) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by fiordland.canonical.com (Postfix) with ESMTP id 88B47A1814D for ; Thu, 14 Mar 2013 22:07:47 +0000 (UTC) Received: by mail-vc0-f179.google.com with SMTP id gf12so777244vcb.38 for ; Thu, 14 Mar 2013 15:07:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-provags-id:x-gm-message-state; bh=QYHZ/oN533UPLgOUhphS+ljXqfzZBKpsj534F5mLgGo=; b=Lv8w0PUGVbNkVG+g9/OWEReyL9mPrdpMxcak5gPAqsSlcVDOuWeNUhHHQOvTQQIYMZ aIecNqp5SkSQAZ7HJMNtnIBtGhQBXtFw8uRGI+XpUcG1DDtVMfxt+XdKpUWiyI0qK/mt n0Iz5B0xL9Qmu9ejXO8P/ALWK4lB0DBLLe5001/nGBt90BO3Wku86f5CWYUS+eY1uEmO 1AUZ699FS/Vz4J9WWGC6PZxtMjqykN+Bw6mwrtAD03/KtyV5SBATdNOR2ZuTsjNjCuWt mJXmuARxwkK3UBeTz4q8SkcHrmn4MzOO6Y1rAqSHXcX5E8FoRZYHd3CbGOZ5kwCrS7y+ DRjw== X-Received: by 10.52.88.237 with SMTP id bj13mr3505023vdb.75.1363298867061; Thu, 14 Mar 2013 15:07:47 -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.58.127.98 with SMTP id nf2csp93678veb; Thu, 14 Mar 2013 15:07:46 -0700 (PDT) X-Received: by 10.14.110.68 with SMTP id t44mr11180028eeg.25.1363298865169; Thu, 14 Mar 2013 15:07:45 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.8]) by mx.google.com with ESMTPS id t8si7346727eeg.224.2013.03.14.15.07.44 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Mar 2013 15:07:45 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.8; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0Lgw8E-1V3Otp16m6-00oZb2; Thu, 14 Mar 2013 23:07:39 +0100 From: Arnd Bergmann To: Anton Vorontsov Cc: linux-arm-kernel@vger.kernel.org, patches@linaro.org, Olof Johansson , Florian Fainelli , Imre Kaloz , Arnd Bergmann Subject: [PATCH 2/5] ARM: cns3xxx: enable sparse IRQ support Date: Thu, 14 Mar 2013 23:07:34 +0100 Message-Id: <1363298857-8131-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363298857-8131-1-git-send-email-arnd@arndb.de> References: <1363298857-8131-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:hF3MneXSPY/CpPGMcAkhqv2OfiOm8eG+BNhcTI97uUK p4aY0qpEN8sC2lO6xR1R6/r5ynwA/PrH+qiyvdr3pe7+q7QGtE 8SjuITgyargdl87ymwJpzOnxR6GUMK+YheexYnKl3Kj9MvbDNh V+oj0WD8xVjuRCa01K3akWfiYP7mxelt9mtjBaoSnOca6LG0nt sz2FLfdFONMSwwr2wMW9j3SdazVkvU8RjLtkwfGRZtTO5vwr9S O9TuHXpaMfBVwlamaGLpPOT+9wrfcxdkUbNOb75twt/qS4xfOW uabaCKI3xszSCmyUDM/sJ+lryXNQBFdHqfy0luF229mfe4T4yr wd4bntd8W2pgzMDAjP8+N3qKD1/dHae4TjZzaJiZ1 X-Gm-Message-State: ALoCoQm2gnHBWpSOR3yw8BzvTXfGiZNlH/m0qBCR53PqgLILckbq7X6CRnN4xdFQKm7mjWX4bMDF This trivially enables sparse IRQ on cns3xxx by moving the nr_irqs definition from mach/irqs.h into the machine descriptor. These interrupts will still get statically assigned, so nothing changes here. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 1 + arch/arm/mach-cns3xxx/cns3420vb.c | 1 + arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 ------------------------ 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5b71469..8bad33e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -390,6 +390,7 @@ config ARCH_CNS3XXX select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI + select SPARSE_IRQ help Support for Cavium Networks CNS3XXX platform. diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c index d863d87..ce096d6 100644 --- a/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/arch/arm/mach-cns3xxx/cns3420vb.c @@ -246,6 +246,7 @@ static void __init cns3420_map_io(void) MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board") .atag_offset = 0x100, + .nr_irqs = NR_IRQS_CNS3XXX, .map_io = cns3420_map_io, .init_irq = cns3xxx_init_irq, .init_time = cns3xxx_timer_init, diff --git a/arch/arm/mach-cns3xxx/include/mach/irqs.h b/arch/arm/mach-cns3xxx/include/mach/irqs.h deleted file mode 100644 index 2ab96f8..0000000 --- a/arch/arm/mach-cns3xxx/include/mach/irqs.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000 Deep Blue Solutions Ltd. - * Copyright 2003 ARM Limited - * Copyright 2008 Cavium Networks - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, Version 2, as - * published by the Free Software Foundation. - */ - -#ifndef __MACH_IRQS_H -#define __MACH_IRQS_H - -#define IRQ_LOCALTIMER 29 -#define IRQ_LOCALWDOG 30 -#define IRQ_TC11MP_GIC_START 32 - -#include - -#ifndef NR_IRQS -#error "NR_IRQS not defined by the board-specific files" -#endif - -#endif