linux: update 3.1 to 3.1.1

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 40 insertions, 66 deletions

diff --git a/target/linux/lantiq/patches/0015-MIPS-lantiq-adds-etop-support-for-ase-ar9.patch b/target/linux/lantiq/patches/0015-MIPS-lantiq-adds-etop-support-for-ase-ar9.patch
index 10e69df4e..503c6bf78 100644
--- a/target/linux/lantiq/patches/0015-MIPS-lantiq-adds-etop-support-for-ase-ar9.patch
+++ b/target/linux/lantiq/patches/0015-MIPS-lantiq-adds-etop-support-for-ase-ar9.patch
@@ -69,7 +69,7 @@ Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
  /* DMA */
  #define LTQ_DMA_BASE_ADDR	0x1E104100
  #define LTQ_DMA_SIZE		0x800
-@@ -148,6 +153,11 @@ extern void ltq_pmu_enable(unsigned int
+@@ -146,6 +151,11 @@ extern void ltq_pmu_enable(unsigned int
  extern void ltq_pmu_disable(unsigned int module);
  extern void ltq_cgu_enable(unsigned int clk);
  
@@ -83,7 +83,7 @@ Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
  	return (ltq_get_soc_type() == SOC_TYPE_AR9);
 --- a/arch/mips/lantiq/xway/devices.c
 +++ b/arch/mips/lantiq/xway/devices.c
-@@ -77,18 +77,23 @@ void __init ltq_register_ase_asc(void)
+@@ -74,18 +74,23 @@ void __init ltq_register_ase_asc(void)
  }
  
  /* ethernet */
diff --git a/target/linux/lantiq/patches/0016-MIPS-lantiq-adds-xway-nand-driver.patch b/target/linux/lantiq/patches/0016-MIPS-lantiq-adds-xway-nand-driver.patch
index fbcdb2762..b7ad78905 100644
--- a/target/linux/lantiq/patches/0016-MIPS-lantiq-adds-xway-nand-driver.patch
+++ b/target/linux/lantiq/patches/0016-MIPS-lantiq-adds-xway-nand-driver.patch
@@ -26,7 +26,7 @@ TODO : memory ranges
 
 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
 +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
-@@ -140,6 +140,8 @@
+@@ -138,6 +138,8 @@
  /* register access macros for EBU and CGU */
  #define ltq_ebu_w32(x, y)	ltq_w32((x), ltq_ebu_membase + (y))
  #define ltq_ebu_r32(x)		ltq_r32(ltq_ebu_membase + (x))
diff --git a/target/linux/lantiq/patches/0026-MIPS-lantiq-adds-GPIO3-support-on-AR9.patch b/target/linux/lantiq/patches/0026-MIPS-lantiq-adds-GPIO3-support-on-AR9.patch
index e96d9b70d..ee41b3ab4 100644
--- a/target/linux/lantiq/patches/0026-MIPS-lantiq-adds-GPIO3-support-on-AR9.patch
+++ b/target/linux/lantiq/patches/0026-MIPS-lantiq-adds-GPIO3-support-on-AR9.patch
@@ -20,7 +20,7 @@ Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
 
 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
 +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
-@@ -113,7 +113,9 @@
+@@ -121,7 +121,9 @@
  #define LTQ_GPIO0_BASE_ADDR	0x1E100B10
  #define LTQ_GPIO1_BASE_ADDR	0x1E100B40
  #define LTQ_GPIO2_BASE_ADDR	0x1E100B70
diff --git a/target/linux/lantiq/patches/110-sdk-compat.patch b/target/linux/lantiq/patches/110-sdk-compat.patch
index 53f1a602a..ca8d92eda 100644
--- a/target/linux/lantiq/patches/110-sdk-compat.patch
+++ b/target/linux/lantiq/patches/110-sdk-compat.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h	2011-11-13 00:18:10.316010867 +0100
+--- /dev/null
++++ b/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h
 @@ -0,0 +1,60 @@
 +/*
 + * This program is free software; you can redistribute it and/or
diff --git a/target/linux/lantiq/patches/210-machtypes.patch b/target/linux/lantiq/patches/210-machtypes.patch
index f4e86b921..55b67428d 100644
--- a/target/linux/lantiq/patches/210-machtypes.patch
+++ b/target/linux/lantiq/patches/210-machtypes.patch
@@ -1,8 +1,6 @@
-Index: linux-3.1/arch/mips/lantiq/machtypes.h
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/machtypes.h	2011-11-03 10:32:53.117317313 +0100
-+++ linux-3.1/arch/mips/lantiq/machtypes.h	2011-11-03 15:57:57.106151011 +0100
-@@ -20,9 +20,34 @@
+--- a/arch/mips/lantiq/machtypes.h
++++ b/arch/mips/lantiq/machtypes.h
+@@ -20,9 +20,34 @@ enum lantiq_mach_type {
  	LANTIQ_MACH_EASY98000,		/* Falcon Eval Board, NOR Flash */
  	LANTIQ_MACH_EASY98000SF,	/* Falcon Eval Board, Serial Flash */
  	LANTIQ_MACH_EASY98000NAND,	/* Falcon Eval Board, NAND Flash */
@@ -37,11 +35,9 @@ Index: linux-3.1/arch/mips/lantiq/machtypes.h
  };
  
  #endif
