cns3xxx: reorganize patches, fix pcie io space init order

[openwrt/svn-archive/archive.git] / target / linux / cns3xxx / patches-3.3 / 104-cns3xxx_gpio.patch

diff --git a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
index 135247b54fb66dc1a050aa1346dd238e79e60fb4..a4d186c86889718f9c222b9428283fde995c7115 100644 (file)
--- a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
+++ b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
@@ -96,7 +96,7 @@
  /* used by entry-macro.S */
 --- a/arch/arm/mach-cns3xxx/core.h
 +++ b/arch/arm/mach-cns3xxx/core.h
-@@ -20,7 +20,7 @@ void __init cns3xxx_l2x0_init(void);
+@@ -21,7 +21,7 @@ void __init cns3xxx_l2x0_init(void);
  static inline void cns3xxx_l2x0_init(void) {}
  #endif /* CONFIG_CACHE_L2X0 */
  
@@ -105,14 +105,3 @@
  void __init cns3xxx_init_irq(void);
  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
-@@ -612,7 +612,7 @@ static struct map_desc laguna_io_desc[] 
- 
- static void __init laguna_map_io(void)
- {
--      cns3xxx_map_io();
-+      cns3xxx_common_init();
-       iotable_init(laguna_io_desc, ARRAY_SIZE(laguna_io_desc));
-       laguna_early_serial_setup();
- }