kernel: refresh patches for 2.6.34-rc5 and update md5sum

SVN-Revision: 21082

6 files changed, 43 insertions, 55 deletions

diff --git a/target/linux/mx2/Makefile b/target/linux/mx2/Makefile
index 734ab1a70c..9ccf2cbed6 100644
--- a/target/linux/mx2/Makefile
+++ b/target/linux/mx2/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Freescale MX2
 FEATURES:=jffs2
 CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time
 
-LINUX_VERSION:=2.6.34-rc3
+LINUX_VERSION:=2.6.34-rc5
 
 DEVICE_TYPE=phone
 
diff --git a/target/linux/mx2/patches-2.6.34/010-mach-vp6500.patch b/target/linux/mx2/patches-2.6.34/010-mach-vp6500.patch
index 42d0e1e3f1..8d1832b56d 100644
--- a/target/linux/mx2/patches-2.6.34/010-mach-vp6500.patch
+++ b/target/linux/mx2/patches-2.6.34/010-mach-vp6500.patch
@@ -1,6 +1,6 @@
---- a/arch/arm/mach-mx2/Kconfig	2010-04-10 13:56:17.000000000 +0200
-+++ b/arch/arm/mach-mx2/Kconfig	2010-04-10 13:42:38.000000000 +0200
-@@ -27,6 +27,12 @@
+--- a/arch/arm/mach-mx2/Kconfig
++++ b/arch/arm/mach-mx2/Kconfig
+@@ -27,6 +27,12 @@ config MACH_MX21ADS
  	  Include support for MX21ADS platform. This includes specific
  	  configurations for the board and its peripherals.
  
@@ -13,9 +13,9 @@
  config MACH_MX27ADS
  	bool "MX27ADS platform"
  	depends on MACH_MX27
---- a/arch/arm/mach-mx2/Makefile	2010-04-10 13:56:17.000000000 +0200
-+++ b/arch/arm/mach-mx2/Makefile	2010-04-10 13:49:32.000000000 +0200
-@@ -21,3 +21,4 @@
+--- a/arch/arm/mach-mx2/Makefile
++++ b/arch/arm/mach-mx2/Makefile
+@@ -21,3 +21,4 @@ obj-$(CONFIG_MACH_CPUIMX27) += mach-cpui
  obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
  obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
  obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
diff --git a/target/linux/mx2/patches-2.6.34/011-mach-type.patch b/target/linux/mx2/patches-2.6.34/011-mach-type.patch
index 39075f5e2b..873f03083a 100644
--- a/target/linux/mx2/patches-2.6.34/011-mach-type.patch
+++ b/target/linux/mx2/patches-2.6.34/011-mach-type.patch
@@ -1,6 +1,6 @@
---- a/arch/arm/tools/mach-types	2010-04-10 13:56:20.000000000 +0200
-+++ b/arch/arm/tools/mach-types	2010-04-10 15:24:46.000000000 +0200
-@@ -530,7 +530,7 @@
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -530,7 +530,7 @@ sg560			MACH_SG560		SG560			513
  dp1000			MACH_DP1000		DP1000			514
  omap_osk		MACH_OMAP_OSK		OMAP_OSK		515
  rg100v3			MACH_RG100V3		RG100V3			516
