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