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

Commit 8598066c authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren
Browse files

arm: omap: irq: move irq.c to drivers/irqchip/ 



Just move the code over as it has no dependencies
on arch/arm/ anymore.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent eaacabc0

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ config ARCH_OMAP2PLUS 
	select PINCTRL

	select SOC_BUS

	select TI_PRIV_EDMA

	select OMAP_IRQCHIP

	help

	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5

arch/arm/mach-omap2/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \ 
	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 omap_device.o sram.o drm.o



omap-2-3-common				= irq.o

hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \

					  omap_hwmod_common_data.o

clock-common				= clock.o clock_common_data.o \
@@ -20,7 +19,7 @@ secure-common = omap-smc.o omap-secure.o 
obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common)

obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common)

obj-$(CONFIG_SOC_OMAP5)	 += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)

drivers/irqchip/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -75,6 +75,11 @@ config OR1K_PIC 
	bool

	select IRQ_DOMAIN



config OMAP_IRQCHIP

	bool

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN



config ORION_IRQCHIP

	bool

	select IRQ_DOMAIN

drivers/irqchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_ARCH_MOXART) += irq-moxart.o 
obj-$(CONFIG_CLPS711X_IRQCHIP)		+= irq-clps711x.o

obj-$(CONFIG_OR1K_PIC)			+= irq-or1k-pic.o

obj-$(CONFIG_ORION_IRQCHIP)		+= irq-orion.o

obj-$(CONFIG_OMAP_IRQCHIP)		+= irq-omap-intc.o

obj-$(CONFIG_ARCH_SUNXI)		+= irq-sun4i.o

obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi-nmi.o

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

arch/arm/mach-omap2/irq.c→drivers/irqchip/irq-omap-intc.c

+5 −4
Original line number Diff line number Diff line
@@ -17,15 +17,16 @@ 
#include <linux/io.h>



#include <asm/exception.h>

#include <asm/mach/irq.h>

#include <linux/irqdomain.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>



#include "soc.h"

#include "common.h"

#include "../../drivers/irqchip/irqchip.h"

#include "irqchip.h"



/* Define these here for now until we drop all board-files */

#define OMAP24XX_IC_BASE	0x480fe000

#define OMAP34XX_IC_BASE	0x48200000



/* selected INTC register offsets */