Merge branch 'fixes-dt' into fixes

diff --combined arch/arm/mach-omap2/board-generic.c
index d587560604836f5d7ee836b773f37798c17cdf41,e493877957c9884011b10414764daaf64362acba..ad497620539bccdada5a0907a19fab8f7da36813
--- 1/arch/arm/mach-omap2/board-generic.c
--- 2/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -17,6 -17,7 +17,7 @@@
  #include <linux/i2c/twl.h>
  
  #include <mach/hardware.h>
+ #include <asm/hardware/gic.h>
  #include <asm/mach/arch.h>
  
  #include <plat/board.h>
@@@ -69,6 -70,7 +70,6 @@@ static void __init omap_generic_init(vo
        if (node)
                irq_domain_add_simple(node, 0);
  
 -      omap_serial_init();
        omap_sdrc_init(NULL, NULL);
  
        of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
@@@ -102,10 -104,10 +103,11 @@@ DT_MACHINE_START(OMAP242X_DT, "Generic 
        .map_io         = omap242x_map_io,
        .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
+       .handle_irq     = omap2_intc_handle_irq,
        .init_machine   = omap_generic_init,
        .timer          = &omap2_timer,
        .dt_compat      = omap242x_boards_compat,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  #endif
  
@@@ -125,7 -127,6 +127,7 @@@ DT_MACHINE_START(OMAP243X_DT, "Generic 
        .init_machine   = omap_generic_init,
        .timer          = &omap2_timer,
        .dt_compat      = omap243x_boards_compat,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  #endif
  
@@@ -141,10 -142,10 +143,11 @@@ DT_MACHINE_START(OMAP3_DT, "Generic OMA
        .map_io         = omap3_map_io,
        .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
+       .handle_irq     = omap3_intc_handle_irq,
        .init_machine   = omap3_init,
        .timer          = &omap3_timer,
        .dt_compat      = omap3_boards_compat,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  #endif
  
@@@ -160,9 -161,9 +163,10 @@@ DT_MACHINE_START(OMAP4_DT, "Generic OMA
        .map_io         = omap4_map_io,
        .init_early     = omap4430_init_early,
        .init_irq       = gic_init_irq,
+       .handle_irq     = gic_handle_irq,
        .init_machine   = omap4_init,
        .timer          = &omap4_timer,
        .dt_compat      = omap4_boards_compat,
 +      .restart        = omap_prcm_restart,
  MACHINE_END
  #endif