diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 22:38:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-18 22:38:23 +0000 |
| commit | 87e4f9f0093dc01a136830f76313c54372692953 (patch) | |
| tree | 5e6aa154107ff8375cdb96a05025c969c7a3424d /target/linux/cns3xxx/patches-4.4/031-pcie_init.patch | |
| parent | 91278df70e2139cfea3357fa9053bb69dd76cf66 (diff) | |
| download | upstream-87e4f9f0093dc01a136830f76313c54372692953.tar.gz upstream-87e4f9f0093dc01a136830f76313c54372692953.tar.bz2 upstream-87e4f9f0093dc01a136830f76313c54372692953.zip | |
cns3xxx: update to linux 4.4
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48334
Diffstat (limited to 'target/linux/cns3xxx/patches-4.4/031-pcie_init.patch')
| -rw-r--r-- | target/linux/cns3xxx/patches-4.4/031-pcie_init.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/cns3xxx/patches-4.4/031-pcie_init.patch b/target/linux/cns3xxx/patches-4.4/031-pcie_init.patch new file mode 100644 index 0000000000..651d1a2f07 --- /dev/null +++ b/target/linux/cns3xxx/patches-4.4/031-pcie_init.patch @@ -0,0 +1,33 @@ +--- a/arch/arm/mach-cns3xxx/laguna.c ++++ b/arch/arm/mach-cns3xxx/laguna.c +@@ -849,7 +849,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(); + } +@@ -873,15 +872,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; +@@ -1077,5 +1067,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 |