cns3xxx: use files directory

[openwrt.git] / target / linux / cns3xxx / patches-3.3 / 480-cns3xxx_pcie_early_init.patch

diff --git a/target/linux/cns3xxx/patches-3.3/480-cns3xxx_pcie_early_init.patch b/target/linux/cns3xxx/patches-3.3/480-cns3xxx_pcie_early_init.patch
index 704a6f7..dba0da8 100644 (file)
--- a/target/linux/cns3xxx/patches-3.3/480-cns3xxx_pcie_early_init.patch
+++ b/target/linux/cns3xxx/patches-3.3/480-cns3xxx_pcie_early_init.patch
@@ -51,61 +51,6 @@
  void cns3xxx_power_off(void);
  void cns3xxx_restart(char, const char *);
  
---- a/arch/arm/mach-cns3xxx/laguna.c
-+++ b/arch/arm/mach-cns3xxx/laguna.c
-@@ -729,7 +731,7 @@ static struct map_desc laguna_io_desc[]
- static void __init laguna_map_io(void)
- {
-       cns3xxx_common_init();
--      cns3xxx_pcie_iotable_init(0x3);
-+      cns3xxx_pcie_iotable_init();
-       iotable_init(ARRAY_AND_SIZE(laguna_io_desc));
-       laguna_early_serial_setup();
- }
-@@ -753,11 +755,19 @@ 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;
-       u32 reg;
--      u8 pcie_bitmap = 0;
- 
-       printk("Running on Gateworks Laguna %s\n", laguna_info.model);
-       cns3xxx_gpio_init( 0, 32, CNS3XXX_GPIOA_BASE_VIRT, IRQ_CNS3XXX_GPIOA,
-@@ -779,14 +789,6 @@ static int __init laguna_model_setup(voi
-                   (laguna_info.config_bitmap & SATA1_LOAD))
-                       cns3xxx_ahci_init();
- 
--              if (laguna_info.config_bitmap & (PCIE0_LOAD))
--                      pcie_bitmap |= 0x1;
--
--              if (laguna_info.config_bitmap & (PCIE1_LOAD))
--                      pcie_bitmap |= 0x2;
--
--              cns3xxx_pcie_init(pcie_bitmap);
--
-               if (laguna_info.config_bitmap & (USB0_LOAD)) {
-                       cns3xxx_pwr_power_up(1 << PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_USB);
- 
-@@ -926,7 +928,6 @@ static int __init laguna_model_setup(voi
-       }
-       return 0;
- }
--
- late_initcall(laguna_model_setup);
- 
- MACHINE_START(GW2388, "Gateworks Corporation Laguna Platform")
 --- a/arch/arm/mach-cns3xxx/pcie.c
 +++ b/arch/arm/mach-cns3xxx/pcie.c
 @@ -456,23 +456,18 @@ static int cns3xxx_pcie_abort_handler(un