target/linux/cns3xxx/patches-3.18/031-pcie_init.patch

   1 --- a/arch/arm/mach-cns3xxx/laguna.c
   2 +++ b/arch/arm/mach-cns3xxx/laguna.c
   3 @@ -849,7 +849,6 @@ static struct map_desc laguna_io_desc[]
   4  static void __init laguna_map_io(void)
   5  {
   6         cns3xxx_map_io();
   7 -       cns3xxx_pcie_iotable_init();
   8         iotable_init(ARRAY_AND_SIZE(laguna_io_desc));
   9         laguna_early_serial_setup();
  10  }
  11 @@ -873,15 +872,6 @@ static int laguna_register_gpio(struct g
  12         return ret;
  13  }
  14
  15 -static int __init laguna_pcie_init(void)
  16 -{
  17 -       if (!machine_is_gw2388())
  18 -               return 0;
  19 -
  20 -       return cns3xxx_pcie_init();
  21 -}
  22 -subsys_initcall(laguna_pcie_init);
  23 -
  24  static int __init laguna_model_setup(void)
  25  {
  26         u32 __iomem *mem;
  27 @@ -1077,5 +1067,6 @@ MACHINE_START(GW2388, "Gateworks Corpora
  28         .init_irq       = cns3xxx_init_irq,
  29         .init_time      = cns3xxx_timer_init,
  30         .init_machine   = laguna_init,
  31 +       .init_late      = cns3xxx_pcie_init_late,
  32         .restart        = cns3xxx_restart,
  33  MACHINE_END