From patchwork Mon Jun 3 09:30:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 17431 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0EC8623916 for ; Mon, 3 Jun 2013 09:31:54 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id k14sf5032833qcv.9 for ; Mon, 03 Jun 2013 02:31:53 -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=N4Q2RgxBlg5h/9Y32MBvedzzF7H/NoAl7ofvi9Q9rorL/it2B3lV8X1rHeh6MN0SCs ke4mDxgDaxS452C3yuv4imuwQuKakgcsdXJNHylyoie2CcCgNg4sNZiEKVY+CiRpaRMD pGm2uPn/jcLyI+eRxvgrFQLxFApxeM/apmMKsVLr9DTod6ZmNYPjsFPW95wSod645N26 3Xx8Xz4E6isFoOHfTamW9Uhlh5JwKGhb5ckhpzTWzgd8Wq1CLvbMeYGwwtp9uJ3sd2yJ ygFlwSEb9njSytsoB8wMLGj/xBTypvJNHItEIlazfA28V9jkrwgTyIdPstvPQpsldYtN e67w== 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=bK3VWKgrI1T5zqBjTvFlWjnd6XlHRr8RznDe9azhDhpu5c2Xc5Ud4HvqK8vhaErZwB DfqK/UM0ajqFZ9EnpX47AVjkkbsM43DNS4x56G7VZ2kU1btJlhfBicUkZvDSpvRaxwQg NFTWzFmsE/neBu57gcEtIHqQOyymlgMuTz0gtczgIoVUCa/011DyMo2lh9sfXtKVCPJj XWFqoxRYuSdtervsJXHD6/8ALDaUZakEZkamweupyQvaq7rvQ24k3AetYCs9P/pP87ug aYS+lqOYYIoLp4XAqU4VjAssAESBwJuB+hguLTQW7jnric3moI92SEOF8qkPxfcKWIGk 9e2w== X-Received: by 10.236.231.10 with SMTP id k10mr12422086yhq.30.1370251913899; Mon, 03 Jun 2013 02:31:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.120.193 with SMTP id le1ls1944192qeb.66.gmail; Mon, 03 Jun 2013 02:31:53 -0700 (PDT) X-Received: by 10.220.73.199 with SMTP id r7mr16313007vcj.67.1370251913661; Mon, 03 Jun 2013 02:31:53 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id mo4si34989867vcb.4.2013.06.03.02.31.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 02:31:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id ib11so1479280vcb.3 for ; Mon, 03 Jun 2013 02:31:53 -0700 (PDT) X-Received: by 10.58.29.42 with SMTP id g10mr16388497veh.59.1370251913521; Mon, 03 Jun 2013 02:31:53 -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.221.10.206 with SMTP id pb14csp71046vcb; Mon, 3 Jun 2013 02:31:52 -0700 (PDT) X-Received: by 10.66.8.138 with SMTP id r10mr23622590paa.55.1370251912303; Mon, 03 Jun 2013 02:31:52 -0700 (PDT) Received: from mail-pb0-x233.google.com (mail-pb0-x233.google.com [2607:f8b0:400e:c01::233]) by mx.google.com with ESMTPS id rl1si11935418pbc.54.2013.06.03.02.31.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 02:31:52 -0700 (PDT) Received-SPF: pass (google.com: domain of haojian.zhuang@gmail.com designates 2607:f8b0:400e:c01::233 as permitted sender) client-ip=2607:f8b0:400e:c01::233; Received: by mail-pb0-f51.google.com with SMTP id um15so2269148pbc.10 for ; Mon, 03 Jun 2013 02:31:51 -0700 (PDT) X-Received: by 10.68.105.164 with SMTP id gn4mr22988895pbb.42.1370251910893; Mon, 03 Jun 2013 02:31:50 -0700 (PDT) Received: from localhost.localdomain ([27.115.121.40]) by mx.google.com with ESMTPSA id wi6sm58333510pbc.22.2013.06.03.02.31.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 02:31:49 -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 Cc: patches@linaro.org, Haojian Zhuang Subject: [PATCH v3 01/11] irqchip: move mmp irq driver Date: Mon, 3 Jun 2013 17:30:35 +0800 Message-Id: <1370251845-31373-2-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1370251845-31373-1-git-send-email-haojian.zhuang@gmail.com> References: <1370251845-31373-1-git-send-email-haojian.zhuang@gmail.com> X-Gm-Message-State: ALoCoQnasN+DXo1k1acUK8fuc4x9o0UVwAg5dRS8AJXkq81YwKGTuLF/EvHIUzsfv2u5ZSdtJnUK X-Original-Sender: haojian.zhuang@gmail.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 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 {