From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 00:19:17 +0000 (+1100)
Subject: Merge remote-tracking branch 'tegra/for-next'
X-Git-Tag: next-20111214~96
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bcb20d25969d58de57163e7a0af891ddc858b176;p=karo-tx-linux.git

Merge remote-tracking branch 'tegra/for-next'

Conflicts:
	arch/arm/mach-tegra/board-dt.c
	arch/arm/mach-tegra/include/mach/entry-macro.S
---

bcb20d25969d58de57163e7a0af891ddc858b176
diff --cc arch/arm/mach-tegra/board-dt.c
index e417a8383dbb,2fa599da7deb..ddc5effef91f
--- a/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt.c
@@@ -130,10 -150,8 +151,10 @@@ static const char * tegra_dt_board_comp
  DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)")
  	.map_io		= tegra_map_common_io,
  	.init_early	= tegra_init_early,
- 	.init_irq	= tegra_init_irq,
+ 	.init_irq	= tegra_dt_init_irq,
 +	.handle_irq	= gic_handle_irq,
  	.timer		= &tegra_timer,
  	.init_machine	= tegra_dt_init,
 +	.restart	= tegra_assert_system_reset,
  	.dt_compat	= tegra_dt_board_compat,
  MACHINE_END
diff --cc arch/arm/mach-tegra/include/mach/entry-macro.S
index ac11262149c7,485a11eeaceb..31e28ae58529
--- a/arch/arm/mach-tegra/include/mach/entry-macro.S
+++ b/arch/arm/mach-tegra/include/mach/entry-macro.S
@@@ -16,23 -24,10 +16,5 @@@
  	.macro	disable_fiq
  	.endm
  
- 	.macro	arch_ret_to_user, tmp1, tmp2
 -	.macro	get_irqnr_preamble, base, tmp
 -	movw \base, #(ICTRL_BASE & 0x0000ffff)
 -	movt \base, #((ICTRL_BASE & 0xffff0000) >> 16)
 -	.endm
 -
+ 	.macro  arch_ret_to_user, tmp1, tmp2
  	.endm
- 
- #if !defined(CONFIG_ARM_GIC)
- 	/* legacy interrupt controller for AP16 */
- 
- 	.macro	get_irqnr_preamble, base, tmp
- 	@ enable imprecise aborts
- 	cpsie	a
- 	@ EVP base at 0xf010f000
- 	mov \base, #0xf0000000
- 	orr \base, #0x00100000
- 	orr \base, #0x0000f000
- 	.endm
- 
- 	.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
- 	ldr \irqnr, [\base, #0x20]	@ EVT_IRQ_STS
- 	cmp \irqnr, #0x80
- 	.endm
- #endif