-Index: linux-3.1/arch/mips/lantiq/xway/Kconfig
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/xway/Kconfig	2011-11-03 10:32:53.117317313 +0100
-+++ linux-3.1/arch/mips/lantiq/xway/Kconfig	2011-11-03 10:32:53.409317325 +0100
-@@ -6,6 +6,22 @@
+--- a/arch/mips/lantiq/xway/Kconfig
++++ b/arch/mips/lantiq/xway/Kconfig
+@@ -6,6 +6,22 @@ config LANTIQ_MACH_EASY50712
  	bool "Easy50712 - Danube"
  	default y
  
@@ -64,11 +60,9 @@ Index: linux-3.1/arch/mips/lantiq/xway/Kconfig
  endmenu
  
  endif
-Index: linux-3.1/arch/mips/lantiq/xway/Makefile
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/xway/Makefile	2011-11-03 10:32:53.117317313 +0100
-+++ linux-3.1/arch/mips/lantiq/xway/Makefile	2011-11-03 15:57:59.222151170 +0100
-@@ -7,3 +7,7 @@
+--- a/arch/mips/lantiq/xway/Makefile
++++ b/arch/mips/lantiq/xway/Makefile
+@@ -7,3 +7,7 @@ obj-$(CONFIG_SOC_VR9) += clk-vr9.o prom-
  obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o
  obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o
  obj-$(CONFIG_LANTIQ_MACH_FRITZ3370) += mach-fritz.o
@@ -76,11 +70,9 @@ Index: linux-3.1/arch/mips/lantiq/xway/Makefile
 +obj-$(CONFIG_LANTIQ_MACH_NETGEAR) += mach-netgear.o
 +obj-$(CONFIG_LANTIQ_MACH_GIGASX76X) += mach-gigasx76x.o
 +obj-$(CONFIG_LANTIQ_MACH_WBMR) += mach-wbmr.o
-Index: linux-3.1/arch/mips/lantiq/falcon/Kconfig
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/falcon/Kconfig	2011-11-03 10:32:52.697317294 +0100
-+++ linux-3.1/arch/mips/lantiq/falcon/Kconfig	2011-11-03 10:32:53.409317325 +0100
-@@ -6,6 +6,14 @@
+--- a/arch/mips/lantiq/falcon/Kconfig
++++ b/arch/mips/lantiq/falcon/Kconfig
+@@ -6,6 +6,14 @@ config LANTIQ_MACH_EASY98000
  	bool "Easy98000"
  	default y
  
@@ -95,10 +87,8 @@ Index: linux-3.1/arch/mips/lantiq/falcon/Kconfig
  endmenu
  
  endif
