From patchwork Fri Jul 26 10:05:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 2833957 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D53D4C0319 for ; Fri, 26 Jul 2013 10:09:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 54F32200FF for ; Fri, 26 Jul 2013 10:09:28 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B688D2012D for ; Fri, 26 Jul 2013 10:09:26 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2exg-0008DE-Fa; Fri, 26 Jul 2013 10:09:24 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2exe-0003mg-0c; Fri, 26 Jul 2013 10:09:22 +0000 Received: from mail-pd0-x22f.google.com ([2607:f8b0:400e:c02::22f]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2exb-0003mC-E7 for linux-arm-kernel@lists.infradead.org; Fri, 26 Jul 2013 10:09:19 +0000 Received: by mail-pd0-f175.google.com with SMTP id 4so2754280pdd.34 for ; Fri, 26 Jul 2013 03:08:57 -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=xx7JByt4veBrc94fo0xde0jrt1WeWCV+6VVbT9J2mD4=; b=uiMKPS06izioS8m25kq2zpMaqlpxPuXnN0wOyc0FMqzL7PAMcluVFMvbWczlsBmAWJ uQuwgqRhXpIfTbIant3QNBzSa5WD5xz2+dXbzDCEb0ho1ItmCifzP667Y05IuP5lEIGi Rr3ZTIPWP+UMr5vguWestIqiR5hgWsAReBRahZaA6jz+LgxqCC1uqWY3Y5gwhRl/2RJH b/BWRprmp8U5JTO3j81G775WwC17GwYks2hJTZILe4MhqvE+Ze+jLDL1Zu8nC6Izkr/B rtrRIz/Zr+k17Nab2ZgPOF9UMYsgRNr/SYMgo5VHkYwHg97owJHlDUftvT1xZ3mOs56h QUtA== X-Received: by 10.66.186.12 with SMTP id fg12mr21105340pac.178.1374833337766; Fri, 26 Jul 2013 03:08:57 -0700 (PDT) Received: from localhost.localdomain ([67.229.68.101]) by mx.google.com with ESMTPSA id kc8sm59263070pbc.18.2013.07.26.03.08.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Jul 2013 03:08:56 -0700 (PDT) From: Haojian Zhuang To: tglx@linutronix.de, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, chao.xie@marvell.com, john.stultz@linaro.org, mturquette@linaro.org, eric.y.miao@gmail.com, linux@arm.linux.org.uk, olof@lixom.net Subject: [PATCH v6 01/11] irqchip: move mmp irq driver Date: Fri, 26 Jul 2013 18:05:23 +0800 Message-Id: <1374833133-21119-2-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1374833133-21119-1-git-send-email-haojian.zhuang@gmail.com> References: <1374833133-21119-1-git-send-email-haojian.zhuang@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130726_060919_560226_3F8FCF3B X-CRM114-Status: GOOD ( 13.05 ) X-Spam-Score: -2.0 (--) Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-5.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 irq-mmp driver from mach-mmp directory into irqchip directory. Signed-off-by: Haojian Zhuang Reviewed-by: Daniel Drake --- arch/arm/mach-mmp/Makefile | 2 +- arch/arm/mach-mmp/common.h | 1 - arch/arm/mach-mmp/include/mach/pxa168.h | 1 + arch/arm/mach-mmp/include/mach/pxa910.h | 1 + arch/arm/mach-mmp/pxa910.c | 1 + drivers/irqchip/Makefile | 1 + arch/arm/mach-mmp/irq.c => drivers/irqchip/irq-mmp.c | 2 -- 7 files changed, 5 insertions(+), 4 deletions(-) rename arch/arm/mach-mmp/irq.c => drivers/irqchip/irq-mmp.c (99%) diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile index 095c155..9b702a1 100644 --- a/arch/arm/mach-mmp/Makefile +++ b/arch/arm/mach-mmp/Makefile @@ -2,7 +2,7 @@ # Makefile for Marvell's PXA168 processors line # -obj-y += common.o devices.o time.o irq.o +obj-y += common.o devices.o time.o # SoC support obj-$(CONFIG_CPU_PXA168) += pxa168.o diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h index 991d7e9..cf445ba 100644 --- a/arch/arm/mach-mmp/common.h +++ b/arch/arm/mach-mmp/common.h @@ -3,7 +3,6 @@ extern void timer_init(int irq); -extern void __init icu_init_irq(void); extern void __init mmp_map_io(void); extern void mmp_restart(enum reboot_mode, const char *); extern void __init pxa168_clk_init(void); diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h index 459c2d0..a83ba7c 100644 --- a/arch/arm/mach-mmp/include/mach/pxa168.h +++ b/arch/arm/mach-mmp/include/mach/pxa168.h @@ -4,6 +4,7 @@ #include extern void pxa168_timer_init(void); +extern void __init icu_init_irq(void); extern void __init pxa168_init_irq(void); extern void pxa168_restart(enum reboot_mode, const char *); extern void pxa168_clear_keypad_wakeup(void); diff --git a/arch/arm/mach-mmp/include/mach/pxa910.h b/arch/arm/mach-mmp/include/mach/pxa910.h index b914afa..9225320 100644 --- a/arch/arm/mach-mmp/include/mach/pxa910.h +++ b/arch/arm/mach-mmp/include/mach/pxa910.h @@ -2,6 +2,7 @@ #define __ASM_MACH_PXA910_H extern void pxa910_timer_init(void); +extern void __init icu_init_irq(void); extern void __init pxa910_init_irq(void); #include diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c index ce6393a..a586742 100644 --- a/arch/arm/mach-mmp/pxa910.c +++ b/arch/arm/mach-mmp/pxa910.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "common.h" diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index e65c41a..c452943 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o +obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o obj-$(CONFIG_ARCH_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o diff --git a/arch/arm/mach-mmp/irq.c b/drivers/irqchip/irq-mmp.c similarity index 99% rename from arch/arm/mach-mmp/irq.c rename to drivers/irqchip/irq-mmp.c index 3c71246..dab6def 100644 --- a/arch/arm/mach-mmp/irq.c +++ b/drivers/irqchip/irq-mmp.c @@ -30,8 +30,6 @@ #include #endif -#include "common.h" - #define MAX_ICU_NR 16 struct icu_chip_data {