Merge branch 'depends/rmk/for-linus' into next/soc
Arnd Bergmann [Sat, 7 Jan 2012 20:53:13 +0000 (20:53 +0000)]
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c

1  2 
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-omap2/common.h
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/board-seaboard.c
arch/arm/mach-tegra/board-trimslice.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/timer.c

Simple merge
@@@ -38,9 -38,15 +38,10 @@@ static void __init ti8168_evm_init(void
  MACHINE_START(TI8168EVM, "ti8168evm")
        /* Maintainer: Texas Instruments */
        .atag_offset    = 0x100,
 -      .map_io         = ti8168_evm_map_io,
 -      .init_early     = ti816x_init_early,
 -      .init_irq       = ti816x_init_irq,
 +      .map_io         = ti81xx_map_io,
 +      .init_early     = ti81xx_init_early,
 +      .init_irq       = ti81xx_init_irq,
        .timer          = &omap3_timer,
        .init_machine   = ti8168_evm_init,
+       .restart        = omap_prcm_restart,
  MACHINE_END
@@@ -90,8 -82,9 +90,9 @@@ void omap35xx_init_early(void)
  void omap3630_init_early(void);
  void omap3_init_early(void);  /* Do not use this one */
  void am35xx_init_early(void);
 -void ti816x_init_early(void);
 +void ti81xx_init_early(void);
  void omap4430_init_early(void);
+ void omap_prcm_restart(char, const char *);
  
  /*
   * IO bases for various OMAP processors
@@@ -144,5 -134,6 +144,6 @@@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegr
        .handle_irq     = gic_handle_irq,
        .timer          = &tegra_timer,
        .init_machine   = tegra_dt_init,
+       .restart        = tegra_assert_system_reset,
 -      .dt_compat      = tegra_dt_board_compat,
 +      .dt_compat      = tegra20_dt_board_compat,
  MACHINE_END
Simple merge
Simple merge
Simple merge
Simple merge
  #include "clock.h"
  #include "fuse.h"
  
- void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;
 +#ifdef CONFIG_OF
 +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);
 +}
 +#endif
 +
  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);
  }
  
Simple merge