From patchwork Mon Nov 12 17:35:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 1729371 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 99AFD3FCDE for ; Mon, 12 Nov 2012 17:37:42 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TXxv5-0004j9-Nw; Mon, 12 Nov 2012 17:35:35 +0000 Received: from mail-da0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TXxv2-0004ie-EK for linux-arm-kernel@lists.infradead.org; Mon, 12 Nov 2012 17:35:33 +0000 Received: by mail-da0-f49.google.com with SMTP id q27so2583342daj.36 for ; Mon, 12 Nov 2012 09:35:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=b+gzhQ3/QJ/l347+7JJDjqOoOyiJZyEPrvusQX2WcSI=; b=JYFtvR1gwAYtV88Vn8TQaBH7rcK97dWLnGerndTcoTcRD+6KoD71OuawSrxq8QZCrG U4pC6Fk0DyHH8TZVUU3i96fzz9S+Si0zNKU81Ki8076JNRfdUsDzZl3azzFFpuWkwKfZ w0KZPVL6Ri06mo2121MLzdapURv8DE9Agwx/vNR52Sv6AEJCqUndl+SICkc14bD2Mheq 1m9mtaK0bQ0DSju/VVvklUmHEiZv7zUgifkb8uHfNp+ETKtIo2R5mfQgMNy6dimBJAHz niEohfR1L27s7FrCFQbKDBzpmDzC0jTQvW6ZHIXbGng3KXNWTDY1MCgL1l67nNQP7yq0 SrgA== Received: by 10.68.212.68 with SMTP id ni4mr52408527pbc.107.1352741729653; Mon, 12 Nov 2012 09:35:29 -0800 (PST) Received: from localhost ([122.167.230.46]) by mx.google.com with ESMTPS id bd2sm4600327pab.36.2012.11.12.09.35.25 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Nov 2012 09:35:28 -0800 (PST) From: Viresh Kumar To: arm@kernel.org, olof@lixom.net, arnd@arndb.de Subject: [PATCH] ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/ Date: Mon, 12 Nov 2012 23:05:22 +0530 Message-Id: <52526a3b70e5b354ee699dee2f1b5f6ba4f3a0ab.1352741575.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: <71bbb1faf3cd048953dcf24ef9ce6d9dd37fe8e1.1352608333.git.viresh.kumar@linaro.org> References: <71bbb1faf3cd048953dcf24ef9ce6d9dd37fe8e1.1352608333.git.viresh.kumar@linaro.org> X-Gm-Message-State: ALoCoQmYmQx/mSmXbAbzVKPrfyIx+dfNhgfGf2Q/l7R0MSYTssev8L1oldbaIeEsqF9ne3dgGCVf X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121112_123532_605018_D979B48C X-CRM114-Status: GOOD ( 13.37 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: sr@denx.de, Viresh Kumar , devicetree-discuss@lists.ozlabs.org, spear-devel@list.st.com, linux-arm-kernel@lists.infradead.org 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 This patch moves shirq interrupt controllers driver and header file out of plat-spear directory. It is moved to drivers/irqchip/ directory. Signed-off-by: Viresh Kumar --- Hi Arnd, This is an follow-up patch of my earlier patchset: http://www.spinics.net/lists/arm-kernel/msg206253.html Please apply it after applying them. arch/arm/mach-spear3xx/spear3xx.c | 2 +- arch/arm/plat-spear/Makefile | 2 +- drivers/irqchip/Makefile | 5 +++-- arch/arm/plat-spear/shirq.c => drivers/irqchip/spear-shirq.c | 9 +++++---- .../plat/shirq.h => include/linux/irqchip/spear-shirq.h | 10 ++++------ 5 files changed, 14 insertions(+), 14 deletions(-) rename arch/arm/plat-spear/shirq.c => drivers/irqchip/spear-shirq.c (97%) rename arch/arm/plat-spear/include/plat/shirq.h => include/linux/irqchip/spear-shirq.h (90%) diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index f1aaf5b..38fe95d 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c @@ -15,12 +15,12 @@ #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/arch/arm/plat-spear/Makefile b/arch/arm/plat-spear/Makefile index 2607bd0..01e8853 100644 --- a/arch/arm/plat-spear/Makefile +++ b/arch/arm/plat-spear/Makefile @@ -5,5 +5,5 @@ # Common support obj-y := restart.o time.o -obj-$(CONFIG_ARCH_SPEAR3XX) += pl080.o shirq.o +obj-$(CONFIG_ARCH_SPEAR3XX) += pl080.o obj-$(CONFIG_ARCH_SPEAR6XX) += pl080.o diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index e2e6eb5..fee05b1 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -1,2 +1,3 @@ -obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o -obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o +obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o +obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o +obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o diff --git a/arch/arm/plat-spear/shirq.c b/drivers/irqchip/spear-shirq.c similarity index 97% rename from arch/arm/plat-spear/shirq.c rename to drivers/irqchip/spear-shirq.c index 955c724..80e1d2f 100644 --- a/arch/arm/plat-spear/shirq.c +++ b/drivers/irqchip/spear-shirq.c @@ -1,11 +1,12 @@ /* - * arch/arm/plat-spear/shirq.c - * * SPEAr platform shared irq layer source file * - * Copyright (C) 2009 ST Microelectronics + * Copyright (C) 2009-2012 ST Microelectronics * Viresh Kumar * + * Copyright (C) 2012 ST Microelectronics + * Shiraz Hashim + * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. @@ -18,11 +19,11 @@ #include #include #include +#include #include #include #include #include -#include static DEFINE_SPINLOCK(lock); diff --git a/arch/arm/plat-spear/include/plat/shirq.h b/include/linux/irqchip/spear-shirq.h similarity index 90% rename from arch/arm/plat-spear/include/plat/shirq.h rename to include/linux/irqchip/spear-shirq.h index c51b355..c8be16d 100644 --- a/arch/arm/plat-spear/include/plat/shirq.h +++ b/include/linux/irqchip/spear-shirq.h @@ -1,9 +1,7 @@ /* - * arch/arm/plat-spear/include/plat/shirq.h - * * SPEAr platform shared irq layer header file * - * Copyright (C) 2009 ST Microelectronics + * Copyright (C) 2009-2012 ST Microelectronics * Viresh Kumar * * This file is licensed under the terms of the GNU General Public @@ -11,8 +9,8 @@ * warranty of any kind, whether express or implied. */ -#ifndef __PLAT_SHIRQ_H -#define __PLAT_SHIRQ_H +#ifndef __SPEAR_SHIRQ_H +#define __SPEAR_SHIRQ_H #include #include @@ -63,4 +61,4 @@ int __init spear310_shirq_of_init(struct device_node *np, int __init spear320_shirq_of_init(struct device_node *np, struct device_node *parent); -#endif /* __PLAT_SHIRQ_H */ +#endif /* __SPEAR_SHIRQ_H */