From patchwork Mon May 18 14:44:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 6429831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CCE44C0432 for ; Mon, 18 May 2015 14:47:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00FA12038E for ; Mon, 18 May 2015 14:47:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2AB91205BE for ; Mon, 18 May 2015 14:47:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YuMIN-0003I8-Ld; Mon, 18 May 2015 14:45:31 +0000 Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YuMHZ-0001or-JE for linux-arm-kernel@lists.infradead.org; Mon, 18 May 2015 14:44:42 +0000 Received: by pacwv17 with SMTP id wv17so155012271pac.2 for ; Mon, 18 May 2015 07:44:21 -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:in-reply-to:references; bh=5nfj2NMzF0JNyRdnDGZXSqbWwAZ+CYE5osGcAHaUVdY=; b=Zfyn2LLzabOgxowimLbkxUckuLShjzeLYBOT60cdp9iT8WLhmiTi5RKiFE5UujePyy IiagMCjpeqaoXtQt9cTN4hynd9U7I1Vy//12ZrCPz8yXbqwMpc+ja57sOsALddZlOZkM ZfGRvBETo1oiOz/BeAc3a1k4WJBa8kPSjYuZr35IqnO3VPyiZXqXK2L3QK+TOlRo0miy 5jPt+9emkqHIHSlfxKOaX6a0Cu4DCLabgIEP0eOxc8Rgu/GeMvZkSz63AJEodiG2uTap om9hvEsERQTPT9K32dAusJqqTpWodK7aZFDJerDj7gdMqUYEb0ZLDxOl7cs9i7u8b0g9 ze3A== X-Received: by 10.66.142.199 with SMTP id ry7mr44519361pab.148.1431960260984; Mon, 18 May 2015 07:44:20 -0700 (PDT) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id mq2sm10298211pbb.16.2015.05.18.07.44.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 May 2015 07:44:20 -0700 (PDT) From: Dmitry Eremin-Solenikov To: Russell King , Thomas Gleixner , Jason Cooper Subject: [RESEND][PATCH 4/5] ARM: sa1100: move irq driver to drivers/irqchip/ Date: Mon, 18 May 2015 17:44:06 +0300 Message-Id: <1431960247-32646-4-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1431960247-32646-1-git-send-email-dbaryshkov@gmail.com> References: <1431960247-32646-1-git-send-email-dbaryshkov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150518_074441_711725_F6F3FAA8 X-CRM114-Status: GOOD ( 11.91 ) X-Spam-Score: -0.8 (/) Cc: Linus Walleij , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move current sa11x0 IRQ driver to the irqchip subsystem. The driver is not yet modified to be a proper part of irqchip subsystem, it will be a next step. Signed-off-by: Dmitry Eremin-Solenikov --- arch/arm/mach-sa1100/Makefile | 2 +- drivers/irqchip/Makefile | 1 + arch/arm/mach-sa1100/irq.c => drivers/irqchip/irq-sa11x0.c | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) rename arch/arm/mach-sa1100/irq.c => drivers/irqchip/irq-sa11x0.c (96%) diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile index 61ff91e..ebc4d58 100644 --- a/arch/arm/mach-sa1100/Makefile +++ b/arch/arm/mach-sa1100/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := clock.o generic.o irq.o #nmi-oopser.o +obj-y := clock.o generic.o #nmi-oopser.o # Specific board support obj-$(CONFIG_SA1100_ASSABET) += assabet.o diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index dda4927..49f372a 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -47,3 +47,4 @@ obj-$(CONFIG_KEYSTONE_IRQ) += irq-keystone.o obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o +obj-$(CONFIG_ARCH_SA1100) += irq-sa11x0.o diff --git a/arch/arm/mach-sa1100/irq.c b/drivers/irqchip/irq-sa11x0.c similarity index 96% rename from arch/arm/mach-sa1100/irq.c rename to drivers/irqchip/irq-sa11x0.c index 08f929e..a5e1a54 100644 --- a/arch/arm/mach-sa1100/irq.c +++ b/drivers/irqchip/irq-sa11x0.c @@ -1,9 +1,9 @@ /* - * linux/arch/arm/mach-sa1100/irq.c + * drivers/irqchip/irq-sa11x0.c * * Copyright (C) 1999-2001 Nicolas Pitre * - * Generic IRQ handling for the SA11x0, GPIO 11-27 IRQ demultiplexing. + * Generic IRQ handling for the SA11x0. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -23,7 +23,7 @@ #include #include -#include "generic.h" +#include "../../arch/arm/mach-sa1100/generic.h" #define ICIP 0x00 /* IC IRQ Pending reg. */ #define ICMR 0x04 /* IC Mask Reg. */