kernel: update linux 3.2 to 3.2.2

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

4 files changed, 9 insertions, 19 deletions

diff --git a/target/linux/omap4/Makefile b/target/linux/omap4/Makefile
index 24fb34420..d6b3fb9a6 100644
--- a/target/linux/omap4/Makefile
+++ b/target/linux/omap4/Makefile
@@ -11,7 +11,7 @@ BOARD:=omap4
 BOARDNAME:=TI OMAP4
 FEATURES:=usb targz
 
-LINUX_VERSION:=3.2.1
+LINUX_VERSION:=3.2.2
 CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
diff --git a/target/linux/omap4/patches/000-hwmod_dont_wait.patch b/target/linux/omap4/patches/000-hwmod_dont_wait.patch
index 87c6aedd3..5220a733c 100644
--- a/target/linux/omap4/patches/000-hwmod_dont_wait.patch
+++ b/target/linux/omap4/patches/000-hwmod_dont_wait.patch
@@ -43,11 +43,9 @@ Signed-off-by: Paul Walmsley <paul@pwsan.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 ---
 
-diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index 207a2ff..ebace0f 100644
 --- a/arch/arm/mach-omap2/omap_hwmod.c
 +++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -706,27 +706,65 @@ static void _enable_module(struct omap_hwmod *oh)
+@@ -706,27 +706,65 @@ static void _enable_module(struct omap_h
  }
  
  /**
@@ -120,7 +118,7 @@ index 207a2ff..ebace0f 100644
  }
  
  /**
-@@ -1153,36 +1191,6 @@ static int _wait_target_ready(struct omap_hwmod *oh)
+@@ -1153,36 +1191,6 @@ static int _wait_target_ready(struct oma
  }
  
  /**
@@ -157,7 +155,7 @@ index 207a2ff..ebace0f 100644
   * _lookup_hardreset - fill register bit info for this hwmod/reset line
   * @oh: struct omap_hwmod *
   * @name: name of the reset line in the context of this hwmod
-@@ -1524,8 +1532,6 @@ static int _enable(struct omap_hwmod *oh)
+@@ -1524,8 +1532,6 @@ static int _enable(struct omap_hwmod *oh
   */
  static int _idle(struct omap_hwmod *oh)
  {
@@ -181,7 +179,7 @@ index 207a2ff..ebace0f 100644
  	/*
  	 * The module must be in idle mode before disabling any parents
  	 * clocks. Otherwise, the parent clock might be disabled before
-@@ -1642,11 +1646,7 @@ static int _shutdown(struct omap_hwmod *oh)
+@@ -1642,11 +1646,7 @@ static int _shutdown(struct omap_hwmod *
  	if (oh->_state == _HWMOD_STATE_ENABLED) {
  		_del_initiator_dep(oh, mpu_oh);
  		/* XXX what about the other system initiators here? dma, dsp */
diff --git a/target/linux/omap4/patches/001-omap4_pandaboard-wlan_fix.patch b/target/linux/omap4/patches/001-omap4_pandaboard-wlan_fix.patch
index a2aaf206b..c87c6390d 100644
--- a/target/linux/omap4/patches/001-omap4_pandaboard-wlan_fix.patch
+++ b/target/linux/omap4/patches/001-omap4_pandaboard-wlan_fix.patch
@@ -1,8 +1,6 @@
-diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
-index daa056e..fe03b09 100644
 --- a/arch/arm/mach-omap2/twl-common.c
 +++ b/arch/arm/mach-omap2/twl-common.c
-@@ -261,6 +261,7 @@ static struct regulator_init_data omap4_vusb_idata = {
+@@ -281,6 +281,7 @@ static struct regulator_init_data omap4_
  static struct regulator_init_data omap4_clk32kg_idata = {
  	.constraints = {
  		.valid_ops_mask		= REGULATOR_CHANGE_STATUS,
diff --git a/target/linux/omap4/patches/002-omap4_pandaboard_i2c.patch b/target/linux/omap4/patches/002-omap4_pandaboard_i2c.patch
index fa3f6cc90..9b656ddc2 100644
--- a/target/linux/omap4/patches/002-omap4_pandaboard_i2c.patch
+++ b/target/linux/omap4/patches/002-omap4_pandaboard_i2c.patch
@@ -1,8 +1,6 @@
-diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
-index 7f47092..2a05d3d 100644
 --- a/arch/arm/mach-omap2/id.c
 +++ b/arch/arm/mach-omap2/id.c
-@@ -389,8 +389,10 @@ static void __init omap4_check_revision(void)
+@@ -389,8 +389,10 @@ static void __init omap4_check_revision(
  			omap_revision = OMAP4430_REV_ES2_1;
  			break;
  		case 4:
@@ -14,7 +12,7 @@ index 7f47092..2a05d3d 100644
  		}
  		break;
  	case 0xb94e:
-@@ -403,7 +405,7 @@ static void __init omap4_check_revision(void)
+@@ -403,7 +405,7 @@ static void __init omap4_check_revision(
  		break;
  	default:
  		/* Unknown default to latest silicon rev as default */
@@ -23,11 +21,9 @@ index 7f47092..2a05d3d 100644
  	}
  
  	pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16,
-diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-index 7695e5d..71d3e36 100644
 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-@@ -2257,7 +2257,8 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class = {
+@@ -2257,7 +2257,8 @@ static struct omap_hwmod_class omap44xx_
  };
  
  static struct omap_i2c_dev_attr i2c_dev_attr = {
@@ -37,8 +33,6 @@ index 7695e5d..71d3e36 100644
  };
  
  /* i2c1 */
-diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
-index 408a12f..e279395 100644
 --- a/arch/arm/plat-omap/include/plat/cpu.h
 +++ b/arch/arm/plat-omap/include/plat/cpu.h
 @@ -391,6 +391,7 @@ IS_OMAP_TYPE(3517, 0x3517)