Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df1590d9 authored by Viresh Kumar's avatar Viresh Kumar
Browse files

ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/ 



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: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent e2eb6918

arch/arm/mach-spear3xx/spear3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/plat-spear/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/irqchip/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_ARCH_BCM2835)		+= irq-bcm2835.o

obj-$(CONFIG_ARCH_SPEAR3XX)		+= spear-shirq.o

arch/arm/plat-spear/shirq.c→drivers/irqchip/spear-shirq.c

+5 −4
Original line number Diff line number Diff line 
/*

 * 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);

arch/arm/plat-spear/include/plat/shirq.h→include/linux/irqchip/spear-shirq.h

+4 −6
Original line number Diff line number Diff line 
/*

 * 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 */