-Index: linux-3.1/arch/mips/lantiq/falcon/Makefile
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/falcon/Makefile	2011-11-03 10:32:53.033317309 +0100
-+++ linux-3.1/arch/mips/lantiq/falcon/Makefile	2011-11-03 10:32:53.409317325 +0100
+--- a/arch/mips/lantiq/falcon/Makefile
++++ b/arch/mips/lantiq/falcon/Makefile
 @@ -1,2 +1,6 @@
  obj-y := clk.o prom.o reset.o sysctrl.o devices.o gpio.o softdog_vpe.o
 +obj-$(CONFIG_LANTIQ_MACH_EASY98000) += addon-easy98000.o
@@ -106,10 +96,8 @@ Index: linux-3.1/arch/mips/lantiq/falcon/Makefile
  obj-$(CONFIG_LANTIQ_MACH_EASY98000) += mach-easy98000.o
 +obj-$(CONFIG_LANTIQ_MACH_EASY98020) += mach-easy98020.o
 +obj-$(CONFIG_LANTIQ_MACH_95C3AM1)   += mach-95C3AM1.o
-Index: linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/falcon/mach-easy98000.c	2011-11-03 10:32:52.805317298 +0100
-+++ linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c	2011-11-03 10:32:53.413317324 +0100
+--- a/arch/mips/lantiq/falcon/mach-easy98000.c
++++ b/arch/mips/lantiq/falcon/mach-easy98000.c
 @@ -1,23 +1,38 @@
 -/*
 - *  This program is free software; you can redistribute it and/or modify it
@@ -159,7 +147,7 @@ Index: linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c
  	{
  		.name	= "uboot",
  		.offset	= 0x0,
-@@ -35,7 +50,7 @@
+@@ -35,7 +50,7 @@ static struct mtd_partition easy98000_no
  	},
  };
  
@@ -168,7 +156,7 @@ Index: linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c
  	.nr_parts	= ARRAY_SIZE(easy98000_nor_partitions),
  	.parts		= easy98000_nor_partitions,
  };
-@@ -55,12 +70,105 @@
+@@ -55,12 +70,105 @@ static struct spi_board_info easy98000_s
  	.platform_data		= &easy98000_spi_flash_platform_data
  };
  
@@ -279,7 +267,7 @@ Index: linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c
  #define SPI_GPIO_BUS_NUM	1
  
  static struct spi_gpio_platform_data easy98000_spi_gpio_data = {
-@@ -93,29 +201,36 @@
+@@ -93,29 +201,36 @@ static struct spi_board_info easy98000_s
  	.platform_data		= &at25160n,
  };
  
diff --git a/target/linux/lantiq/patches/211-devices.patch b/target/linux/lantiq/patches/211-devices.patch
index a5561c788..4c3f50fc8 100644
--- a/target/linux/lantiq/patches/211-devices.patch
+++ b/target/linux/lantiq/patches/211-devices.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/arch/mips/lantiq/devices.c
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/devices.c	2011-11-12 18:06:54.712192370 +0100
-+++ linux-3.1/arch/mips/lantiq/devices.c	2011-11-12 18:06:55.544192390 +0100
+--- a/arch/mips/lantiq/devices.c
++++ b/arch/mips/lantiq/devices.c
 @@ -18,6 +18,7 @@
  #include <linux/time.h>
  #include <linux/io.h>
@@ -10,7 +8,7 @@ Index: linux-3.1/arch/mips/lantiq/devices.c
  
  #include <asm/bootinfo.h>
  #include <asm/irq.h>
-@@ -100,3 +101,20 @@
+@@ -100,3 +101,20 @@ void __init ltq_register_pci(struct ltq_
  	pr_err("kernel is compiled without PCI support\n");
  }
  #endif
@@ -31,21 +29,17 @@ Index: linux-3.1/arch/mips/lantiq/devices.c
 +	cp1_base =
 +		(void*)CPHYSADDR(dma_alloc_coherent(NULL, CP1_SIZE, &dma, GFP_ATOMIC));
 +}
-Index: linux-3.1/arch/mips/lantiq/devices.h
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/devices.h	2011-11-12 18:06:54.712192370 +0100
-+++ linux-3.1/arch/mips/lantiq/devices.h	2011-11-12 18:06:55.544192390 +0100
-@@ -23,5 +23,6 @@
+--- a/arch/mips/lantiq/devices.h
++++ b/arch/mips/lantiq/devices.h
+@@ -23,5 +23,6 @@ extern void ltq_register_nor(struct phys
  extern void ltq_register_wdt(void);
  extern void ltq_register_asc(int port);
  extern void ltq_register_pci(struct ltq_pci_data *data);
 +extern void ltq_register_tapi(void);
  
  #endif
-Index: linux-3.1/arch/mips/lantiq/xway/Makefile
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/xway/Makefile	2011-11-12 18:06:55.520192389 +0100
-+++ linux-3.1/arch/mips/lantiq/xway/Makefile	2011-11-12 18:06:55.544192390 +0100
+--- a/arch/mips/lantiq/xway/Makefile
++++ b/arch/mips/lantiq/xway/Makefile
 @@ -1,5 +1,7 @@
  obj-y := sysctrl.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o nand.o timer.o
  
@@ -54,10 +48,8 @@ Index: linux-3.1/arch/mips/lantiq/xway/Makefile
  obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o
  obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o
  obj-$(CONFIG_SOC_VR9) += clk-vr9.o prom-vr9.o
-Index: linux-3.1/arch/mips/lantiq/xway/devices.c
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/xway/devices.c	2011-11-12 18:06:55.304192384 +0100
-+++ linux-3.1/arch/mips/lantiq/xway/devices.c	2011-11-12 18:06:55.544192390 +0100
+--- a/arch/mips/lantiq/xway/devices.c
++++ b/arch/mips/lantiq/xway/devices.c
 @@ -19,6 +19,7 @@
  #include <linux/time.h>
  #include <linux/io.h>
@@ -66,7 +58,7 @@ Index: linux-3.1/arch/mips/lantiq/xway/devices.c
  
  #include <asm/bootinfo.h>
  #include <asm/irq.h>
-@@ -99,3 +100,98 @@
+@@ -99,3 +100,98 @@ ltq_register_etop(struct ltq_eth_data *e
  		platform_device_register(&ltq_etop);
  	}
  }
@@ -165,10 +157,8 @@ Index: linux-3.1/arch/mips/lantiq/xway/devices.c
 +	ltq_spi.dev.platform_data = pdata;
 +	platform_device_register(&ltq_spi);
 +}
-Index: linux-3.1/arch/mips/lantiq/xway/devices.h
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/xway/devices.h	2011-10-24 09:10:05.000000000 +0200
-+++ linux-3.1/arch/mips/lantiq/xway/devices.h	2011-11-12 18:06:55.544192390 +0100
+--- a/arch/mips/lantiq/xway/devices.h
++++ b/arch/mips/lantiq/xway/devices.h
 @@ -11,10 +11,17 @@
  
  #include "../devices.h"
@@ -187,10 +177,8 @@ Index: linux-3.1/arch/mips/lantiq/xway/devices.h
 +extern void ltq_register_gpio_buttons(struct gpio_button *buttons, int cnt);
  
  #endif
-Index: linux-3.1/arch/mips/lantiq/Makefile
-===================================================================
---- linux-3.1.orig/arch/mips/lantiq/Makefile	2011-11-12 18:06:54.780192371 +0100
-+++ linux-3.1/arch/mips/lantiq/Makefile	2011-11-12 19:52:32.700339384 +0100
+--- a/arch/mips/lantiq/Makefile
++++ b/arch/mips/lantiq/Makefile
 @@ -4,7 +4,7 @@
  # under the terms of the GNU General Public License version 2 as published
  # by the Free Software Foundation.