From patchwork Tue Oct 30 14:54:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1670531 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 1809DDF264 for ; Tue, 30 Oct 2012 14:57:50 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TTDE7-0002Gv-Ds; Tue, 30 Oct 2012 14:55:35 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TTDDJ-0001ye-Bl for linux-arm-kernel@lists.infradead.org; Tue, 30 Oct 2012 14:54:46 +0000 Received: by mail-bk0-f49.google.com with SMTP id j4so207300bkw.36 for ; Tue, 30 Oct 2012 07:54:45 -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:x-mailer:in-reply-to:references; bh=FhRI5zknfEAZdjXW292je+bAxa8fheo/PiNPHzds0IY=; b=qgeUNJEoIHg8gba4F6imnOZf1WivbPE4DeBZDpWxfdmLPQ8zKteCaCYVOiV1mRWKgU U/EfsKWuNRcpfoN1Xzc+TKAwluLh8gJ1bHp0UcwEhvcA9u0zSNi0NwsHSFu1Q8gyVHRx TkdtY9TzEWS3/rUQDh4wRI4MlfQLpK/ydG9YK0kXi/2e/JgmtRPKeoq6ryK2TPVxSW6s QWpZwaOFMVNHNvy2EG+6oAigv1/1HkKT9YJJFWQ9pMhabXO2pT+gjcOw55oCbo5hAKHg Z6mm8sOEsap7sodJ5NnoW0W0f59CopQaUPD9AQCYJQt3h38vJ8WC4dlp3D5EZaVg1HZu 6RsA== Received: by 10.205.128.148 with SMTP id he20mr10106214bkc.99.1351608884934; Tue, 30 Oct 2012 07:54:44 -0700 (PDT) Received: from localhost.localdomain ([91.224.175.20]) by mx.google.com with ESMTPS id e3sm1309847bks.7.2012.10.30.07.54.38 (version=SSLv3 cipher=OTHER); Tue, 30 Oct 2012 07:54:41 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] irqchip: Move ARM VIC to drivers/irqchip Date: Tue, 30 Oct 2012 09:54:19 -0500 Message-Id: <1351608860-24617-3-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351608860-24617-1-git-send-email-robherring2@gmail.com> References: <1351608860-24617-1-git-send-email-robherring2@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Thomas Petazzoni , Russell King , Arnd Bergmann , catalin.marinas@arm.com, Rob Herring , Olof Johansson , Thomas Gleixner X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Rob Herring Now that we have drivers/irqchip, move VIC irqchip to drivers/irqchip. Signed-off-by: Rob Herring Cc: Russell King Cc: Thomas Gleixner --- arch/arm/common/Kconfig | 15 --------------- arch/arm/common/Makefile | 1 - drivers/irqchip/Kconfig | 15 +++++++++++++++ drivers/irqchip/Makefile | 1 + arch/arm/common/vic.c => drivers/irqchip/irq-vic.c | 0 drivers/irqchip/irqchip.c | 14 ++++++++++++++ drivers/irqchip/irqchip.h | 1 + 7 files changed, 31 insertions(+), 16 deletions(-) rename arch/arm/common/vic.c => drivers/irqchip/irq-vic.c (100%) diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 7bf52b2..9353184 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -1,18 +1,3 @@ -config ARM_VIC - bool - select IRQ_DOMAIN - select MULTI_IRQ_HANDLER - -config ARM_VIC_NR - int - default 4 if ARCH_S5PV210 - default 3 if ARCH_S5PC100 - default 2 - depends on ARM_VIC - help - The maximum number of VICs available in the system, for - power management. - config ICST bool diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 4104b82..dc8dd0d 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -2,7 +2,6 @@ # Makefile for the linux kernel. # -obj-$(CONFIG_ARM_VIC) += vic.o obj-$(CONFIG_ICST) += icst.o obj-$(CONFIG_SA1111) += sa1111.o obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 2d7f350..d80e5c7 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -9,3 +9,18 @@ config ARM_GIC config GIC_NON_BANKED bool + +config ARM_VIC + bool + select IRQ_DOMAIN + select MULTI_IRQ_HANDLER + +config ARM_VIC_NR + int + default 4 if ARCH_S5PV210 + default 3 if ARCH_S5PC100 + default 2 + depends on ARM_VIC + help + The maximum number of VICs available in the system, for + power management. diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 94118db..9c7f91e 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o obj-$(CONFIG_ARM_GIC) += irq-gic.o +obj-$(CONFIG_ARM_VIC) += irq-vic.o diff --git a/arch/arm/common/vic.c b/drivers/irqchip/irq-vic.c similarity index 100% rename from arch/arm/common/vic.c rename to drivers/irqchip/irq-vic.c diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c index 3f37397..0872cd7 100644 --- a/drivers/irqchip/irqchip.c +++ b/drivers/irqchip/irqchip.c @@ -24,6 +24,20 @@ static const struct of_device_id irqchip_of_match[] __initconst = { .data = gic_of_init, }, #endif +#ifdef CONFIG_ARM_VIC + { + .compatible = "arm,versatile-vic", + .data = vic_of_init, + }, + { + .compatible = "arm,pl190-vic", + .data = vic_of_init, + }, + { + .compatible = "arm,pl190-vic", + .data = vic_of_init, + }, +#endif #ifdef CONFIG_ARCH_BCM2835 { .compatible = "brcm,bcm2835-armctrl-ic", diff --git a/drivers/irqchip/irqchip.h b/drivers/irqchip/irqchip.h index 62773ab3..8b8c2b2 100644 --- a/drivers/irqchip/irqchip.h +++ b/drivers/irqchip/irqchip.h @@ -15,5 +15,6 @@ int bcm2835_irqchip_init(struct device_node *node, struct device_node *parent); int armada_370_xp_mpic_of_init(struct device_node *node, struct device_node *parent); int gic_of_init(struct device_node *node, struct device_node *parent); +int vic_of_init(struct device_node *node, struct device_node *parent); #endif