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

Commit 66fafb6f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mmp-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into late/all 

From Haojian Zhuang:
Move irq driver out of mach-mmp to support multiplatform

* tag 'mmp-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
  irqchip: mmp: avoid to include irqs head file
  ARM: mmp: avoid to include head file in mach-mmp
  irqchip: mmp: support irqchip
  irqchip: move mmp irq driver
parents b94c1823 942f4221

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ config ARCH_MMP 
	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select NEED_MACH_GPIO_H

	select PINCTRL

	select PLAT_PXA

arch/arm/mach-mmp/Makefile

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

arch/arm/mach-mmp/common.h

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,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(enum reboot_mode, const char *);

extern void __init pxa168_clk_init(void);

arch/arm/mach-mmp/include/mach/entry-macro.S

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-mmp/include/mach/entry-macro.S

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <asm/irq.h>

#include <mach/regs-icu.h>



	.macro	get_irqnr_preamble, base, tmp

	mrc	p15, 0, \tmp, c0, c0, 0		@ CPUID

	and	\tmp, \tmp, #0xff00

	cmp	\tmp, #0x5800

	ldr	\base, =mmp_icu_base

	ldr	\base, [\base, #0]

	addne	\base, \base, #0x10c		@ PJ1 AP INT SEL register

	addeq	\base, \base, #0x104		@ PJ4 IRQ SEL register

	.endm



	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp

	ldr	\tmp, [\base, #0]

	and	\irqnr, \tmp, #0x3f

	tst	\tmp, #(1 << 6)

	.endm

arch/arm/mach-mmp/include/mach/pxa168.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/reboot.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(enum reboot_mode, const char *);

extern void pxa168_clear_keypad_wakeup(void);