From patchwork Tue May 28 02:21:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 17236 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f200.google.com (mail-gh0-f200.google.com [209.85.160.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9BC3C238E8 for ; Tue, 28 May 2013 02:23:12 +0000 (UTC) Received: by mail-gh0-f200.google.com with SMTP id 10sf8428331ghy.7 for ; Mon, 27 May 2013 19:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=i4do8OYfaAqHXqIy79JbAL/7/WlMhJRGynSM7512L30=; b=BN6fzxmALYqoAPVBgBVAGKV6pGUzTOZG8x0o4n6REUNLh3abx7KUtXUwJxI3EiTcE8 iZ+2rZ1mwiJulHTrHKA+lXB3PNjkPrUl+cDuhbcqguIv22oz/wTB8vNQI1k7FHYISNug HibVYEfbqBT3G9J1md8Kw9XCoQ8VrUepgOL9YXiRk7KAbCK2Mwa4ochL2izoV7B6kGbj usYiQAQbLYeMBcaUTB07GP1lY/f7bXHaDEdDXZeq+cPPOyAxYNEt7cKM/yk9jmKnxYpI PrhG+LrJb46DX26ye1ym5DlOFTdKLH0CjDfNK/TTw9HU/BdrgtUUxbJwvmjubp2uviZo OACA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=i4do8OYfaAqHXqIy79JbAL/7/WlMhJRGynSM7512L30=; b=HfYRpfSYw3NBiWhyoxfftjta2PH94iOsESK70g48QuZhfjjllBrJfQf/gMG55ykrbG qJnNnW4V9KIuOZc0L79mrMZA5J5xq7MYqSnKcNji9FCHg5jRT5Dy1RLAWhYFVCPzw/Vj R5azWRTh3dIvSOuDUEg+ybdng8ts2bg+j46Daq3UddksH/lDLXkDS6spZ8Ze/vWdxinL wR5quKNU9fEXoC/K1oXTEJG/3U44kDALbgkHS4y7VMLe9b4RAihJZAReTVM87pVObSiI 3E+b/pSoo0bLfyrxIbmPZ8cSDl5JS3q5eGuMzX/RgL1IshoV7ixj2zT+qLZIL46/hhxx hwFw== X-Received: by 10.224.174.145 with SMTP id t17mr16506941qaz.4.1369707727123; Mon, 27 May 2013 19:22:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.118.104 with SMTP id kl8ls3068215qeb.78.gmail; Mon, 27 May 2013 19:22:07 -0700 (PDT) X-Received: by 10.52.170.19 with SMTP id ai19mr12752663vdc.25.1369707726978; Mon, 27 May 2013 19:22:06 -0700 (PDT) Received: from mail-vb0-x22e.google.com (mail-vb0-x22e.google.com [2607:f8b0:400c:c02::22e]) by mx.google.com with ESMTPS id r12si17912956vcv.58.2013.05.27.19.22.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 May 2013 19:22:06 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22e; Received: by mail-vb0-f46.google.com with SMTP id 11so4966595vbe.5 for ; Mon, 27 May 2013 19:22:06 -0700 (PDT) X-Received: by 10.58.172.67 with SMTP id ba3mr16390288vec.58.1369707726866; Mon, 27 May 2013 19:22:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.229.199 with SMTP id jj7csp19352vcb; Mon, 27 May 2013 19:22:06 -0700 (PDT) X-Received: by 10.66.49.104 with SMTP id t8mr29214527pan.65.1369707725721; Mon, 27 May 2013 19:22:05 -0700 (PDT) Received: from mail-pb0-x235.google.com (mail-pb0-x235.google.com [2607:f8b0:400e:c01::235]) by mx.google.com with ESMTPS id x3si7560019paa.256.2013.05.27.19.22.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 May 2013 19:22:05 -0700 (PDT) Received-SPF: pass (google.com: domain of haojian.zhuang@gmail.com designates 2607:f8b0:400e:c01::235 as permitted sender) client-ip=2607:f8b0:400e:c01::235; Received: by mail-pb0-f53.google.com with SMTP id un4so7319029pbc.12 for ; Mon, 27 May 2013 19:22:05 -0700 (PDT) X-Received: by 10.66.139.198 with SMTP id ra6mr32155011pab.140.1369707725340; Mon, 27 May 2013 19:22:05 -0700 (PDT) Received: from localhost.localdomain ([27.115.121.40]) by mx.google.com with ESMTPSA id zs12sm32959785pab.0.2013.05.27.19.22.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 May 2013 19:22:04 -0700 (PDT) From: Haojian Zhuang To: linux-arm-kernel@lists.infradead.org, chao.xie@marvell.com, zhangwm@marvell.com, tglx@linutronix.de, arnd@arndb.de Cc: patches@linaro.org, Haojian Zhuang Subject: [PATCH v2 1/5] irqchip: move mmp irq driver Date: Tue, 28 May 2013 10:21:43 +0800 Message-Id: <1369707707-30295-2-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369707707-30295-1-git-send-email-haojian.zhuang@gmail.com> References: <1369707707-30295-1-git-send-email-haojian.zhuang@gmail.com> X-Gm-Message-State: ALoCoQm6cRHTbMXU4NkxzWvYarTqcGJ71O/O5IaqJGnz9za3xGZKBrkVAKi/RRtiD6ioTKI5D08b X-Original-Sender: haojian.zhuang@gmail.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@gmail.com Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Move irq-mmp driver from mach-mmp directory into irqchip directory. Signed-off-by: Haojian Zhuang --- 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 0bdc50b..9c1c9be 100644 --- a/arch/arm/mach-mmp/common.h +++ b/arch/arm/mach-mmp/common.h @@ -2,7 +2,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(char, 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 7ed1df2..e01dc2a 100644 --- a/arch/arm/mach-mmp/include/mach/pxa168.h +++ b/arch/arm/mach-mmp/include/mach/pxa168.h @@ -2,6 +2,7 @@ #define __ASM_MACH_PXA168_H extern void pxa168_timer_init(void); +extern void __init icu_init_irq(void); extern void __init pxa168_init_irq(void); extern void pxa168_restart(char, 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 cda4cb5..542d47e 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_ARCH_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o obj-$(CONFIG_METAG) += irq-metag-ext.o obj-$(CONFIG_METAG_PERFCOUNTER_IRQS) += irq-metag.o +obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_ARCH_SUNXI) += irq-sun4i.o obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o obj-$(CONFIG_ARM_GIC) += irq-gic.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 {