diff --git a/target/linux/mx2/patches-2.6.34/020-fix-usb-ioresource.patch b/target/linux/mx2/patches-2.6.34/020-fix-usb-ioresource.patch
index dae59b15d7..004ca7ace2 100644
--- a/target/linux/mx2/patches-2.6.34/020-fix-usb-ioresource.patch
+++ b/target/linux/mx2/patches-2.6.34/020-fix-usb-ioresource.patch
@@ -1,6 +1,6 @@
---- a/arch/arm/mach-mx2/devices.c	2010-04-10 13:56:17.000000000 +0200
-+++ b/arch/arm/mach-mx2/devices.c	2010-04-10 15:15:17.000000000 +0200
-@@ -304,7 +304,7 @@
+--- a/arch/arm/mach-mx2/devices.c
++++ b/arch/arm/mach-mx2/devices.c
+@@ -304,7 +304,7 @@ DEFINE_MXC_MMC_DEVICE(1, MX2x_SDHC2_BASE
  #ifdef CONFIG_MACH_MX27
  static struct resource otg_resources[] = {
  	{
@@ -9,7 +9,7 @@
  		.end = MX27_USBOTG_BASE_ADDR + 0x1ff,
  		.flags = IORESOURCE_MEM,
  	}, {
-@@ -483,8 +483,8 @@
+@@ -483,8 +483,8 @@ int __init mxc_register_gpios(void)
  #ifdef CONFIG_MACH_MX21
  static struct resource mx21_usbhc_resources[] = {
  	{
diff --git a/target/linux/mx2/patches-2.6.34/030-lzma.patch b/target/linux/mx2/patches-2.6.34/030-lzma.patch
index 9ccabf6a79..90a1e87603 100644
--- a/target/linux/mx2/patches-2.6.34/030-lzma.patch
+++ b/target/linux/mx2/patches-2.6.34/030-lzma.patch
@@ -17,8 +17,6 @@ v2: Updated to apply on top of 2.6.34-rc1
  4 files changed, 12 insertions(+), 0 deletions(-)
  create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
 
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 3b18128..3ebc7c3 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -21,6 +21,7 @@ config ARM
@@ -29,26 +27,22 @@ index 3b18128..3ebc7c3 100644
  	select HAVE_PERF_EVENTS
  	select PERF_USE_VMALLOC
  	help
-diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
-index 97c89e7..53faa90 100644
 --- a/arch/arm/boot/compressed/Makefile
 +++ b/arch/arm/boot/compressed/Makefile
-@@ -65,6 +65,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
-
+@@ -65,6 +65,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/
+ 
  suffix_$(CONFIG_KERNEL_GZIP) = gzip
  suffix_$(CONFIG_KERNEL_LZO)  = lzo
 +suffix_$(CONFIG_KERNEL_LZMA) = lzma
-
+ 
  targets       := vmlinux vmlinux.lds \
  		 piggy.$(suffix_y) piggy.$(suffix_y).o \
-diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
-index 0da382f..d554df6 100644
 --- a/arch/arm/boot/compressed/decompress.c
 +++ b/arch/arm/boot/compressed/decompress.c
-@@ -39,6 +39,10 @@ extern void error(char *);
+@@ -40,6 +40,10 @@ extern void error(char *);
  #include "../../../../lib/decompress_unlzo.c"
  #endif
-
+ 
 +#ifdef CONFIG_KERNEL_LZMA
 +#include "../../../../lib/decompress_unlzma.c"
 +#endif
@@ -56,9 +50,6 @@ index 0da382f..d554df6 100644
  void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
  {
  	decompress(input, len, NULL, NULL, output, NULL, error);
-diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
-new file mode 100644
-index 0000000..d7e69cf
 --- /dev/null
 +++ b/arch/arm/boot/compressed/piggy.lzma.S
 @@ -0,0 +1,6 @@
@@ -68,6 +59,3 @@ index 0000000..d7e69cf
 +	.incbin	"arch/arm/boot/compressed/piggy.lzma"
 +	.globl	input_data_end
 +input_data_end:
--- 
-1.7.0
-
diff --git a/target/linux/mx2/patches-2.6.34/040-pwm.patch b/target/linux/mx2/patches-2.6.34/040-pwm.patch
index 55e846ec17..af47ad1de0 100644
--- a/target/linux/mx2/patches-2.6.34/040-pwm.patch
+++ b/target/linux/mx2/patches-2.6.34/040-pwm.patch
@@ -1,5 +1,3 @@
-diff --git a/arch/arm/plat-mxc/pwm.c b/arch/arm/plat-mxc/pwm.c
-index c36f263..acc5dc1 100644
 --- a/arch/arm/plat-mxc/pwm.c
 +++ b/arch/arm/plat-mxc/pwm.c
 @@ -25,6 +25,11 @@
@@ -14,7 +12,7 @@ index c36f263..acc5dc1 100644
  
  /* i.MX27, i.MX31, i.MX35 share the same PWM function block: */
  
-@@ -54,25 +59,32 @@ struct pwm_device {
+@@ -54,26 +59,33 @@ struct pwm_device {
  
  int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
  {
@@ -24,43 +22,45 @@ index c36f263..acc5dc1 100644
  	if (pwm == NULL || period_ns == 0 || duty_ns > period_ns)
  		return -EINVAL;
  
--	if (cpu_is_mx27() || cpu_is_mx3() || cpu_is_mx25()) {
--		unsigned long long c;
--		unsigned long period_cycles, duty_cycles, prescale;
--		u32 cr;
 +	c = clk_get_rate(pwm->clk);
 +
 +	c = c * period_ns;
 +
 +	if (cpu_is_mx1() || cpu_is_mx2())
 +		c >>= 1;
- 
--		c = clk_get_rate(pwm->clk);
--		c = c * period_ns;
--		do_div(c, 1000000000);
--		period_cycles = c;
++
 +	do_div(c, 1000000000);
 +	period_cycles = c;
- 
--		prescale = period_cycles / 0x10000 + 1;
++
 +	prescale = period_cycles / 0x10000 + 1;
- 
--		period_cycles /= prescale;
--		c = (unsigned long long)period_cycles * duty_ns;
--		do_div(c, period_ns);
--		duty_cycles = c;
++
 +	period_cycles /= prescale;
 +	c = (unsigned long long)period_cycles * duty_ns;
 +	do_div(c, period_ns);
 +	duty_cycles = c;
 +
 +
-+	if (cpu_is_mx27() || cpu_is_mx3() || cpu_is_mx25()) {
-+		u32 cr;
+ 	if (cpu_is_mx27() || cpu_is_mx3() || cpu_is_mx25()) {
+-		unsigned long long c;
+-		unsigned long period_cycles, duty_cycles, prescale;
+ 		u32 cr;
  
+-		c = clk_get_rate(pwm->clk);
+-		c = c * period_ns;
+-		do_div(c, 1000000000);
+-		period_cycles = c;
+-
+-		prescale = period_cycles / 0x10000 + 1;
+-
+-		period_cycles /= prescale;
+-		c = (unsigned long long)period_cycles * duty_ns;
+-		do_div(c, period_ns);
+-		duty_cycles = c;
+-
  		writel(duty_cycles, pwm->mmio_base + MX3_PWMSAR);
  		writel(period_cycles, pwm->mmio_base + MX3_PWMPR);
-@@ -86,25 +98,28 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
+ 
+@@ -86,25 +98,28 @@ int pwm_config(struct pwm_device *pwm, i
  
  		writel(cr, pwm->mmio_base + MX3_PWMCR);
  	} else if (cpu_is_mx1() || cpu_is_mx21()) {
@@ -108,7 +108,7 @@ index c36f263..acc5dc1 100644
  	} else {
  		BUG();
  	}
-@@ -116,6 +130,11 @@ EXPORT_SYMBOL(pwm_config);
+@@ -116,6 +131,11 @@ EXPORT_SYMBOL(pwm_config);
  int pwm_enable(struct pwm_device *pwm)
  {
  	int rc = 0;
@@ -120,7 +120,7 @@ index c36f263..acc5dc1 100644
  
  	if (!pwm->clk_enabled) {
  		rc = clk_enable(pwm->clk);
-@@ -128,7 +147,13 @@ EXPORT_SYMBOL(pwm_enable);
+@@ -128,7 +148,13 @@ EXPORT_SYMBOL(pwm_enable);
  
  void pwm_disable(struct pwm_device *pwm)
  {