From: Viresh Kumar <viresh.kumar@linaro.org> To: arm@kernel.org, olof@lixom.net, arnd@arndb.de Cc: sr@denx.de, Viresh Kumar <viresh.kumar@linaro.org>, devicetree-discuss@lists.ozlabs.org, spear-devel@list.st.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/ Date: Mon, 12 Nov 2012 23:05:22 +0530 [thread overview] Message-ID: <52526a3b70e5b354ee699dee2f1b5f6ba4f3a0ab.1352741575.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <71bbb1faf3cd048953dcf24ef9ce6d9dd37fe8e1.1352608333.git.viresh.kumar@linaro.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 <viresh.kumar@linaro.org> --- 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 <linux/amba/pl022.h> #include <linux/amba/pl08x.h> +#include <linux/irqchip/spear-shirq.h> #include <linux/of_irq.h> #include <linux/io.h> #include <asm/hardware/pl080.h> #include <asm/hardware/vic.h> #include <plat/pl080.h> -#include <plat/shirq.h> #include <mach/generic.h> #include <mach/spear.h> 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 <viresh.linux@gmail.com> * + * Copyright (C) 2012 ST Microelectronics + * Shiraz Hashim <shiraz.hashim@st.com> + * * 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 <linux/io.h> #include <linux/irq.h> #include <linux/irqdomain.h> +#include <linux/irqchip/spear-shirq.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/spinlock.h> -#include <plat/shirq.h> 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 <viresh.linux@gmail.com> * * 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 <linux/irq.h> #include <linux/types.h> @@ -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 */ -- 1.7.12.rc2.18.g61b472e
WARNING: multiple messages have this Message-ID (diff)
From: viresh.kumar@linaro.org (Viresh Kumar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/ Date: Mon, 12 Nov 2012 23:05:22 +0530 [thread overview] Message-ID: <52526a3b70e5b354ee699dee2f1b5f6ba4f3a0ab.1352741575.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <71bbb1faf3cd048953dcf24ef9ce6d9dd37fe8e1.1352608333.git.viresh.kumar@linaro.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 <viresh.kumar@linaro.org> --- 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 <linux/amba/pl022.h> #include <linux/amba/pl08x.h> +#include <linux/irqchip/spear-shirq.h> #include <linux/of_irq.h> #include <linux/io.h> #include <asm/hardware/pl080.h> #include <asm/hardware/vic.h> #include <plat/pl080.h> -#include <plat/shirq.h> #include <mach/generic.h> #include <mach/spear.h> 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 <viresh.linux@gmail.com> * + * Copyright (C) 2012 ST Microelectronics + * Shiraz Hashim <shiraz.hashim@st.com> + * * 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 <linux/io.h> #include <linux/irq.h> #include <linux/irqdomain.h> +#include <linux/irqchip/spear-shirq.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/spinlock.h> -#include <plat/shirq.h> 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 <viresh.linux@gmail.com> * * 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 <linux/irq.h> #include <linux/types.h> @@ -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 */ -- 1.7.12.rc2.18.g61b472e
next prev parent reply other threads:[~2012-11-12 17:35 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-11-11 4:39 [PATCH 00/14] ARM: SPEAr: DT updates Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 01/14] pinctrl: SPEAr: add spi chipselect control driver Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar [not found] ` <4a92290e8a3b1a19c3a5e864edfa7badfc2af5d0.1352608333.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-12 15:03 ` Arnd Bergmann 2012-11-12 15:03 ` Arnd Bergmann 2012-11-15 14:17 ` Linus Walleij 2012-11-15 14:17 ` Linus Walleij [not found] ` <CACRpkdb9tSUUGQjWdHqRr5rUSyiPgWm2i3-QZq9VbWFY2EAQeQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 14:19 ` Viresh Kumar 2012-11-15 14:19 ` Viresh Kumar [not found] ` <CAKohpomLRYAKJ=dNLVsjj1xf=G6xj4EcTpPmhSDvgBYUMXc1mA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 19:09 ` Linus Walleij 2012-11-15 19:09 ` Linus Walleij 2012-11-16 5:15 ` [PATCH 01/16] gpio: " Viresh Kumar 2012-11-16 5:15 ` Viresh Kumar [not found] ` <3702a1036f8e714e6d18e4726569bbb1eadd65bf.1353042873.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-16 8:19 ` Arnd Bergmann 2012-11-16 8:19 ` Arnd Bergmann [not found] ` <201211160819.04343.arnd-r2nGTMty4D4@public.gmane.org> 2012-11-16 8:19 ` Viresh Kumar 2012-11-16 8:19 ` Viresh Kumar 2012-11-17 23:02 ` Linus Walleij 2012-11-17 23:02 ` Linus Walleij 2012-11-11 4:39 ` [PATCH 02/14] ARM: SPEAr13xx: DT: Add spics gpio controller nodes Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar [not found] ` <58a7d91cab20b924784fb5a09e16ca08e6f13318.1352608333.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-13 14:08 ` Linus Walleij 2012-11-13 14:08 ` Linus Walleij 2012-11-13 14:34 ` Viresh Kumar 2012-11-13 14:34 ` Viresh Kumar [not found] ` <CAKohpon=AVGZmR_cwUZ4=buw0kr3JVtXh51BtXteWkJ7E-f_bQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 14:06 ` Linus Walleij 2012-11-15 14:06 ` Linus Walleij [not found] ` <CACRpkdaJ2kCYfSP=xCRQAG2wDnkMKX9fey+ByhDDiOS==u+XwA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 14:08 ` Viresh Kumar 2012-11-15 14:08 ` Viresh Kumar [not found] ` <CAKohpok7-iBCoYk+aAXZPsOODyh6tp2nutC+6wYOot-bK3=wkg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-15 17:25 ` Linus Walleij 2012-11-15 17:25 ` Linus Walleij 2012-11-11 4:39 ` [PATCH 03/14] ARM: SPEAr: DT: Update pinctrl list Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 04/14] ARM: SPEAr: DT: Update partition info for MTD devices Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 05/14] ARM: SPEAr: DT: Fix existing DT support Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 06/14] ARM: SPEAr: DT: Modify DT bindings for STMMAC Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 07/14] ARM: SPEAr: DT: add uart state to fix warning Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 08/14] ARM: SPEAr: DT: Update device nodes Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar [not found] ` <b3925b105ee2c6fe828ef3b54928aeee02a801ae.1352608333.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-26 11:25 ` Viresh Kumar 2012-11-26 11:25 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 09/14] ARM: SPEAr1310: Move 1310 specific misc register into machine specific files Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 10/14] ARM: SPEAr13xx: Remove fields not required for ssp controller Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 11/14] ARM: SPEAr1310: Fix AUXDATA for compact flash controller Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 12/14] ARM: SPEAr3xx: shirq: simplify and move the shared irq multiplexor to DT Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-12 15:09 ` Arnd Bergmann 2012-11-12 15:09 ` Arnd Bergmann 2012-11-12 16:37 ` viresh kumar 2012-11-12 16:37 ` viresh kumar [not found] ` <CAOh2x=nJXVVjFmDFnTN_02PSG9hcDuXToRUzRMi5jwJqUFtgfw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-12 17:00 ` Arnd Bergmann 2012-11-12 17:00 ` Arnd Bergmann 2012-11-12 17:16 ` [PATCH] fixup! " Viresh Kumar 2012-11-12 17:16 ` Viresh Kumar 2012-11-12 17:35 ` Viresh Kumar [this message] 2012-11-12 17:35 ` [PATCH] ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/ Viresh Kumar 2012-11-11 4:39 ` [PATCH 13/14] ARM: SPEAr3xx: DT: add shirq node for interrupt multiplexor Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar 2012-11-11 4:39 ` [PATCH 14/14] ARM: SPEAr320: DT: Add SPEAr 320 HMI board support Viresh Kumar 2012-11-11 4:39 ` Viresh Kumar [not found] ` <cover.1352608333.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2012-11-12 15:21 ` [PATCH 00/14] ARM: SPEAr: DT updates Arnd Bergmann 2012-11-12 15:21 ` Arnd Bergmann 2012-11-12 16:39 ` viresh kumar 2012-11-12 16:39 ` viresh kumar 2012-11-12 17:18 ` Viresh Kumar 2012-11-12 17:18 ` Viresh Kumar [not found] ` <CAKohpom0kMjuHx5jO-LTPKQhy_-r4khKi7UBPB_O-50K42FOeQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-21 20:24 ` Olof Johansson 2012-11-21 20:24 ` Olof Johansson [not found] ` <20121121202405.GA15549-O5ziIzlqnXUVNXGz7ipsyg@public.gmane.org> 2012-11-22 3:19 ` Viresh Kumar 2012-11-22 3:19 ` Viresh Kumar [not found] ` <CAKohpokMUTQja6tCz1RmKXFgu+X7MGFAi1+UWLgKhpViOuiMSA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2012-11-22 9:47 ` Linus Walleij 2012-11-22 9:47 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=52526a3b70e5b354ee699dee2f1b5f6ba4f3a0ab.1352741575.git.viresh.kumar@linaro.org \ --to=viresh.kumar@linaro.org \ --cc=arm@kernel.org \ --cc=arnd@arndb.de \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=olof@lixom.net \ --cc=spear-devel@list.st.com \ --cc=sr@denx.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.