diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-09-15 11:45:31 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-09-19 14:27:26 +0200 |
| commit | 58fbe07560fdb07a20a07f01f6cf97635a3ccab3 (patch) | |
| tree | 52555d074977daaa28fae1d068b7981a2f03b91c /target/linux/cns3xxx/patches-4.4/031-pcie_init.patch | |
| parent | 413eb04e1eeff0ea140b0dd5365ae04fb0dabd46 (diff) | |
| download | master-31e0f0ae-58fbe07560fdb07a20a07f01f6cf97635a3ccab3.tar.gz master-31e0f0ae-58fbe07560fdb07a20a07f01f6cf97635a3ccab3.tar.bz2 master-31e0f0ae-58fbe07560fdb07a20a07f01f6cf97635a3ccab3.zip | |
cns3xxx: move laguna.c changes out of patches, update it in files/
Signed-off-by: Felix Fietkau <nbd@nbd.name>
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, 0 insertions, 33 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 deleted file mode 100644 index 52c73d7aee..0000000000 --- a/target/linux/cns3xxx/patches-4.4/031-pcie_init.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 |