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

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select NEED_MACH_GPIO_H

	select PINCTRL

	select PLAT_PXA

# 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

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

/*

 * 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

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