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

Conflicts:
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/common.c

diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index e417a8383dbbcb4feae0dfdd2f59d956d8faeaa3,ddaa037be02815cfc71b1cb78ffe86b94c3d8109..8faef269bffae789156bcdbde814f98e06dc0ea4
--- 1/arch/arm/mach-tegra/board-dt.c
--- 2/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@@ -134,6 -144,5 +144,6 @@@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegr
        .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_dt_init,
-       .dt_compat      = tegra_dt_board_compat,
 +      .restart        = tegra_assert_system_reset,
+       .dt_compat      = tegra20_dt_board_compat,
  MACHINE_END

diff --cc arch/arm/mach-tegra/board-harmony.c
Simple merge

diff --cc arch/arm/mach-tegra/board-paz00.c
Simple merge

diff --cc arch/arm/mach-tegra/board-seaboard.c
Simple merge

diff --cc arch/arm/mach-tegra/board-trimslice.c
Simple merge

diff --cc arch/arm/mach-tegra/common.c
index 20f396d740fa40a9e5852741d338429ba5f37bb8,8911e620c092b06d2d2ec35f586705610b28bb7d..864dc970b9b50ac634070f58314fa3467b81d92e
--- 1/arch/arm/mach-tegra/common.c
--- 2/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -31,14 -33,26 +33,24 @@@
  #include "clock.h"
  #include "fuse.h"
  
 -void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;
 -
+ static const struct of_device_id tegra_dt_irq_match[] __initconst = {
+       { .compatible = "arm,cortex-a9-gic", .data = gic_of_init },
+       { }
+ };
+ 
+ void __init tegra_dt_init_irq(void)
+ {
+       tegra_init_irq();
+       of_irq_init(tegra_dt_irq_match);
+ }
+ 
  void tegra_assert_system_reset(char mode, const char *cmd)
  {
-       void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);
+       void __iomem *reset = IO_ADDRESS(TEGRA_PMC_BASE + 0);
        u32 reg;
  
-       /* use *_related to avoid spinlock since caches are off */
        reg = readl_relaxed(reset);
-       reg |= 0x04;
+       reg |= 0x10;
        writel_relaxed(reg, reset);
  }