linux-openmoko-2.6.34: upgrade to 2.6.34.7 and add patch for lower power consumption in suspend

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

21 files changed, 104 insertions, 276 deletions

diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch b/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch
index d2e575ad94..229a08baf4 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch
@@ -1,7 +1,7 @@
-From 2ec20c69573ac255b3aefd4306f4aaed16c310bc Mon Sep 17 00:00:00 2001
+From 319da58b0613920223caf7711e10a0b866f9305a Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Sat, 22 May 2010 18:59:58 +0200
-Subject: [PATCH 1/8] DRM for platform devices
+Subject: [PATCH 03/17] DRM for platform devices
 
 This modifies the DRM core in a small number of places to allow platform
 devices to be used for direct rendering, alongside PCI devices.
@@ -45,7 +45,7 @@ index f7ba82e..30ce982 100644
  		    map->offset < virt_to_phys(high_memory)) {
  			kfree(map);
 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index 4a66201..769d12b 100644
+index c9736ed..b064dd2 100644
 --- a/drivers/gpu/drm/drm_drv.c
 +++ b/drivers/gpu/drm/drm_drv.c
 @@ -250,6 +250,7 @@ int drm_lastclose(struct drm_device * dev)
@@ -454,5 +454,5 @@ index 2f3b3a0..43894ec 100644
  extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
  		       struct drm_driver *driver);
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch
index 9b731b58a0..4365e9312a 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch
@@ -1,7 +1,7 @@
-From 53e2489c536fc9e382be71be84800cb532acbf73 Mon Sep 17 00:00:00 2001
+From 1b8efb3ae35ba6a3dfcf03b28bab9ce945a9b294 Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:15:40 +0200
-Subject: [PATCH 1/4] accels.patch
+Subject: [PATCH 11/17] accels.patch
 
 adds support for accelerometers. You will need include/linux/lis302dl.h and
 drivers/input/misc/lis302dl.c from andy-tracking. The patch needs
@@ -39,7 +39,7 @@ index dcef228..8eedc9c 100644
  
  
 diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index e8ac76b..795b9f4 100644
+index 9a9461d..1fa93b4 100644
 --- a/arch/arm/mach-s3c2440/mach-gta02.c
 +++ b/arch/arm/mach-s3c2440/mach-gta02.c
 @@ -62,6 +62,7 @@
@@ -1755,5 +1755,5 @@ index 3274c50..6dc9b8b 100644
  /* start or stop queue processing */
  extern int spi_bitbang_start(struct spi_bitbang *spi);
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-glamo-core-move-glamo_engine_reg_set-definition-outs.patch b/recipes/linux/linux-openmoko-2.6.34/0001-glamo-core-move-glamo_engine_reg_set-definition-outs.patch
deleted file mode 100644
index 75d9d88368..0000000000
--- a/recipes/linux/linux-openmoko-2.6.34/0001-glamo-core-move-glamo_engine_reg_set-definition-outs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f9f4dad4ceac84b4ca496c82e1e2824ca986c3e2 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 4 Aug 2010 11:53:00 +0200
-Subject: [PATCH] glamo-core: move glamo_engine_reg_set definition outside #ifdef CONFIG_DEBUG_FS
-
-* it's also used outside
-* building without CONFIG_DEBUG_FS fails with error: array type has incomplete element type
----
- drivers/mfd/glamo-core.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/mfd/glamo-core.c b/drivers/mfd/glamo-core.c
-index 23a0026..468194f 100644
---- a/drivers/mfd/glamo-core.c
-+++ b/drivers/mfd/glamo-core.c
-@@ -398,12 +398,6 @@ static const struct file_operations debugfs_regs_ops = {
- 	.release	= single_release,
- };
- 
--struct glamo_engine_reg_set {
--	uint16_t reg;
--	uint16_t mask_suspended;
--	uint16_t mask_enabled;
--};
--
- static void glamo_init_debugfs(struct glamo_core *glamo)
- {
- 	glamo->debugfs_dir = debugfs_create_dir("glamo3362", NULL);
-@@ -429,6 +423,12 @@ static void glamo_exit_debugfs(struct glamo_core *glamo)
- }
- #endif
- 
-+struct glamo_engine_reg_set {
-+	uint16_t reg;
-+	uint16_t mask_suspended;
-+	uint16_t mask_enabled;
-+};
-+
- struct glamo_engine_desc {
- 	const char *name;
- 	uint16_t hostbus;
--- 
-1.7.1.1
-
diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-glamo-display-Enable-FIFO-stage-for-the-LCD-engine-s.patch b/recipes/linux/linux-openmoko-2.6.34/0001-glamo-display-Enable-FIFO-stage-for-the-LCD-engine-s.patch
index b4186d9792..4326fc2c4d 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0001-glamo-display-Enable-FIFO-stage-for-the-LCD-engine-s.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0001-glamo-display-Enable-FIFO-stage-for-the-LCD-engine-s.patch
@@ -1,7 +1,7 @@
-From 660579bd6333e7e33cfb176f849bcc098e33af38 Mon Sep 17 00:00:00 2001
+From 49a7aaa93557318d985b87ee865285a2ca4f65cc Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 19 Jul 2010 13:39:06 +0200
-Subject: [PATCH] glamo-display: Enable FIFO stage for the LCD engine's memory access
+Subject: [PATCH 15/17] glamo-display: Enable FIFO stage for the LCD engine's memory access
 
 ---
  drivers/gpu/drm/glamo/glamo-display.c |    2 +-
@@ -21,5 +21,5 @@ index 6f25326..4e85906 100644
  	{ GLAMO_REG_LCD_B_BASE2, 0x0009 }, /* display B base address 22:16 */
  	{ GLAMO_REG_LCD_CURSOR_BASE1, 0xC000 }, /* cursor base address 15:0 */
 -- 
-1.7.1.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-mach-gta02-fix-gsm-power_on-sysfs-node-path.patch b/recipes/linux/linux-openmoko-2.6.34/0001-mach-gta02-fix-gsm-power_on-sysfs-node-path.patch
deleted file mode 100644
index d1053d4530..0000000000
--- a/recipes/linux/linux-openmoko-2.6.34/0001-mach-gta02-fix-gsm-power_on-sysfs-node-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ed36456fa34c2653d4a39c3dbeb66b4e671103fe Mon Sep 17 00:00:00 2001
-From: Gennady Kupava <gb@bsdmn.com>
-Date: Mon, 2 Aug 2010 14:53:55 +0200
-Subject: [PATCH] mach-gta02: fix gsm power_on sysfs node path
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index e7d0b82..08e9dcc 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1341,7 +1341,7 @@ static struct platform_device* gta02_hdq_children[] = {
- 
- static struct gta02_device_children gta02_device_children[] = {
- 	{
--		.dev_name = "pcf50633-gpio",
-+		.dev_name = "pcf50633-gpio.0",
- 		.num_children = 2,
- 		.children = gta02_pcf50633_gpio_children,
- 	},
--- 
-1.7.1.1
-
diff --git a/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch b/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch
index b76990f5d0..1d6e444a46 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch
@@ -1,7 +1,7 @@
-From b47b5c8042832424555cecda7a2ab21f8e57f9d4 Mon Sep 17 00:00:00 2001
+From 9231014c2f79c75aa1358b36e0c576ec1c97c2bc Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Sat, 22 May 2010 19:01:00 +0200
-Subject: [PATCH 2/8] Glamo DRM and KMS driver
+Subject: [PATCH 04/17] Glamo DRM and KMS driver
 
 This adds the Glamo DRM and KMS driver, but note that modifications are needed
 elsewhere to support it.
@@ -3878,5 +3878,5 @@ index 0000000..4c194dc
 +
 +#endif
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch
index ee330a0e9f..11886a55f3 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch
@@ -1,7 +1,7 @@
-From 65954829e9732060a734e977817dbaa611b6c42b Mon Sep 17 00:00:00 2001
+From ffddb76b59aaaccd48524460dd5ebf91b5796c2b Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:17:28 +0200
-Subject: [PATCH 2/4] usbhost.patch
+Subject: [PATCH 12/17] usbhost.patch
 
 adds support for usb host mode and adds usb host pm sysfs node. I just copied
 and modified how modem is powered up and backported changes in ohci-s3c2410.c.
@@ -214,7 +214,7 @@ index 0000000..233340a
 +MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
 +MODULE_DESCRIPTION("Openmoko Freerunner USBHOST Power Management");
 diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 795b9f4..e7d0b82 100644
+index 1fa93b4..08e9dcc 100644
 --- a/arch/arm/mach-s3c2440/mach-gta02.c
 +++ b/arch/arm/mach-s3c2440/mach-gta02.c
 @@ -202,6 +202,10 @@ static struct platform_device gta02_pm_gsm_dev = {
@@ -309,7 +309,7 @@ index 795b9f4..e7d0b82 100644
 @@ -1301,7 +1342,7 @@ static struct platform_device* gta02_hdq_children[] = {
  static struct gta02_device_children gta02_device_children[] = {
  	{
- 		.dev_name = "pcf50633-gpio",
+ 		.dev_name = "pcf50633-gpio.0",
 -		.num_children = 1,
 +		.num_children = 2,
  		.children = gta02_pcf50633_gpio_children,
@@ -410,5 +410,5 @@ index a68af2d..02bd7b0 100644
  	s3c2410_stop_hc(dev);
  	iounmap(hcd->regs);
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch b/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
index 4906f97904..624c49e416 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
@@ -1,7 +1,7 @@
-From 21469ba33747fef2625bf20c72cbbe776d8c59b7 Mon Sep 17 00:00:00 2001
+From 5e4ad788f6692865a17dcf4e870c20a9dc04651c Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Tue, 17 Nov 2009 23:45:29 +0100
-Subject: [PATCH 3/8] Work on Glamo-core for DRM
+Subject: [PATCH 05/17] Work on Glamo-core for DRM
 
 This adds modifications to the core of the Glamo driver to expose functionality
 to support DRM and KMS.
@@ -15,10 +15,10 @@ Signed-off-by: Thomas White <taw@bitwiz.org.uk>
  4 files changed, 69 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/mfd/glamo-core.c b/drivers/mfd/glamo-core.c
-index 135856a..da32b77 100644
+index 8880263..3d57d2b 100644
 --- a/drivers/mfd/glamo-core.c
 +++ b/drivers/mfd/glamo-core.c
-@@ -221,10 +221,25 @@ static struct resource glamo_fb_resources[] = {
+@@ -190,10 +190,25 @@ static struct resource glamo_fb_resources[] = {
  		.flags	= IORESOURCE_MEM,
  	}, {
  		.name	= "glamo-fb-mem",
@@ -47,7 +47,7 @@ index 135856a..da32b77 100644
  };
  
  static struct resource glamo_mmc_resources[] = {
-@@ -235,9 +250,9 @@ static struct resource glamo_mmc_resources[] = {
+@@ -204,9 +219,9 @@ static struct resource glamo_mmc_resources[] = {
  		.flags	= IORESOURCE_MEM
  	}, {
  		.name	= "glamo-mmc-mem",
@@ -61,7 +61,7 @@ index 135856a..da32b77 100644
  	}, {
  		.start	= GLAMO_IRQ_MMC,
 diff --git a/include/linux/mfd/glamo-core.h b/include/linux/mfd/glamo-core.h
-index 34ec7c4..25bd94d 100644
+index 8275a2f..66cd7a5 100644
 --- a/include/linux/mfd/glamo-core.h
 +++ b/include/linux/mfd/glamo-core.h
 @@ -3,18 +3,30 @@
@@ -139,10 +139,10 @@ index 59848e1..8b2fd47 100644
 +
  #endif /* _GLAMO_REGS_H */
 diff --git a/include/linux/mfd/glamo.h b/include/linux/mfd/glamo.h
-index 529d4f0..ea91a06 100644
+index ae52f3d..99114aa 100644
 --- a/include/linux/mfd/glamo.h
 +++ b/include/linux/mfd/glamo.h
-@@ -41,12 +41,9 @@ enum glamo_engine {
+@@ -43,12 +43,9 @@ enum glamo_engine {
  	GLAMO_ENGINE_RISC = 11,
  	GLAMO_ENGINE_MICROP1_MPEG_ENC = 12,
  	GLAMO_ENGINE_MICROP1_MPEG_DEC = 13,
@@ -158,5 +158,5 @@ index 529d4f0..ea91a06 100644
 +
  #endif
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch
index dbff9c0869..be69b78e81 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch
@@ -1,7 +1,7 @@
-From 32dcde00ad05fa148ba96f46427afe9af226ffb7 Mon Sep 17 00:00:00 2001
+From ecbd0e7d09f2058486f8a2b389744d1da116cc6b Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:18:02 +0200
-Subject: [PATCH 3/4] ar6000_delay.patch
+Subject: [PATCH 13/17] ar6000_delay.patch
 
 patch from https://docs.openmoko.org/trac/ticket/2327 - wifi is working good
 (100% until now) for me with this patch.
@@ -25,5 +25,5 @@ index 386d96e..90178d0 100644
  	if (ret == A_OK)
  		return 0;
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch b/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch
index dee8a64587..5d0008d69d 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch
@@ -1,7 +1,7 @@
-From 1cc704d6777a97bc55f3822c218fd49e12561347 Mon Sep 17 00:00:00 2001
+From 1f722e3bf68126afd3266d4a3f8b7fdbd87c4068 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Sat, 21 Nov 2009 21:42:16 +0100
-Subject: [PATCH 4/8] JBT6k74 work for KMS
+Subject: [PATCH 06/17] JBT6k74 work for KMS
 
 This simplifies the JBT6k74 driver, and adds hooks for the Glamo driver to cooperate
 more closely with it.
@@ -536,5 +536,5 @@ index 75488c4..2010bdc 100644
  	int gpio_reset;
  };
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch
index a8911676ed..809325bbc9 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch
@@ -1,7 +1,7 @@
-From 784ad85c80030910862e5b7f655eb69a6f980e4f Mon Sep 17 00:00:00 2001
+From c49bfa4677fc1f161330165657122375d46c71d1 Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:22:23 +0200
-Subject: [PATCH 4/4] save_regs.patch
+Subject: [PATCH 14/17] save_regs.patch
 
 With this patch wifi can survive suspend.
 ---
@@ -136,5 +136,5 @@ index e4898e9..b49d674 100644
  extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
  extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0005-Fix-dynamic-command-queue-allocation.patch b/recipes/linux/linux-openmoko-2.6.34/0005-Fix-dynamic-command-queue-allocation.patch
index 0351f50ec1..3bf85eda9b 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0005-Fix-dynamic-command-queue-allocation.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0005-Fix-dynamic-command-queue-allocation.patch
@@ -1,7 +1,7 @@
-From 2114f9008abe39b8ed914f650d50775e39f53cca Mon Sep 17 00:00:00 2001
+From 2c92aeeb0924bfcae13879f530de253cd1f9143b Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Thu, 6 May 2010 05:40:15 -0700
-Subject: [PATCH 5/8] Fix dynamic command queue allocation
+Subject: [PATCH 07/17] Fix dynamic command queue allocation
 
 (Not tested...)
 
@@ -13,7 +13,7 @@ Signed-off-by: Thomas White <taw@bitwiz.org.uk>
  3 files changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/gpu/drm/glamo/glamo-cmdq.c b/drivers/gpu/drm/glamo/glamo-cmdq.c
-index 3ce970e..4b0d55f 100644
+index 71eb53c..4947ec7 100644
 --- a/drivers/gpu/drm/glamo/glamo-cmdq.c
 +++ b/drivers/gpu/drm/glamo/glamo-cmdq.c
 @@ -497,10 +497,11 @@ int glamo_cmdq_setup(struct glamodrm_handle *gdrm)
@@ -64,7 +64,7 @@ index 510d195..6d7f184 100644
  extern void glamo_cmdq_suspend(struct glamodrm_handle *gdrm);
  extern void glamo_cmdq_resume(struct glamodrm_handle *gdrm);
 diff --git a/drivers/gpu/drm/glamo/glamo-drm-drv.c b/drivers/gpu/drm/glamo/glamo-drm-drv.c
-index 224c857..9f74983 100644
+index 8a41b18..1867983 100644
 --- a/drivers/gpu/drm/glamo/glamo-drm-drv.c
 +++ b/drivers/gpu/drm/glamo/glamo-drm-drv.c
 @@ -129,7 +129,7 @@ static int glamodrm_load(struct drm_device *dev, unsigned long flags)
@@ -119,5 +119,5 @@ index 224c857..9f74983 100644
  	/* Release 2D engine  */
  	iounmap(gdrm->twod_base);
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0006-Debug-statements-for-testing.patch b/recipes/linux/linux-openmoko-2.6.34/0006-Debug-statements-for-testing.patch
index c47ebf12eb..e959f3c533 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0006-Debug-statements-for-testing.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0006-Debug-statements-for-testing.patch
@@ -1,7 +1,7 @@
-From cf82ca72810135babe7493bdd7c1cc63ed2ebac6 Mon Sep 17 00:00:00 2001
+From ffb224c021cd7b2c320cccab59588f2002cfbca1 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Thu, 6 May 2010 05:40:33 -0700
-Subject: [PATCH 6/8] Debug statements for testing
+Subject: [PATCH 08/17] Debug statements for testing
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Thomas White <taw@bitwiz.org.uk>
  2 files changed, 10 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/gpu/drm/glamo/glamo-display.c b/drivers/gpu/drm/glamo/glamo-display.c
-index a058b40..c54dd49 100644
+index ef7e8c8..6f25326 100644
 --- a/drivers/gpu/drm/glamo/glamo-display.c
 +++ b/drivers/gpu/drm/glamo/glamo-display.c
 @@ -258,6 +258,8 @@ static int glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
@@ -74,5 +74,5 @@ index 91651e7..56a3e3a 100644
  }
  EXPORT_SYMBOL_GPL(jbt6k74_setpower);
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0007-Fix-claim-of-2D-register-resource.patch b/recipes/linux/linux-openmoko-2.6.34/0007-Fix-claim-of-2D-register-resource.patch
index 978545a4a4..1c1369bcdb 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0007-Fix-claim-of-2D-register-resource.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0007-Fix-claim-of-2D-register-resource.patch
@@ -1,7 +1,7 @@
-From 2f8fb0d0308960e53395428873549ae2961469ca Mon Sep 17 00:00:00 2001
+From 3e47dbb5e8cc60618fcca74bcbb24d46a7a4dee5 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Thu, 6 May 2010 08:37:04 -0700
-Subject: [PATCH 7/8] Fix claim of 2D register resource
+Subject: [PATCH 09/17] Fix claim of 2D register resource
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Thomas White <taw@bitwiz.org.uk>
  1 files changed, 2 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/gpu/drm/glamo/glamo-drm-drv.c b/drivers/gpu/drm/glamo/glamo-drm-drv.c
-index 9f74983..2a7f600 100644
+index 1867983..eb0827a 100644
 --- a/drivers/gpu/drm/glamo/glamo-drm-drv.c
 +++ b/drivers/gpu/drm/glamo/glamo-drm-drv.c
 @@ -273,7 +273,8 @@ static int glamodrm_probe(struct platform_device *pdev)
@@ -23,5 +23,5 @@ index 9f74983..2a7f600 100644
  		dev_err(&pdev->dev, "Unable to find 2D registers.\n");
  		rc = -ENOENT;
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch b/recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch
index 3c9b48bc3b..3775717045 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch
@@ -1,7 +1,7 @@
-From 97f5e67992f766359987a876e61afacf3a8532cb Mon Sep 17 00:00:00 2001
+From ad2a0e197a8bb7cc03082f46d5fb895f99574824 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Mon, 24 May 2010 21:49:14 +0200
-Subject: [PATCH 8/8] Use unlocked_ioctl rather than ioctl
+Subject: [PATCH 10/17] Use unlocked_ioctl rather than ioctl
 
 The arguments changed between 2.6.32 and 2.6.34.
 
@@ -11,7 +11,7 @@ Signed-off-by: Thomas White <taw@bitwiz.org.uk>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/gpu/drm/glamo/glamo-drm-drv.c b/drivers/gpu/drm/glamo/glamo-drm-drv.c
-index 2a7f600..36e6941 100644
+index eb0827a..2cdf429 100644
 --- a/drivers/gpu/drm/glamo/glamo-drm-drv.c
 +++ b/drivers/gpu/drm/glamo/glamo-drm-drv.c
 @@ -180,7 +180,7 @@ static struct drm_driver glamodrm_drm_driver = {
@@ -24,5 +24,5 @@ index 2a7f600..36e6941 100644
  		.poll = drm_poll,
  		.fasync = drm_fasync,
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0009-glamo-display-fix-WSOD-for-242-timming.patch b/recipes/linux/linux-openmoko-2.6.34/0009-glamo-display-fix-WSOD-for-242-timming.patch
index 1a645d01a3..d011aec2c1 100644
--- a/recipes/linux/linux-openmoko-2.6.34/0009-glamo-display-fix-WSOD-for-242-timming.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0009-glamo-display-fix-WSOD-for-242-timming.patch
@@ -1,7 +1,7 @@
-From 2262b75d6035fb15f555d0d019def3ad1c35c997 Mon Sep 17 00:00:00 2001
+From 58b171ce3f1887f4c2b162a7265c745eb488363d Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Fri, 27 Aug 2010 08:52:07 +0200
-Subject: [PATCH] glamo-display: fix WSOD for 242 timming
+Subject: [PATCH 16/17] glamo-display: fix WSOD for 242 timming
 
 ---
  drivers/gpu/drm/glamo/glamo-display.c |    2 +-
@@ -35,5 +35,5 @@ index 3f8ec8d..a428047 100644
  			  GLAMO_LCD_CMD_TYPE_DISP |
  			  GLAMO_LCD_CMD_DATA_DISP_FIRE);
 -- 
-1.7.2.2
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34/0010-mach-gta02-fix-PR2349-do-not-manage-down.patch b/recipes/linux/linux-openmoko-2.6.34/0010-mach-gta02-fix-PR2349-do-not-manage-down.patch
new file mode 100644
index 0000000000..8414b1f210
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.34/0010-mach-gta02-fix-PR2349-do-not-manage-down.patch
@@ -0,0 +1,25 @@
+From e8e48bd0e3aa263ecf68e71d1e4d25a8d727f50d Mon Sep 17 00:00:00 2001
+From: Gennady Kupava <gb@bsdmn.com>
+Date: Tue, 21 Sep 2010 11:11:35 +0200
+Subject: [PATCH 17/17] mach-gta02: fix PR2349, do not manage down
+
+---
+ arch/arm/mach-s3c2440/mach-gta02.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
+index 08e9dcc..e639cac 100644
+--- a/arch/arm/mach-s3c2440/mach-gta02.c
++++ b/arch/arm/mach-s3c2440/mach-gta02.c
+@@ -715,7 +715,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
+ 				.min_uV = 3300000,
+ 				.max_uV = 3300000,
+ 				.valid_modes_mask = REGULATOR_MODE_NORMAL,
+-				.always_on = 1,
++				.always_on = 0,
+ 				.apply_uV = 1,
+ 				.state_mem = {
+ 					.enabled = 1,
+-- 
+1.7.3
+
diff --git a/recipes/linux/linux-openmoko-2.6.34/touchscreen_ignoreunexpectedintr34.patch b/recipes/linux/linux-openmoko-2.6.34/touchscreen_ignoreunexpectedintr34.patch
index d68346a921..e37231aa53 100644
--- a/recipes/linux/linux-openmoko-2.6.34/touchscreen_ignoreunexpectedintr34.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/touchscreen_ignoreunexpectedintr34.patch
@@ -1,3 +1,12 @@
+From a3704a5bd991e0cc9ae72d6fd3c35880e6e28aad Mon Sep 17 00:00:00 2001
+From: Gennady Kupava <gb@bsdmn.com>
+Date: Sat, 26 Jun 2010 00:15:02 +0200
+Subject: [PATCH 02/17] touchscreen: ignore unexpected interrupts
+
+---
+ drivers/input/touchscreen/s3c2410_ts.c |   29 ++++++++++++++++++++++++-----
+ 1 files changed, 24 insertions(+), 5 deletions(-)
+
 diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
 index 98a7d12..8fba8a8 100644
 --- a/drivers/input/touchscreen/s3c2410_ts.c
@@ -91,3 +100,6 @@ index 98a7d12..8fba8a8 100644
  	writel(WAIT4INT | INT_DOWN, ts.io + S3C2410_ADCTSC);
  
  	return 0;
+-- 
+1.7.3
+
diff --git a/recipes/linux/linux-openmoko-2.6.34/use-noclone-attribute-for-naked.patch b/recipes/linux/linux-openmoko-2.6.34/use-noclone-attribute-for-naked.patch
deleted file mode 100644
index cf09e244b4..0000000000
--- a/recipes/linux/linux-openmoko-2.6.34/use-noclone-attribute-for-naked.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-This patch add noinline and noclone attributes to naked functions. 
-GCC 4.5 has new optimization -fipa-ira which is enabled at -Os and -O2
-this option will clone the functions and that can change the standard
-calling convention but the naked functions expect that and use
-arguments as in standard calling convention. Therefore the naked
-functions should not be marked non inline and noclone.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: linux-2.6.34/include/linux/compiler-gcc4.h
-===================================================================
---- linux-2.6.34.orig/include/linux/compiler-gcc4.h	2010-05-29 17:18:55.338127623 -0700
-+++ linux-2.6.34/include/linux/compiler-gcc4.h	2010-05-29 17:32:33.910657021 -0700
-@@ -48,6 +48,10 @@
-  * unreleased.  Really, we need to have autoconf for the kernel.
-  */
- #define unreachable() __builtin_unreachable()
-+
-+/* Mark a function definition as prohibited from being cloned. */
-+#define __noclone	__attribute__((__noclone__))
-+
- #endif
- 
- #endif
-Index: linux-2.6.34/include/linux/compiler-gcc.h
-===================================================================
---- linux-2.6.34.orig/include/linux/compiler-gcc.h	2010-05-29 17:28:28.238113095 -0700
-+++ linux-2.6.34/include/linux/compiler-gcc.h	2010-05-29 17:31:58.938153321 -0700
-@@ -58,8 +58,12 @@
-  * naked functions because then mcount is called without stack and frame pointer
-  * being set up and there is no chance to restore the lr register to the value
-  * before mcount was called.
-+ *
-+ * The asm() bodies of naked functions often depend on standard calling conventions,
-+ * therefore they must be noinline and noclone.  GCC 4.[56] currently fail to enforce
-+ * this, so we must do so ourselves.  See GCC PR44290.
-  */
--#define __naked				__attribute__((naked)) notrace
-+#define __naked				__attribute__((naked)) noinline __noclone notrace
- 
- #define __noreturn			__attribute__((noreturn))
- 
-@@ -85,3 +89,8 @@
- #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
- #define gcc_header(x) _gcc_header(x)
- #include gcc_header(__GNUC__)
-+
-+#if !defined(__noclone)
-+#define __noclone	/* not needed */
-+#endif
-+
-Index: linux-2.6.34/arch/arm/mm/copypage-v4wb.c
-===================================================================
---- linux-2.6.34.orig/arch/arm/mm/copypage-v4wb.c	2010-05-29 23:01:46.580600195 -0700
-+++ linux-2.6.34/arch/arm/mm/copypage-v4wb.c	2010-05-29 23:46:10.610629920 -0700
-@@ -27,7 +27,7 @@ v4wb_copy_user_page(void *kto, const voi
- {
- 	asm("\
- 	stmfd	sp!, {r4, lr}			@ 2\n\
--	mov	r2, %0				@ 1\n\
-+	mov	r2, %2				@ 1\n\
- 	ldmia	r1!, {r3, r4, ip, lr}		@ 4\n\
- 1:	mcr	p15, 0, r0, c7, c6, 1		@ 1   invalidate D line\n\
- 	stmia	r0!, {r3, r4, ip, lr}		@ 4\n\
-@@ -44,7 +44,7 @@ v4wb_copy_user_page(void *kto, const voi
- 	mcr	p15, 0, r1, c7, c10, 4		@ 1   drain WB\n\
- 	ldmfd	 sp!, {r4, pc}			@ 3"
- 	:
--	: "I" (PAGE_SIZE / 64));
-+	: "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64));
- }
- 
- void v4wb_copy_user_highpage(struct page *to, struct page *from,
-Index: linux-2.6.34/arch/arm/mm/copypage-v4wt.c
-===================================================================
---- linux-2.6.34.orig/arch/arm/mm/copypage-v4wt.c	2010-05-29 23:48:51.908131421 -0700
-+++ linux-2.6.34/arch/arm/mm/copypage-v4wt.c	2010-05-29 23:53:15.410657789 -0700
-@@ -25,7 +25,7 @@ v4wt_copy_user_page(void *kto, const voi
- {
- 	asm("\
- 	stmfd	sp!, {r4, lr}			@ 2\n\
--	mov	r2, %0				@ 1\n\
-+	mov	r2, %2				@ 1\n\
- 	ldmia	r1!, {r3, r4, ip, lr}		@ 4\n\
- 1:	stmia	r0!, {r3, r4, ip, lr}		@ 4\n\
- 	ldmia	r1!, {r3, r4, ip, lr}		@ 4+1\n\
-@@ -40,7 +40,7 @@ v4wt_copy_user_page(void *kto, const voi
- 	mcr	p15, 0, r2, c7, c7, 0		@ flush ID cache\n\
- 	ldmfd	sp!, {r4, pc}			@ 3"
- 	:
--	: "I" (PAGE_SIZE / 64));
-+	: "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64));
- }
- 
- void v4wt_copy_user_highpage(struct page *to, struct page *from,
-Index: linux-2.6.34/arch/arm/mm/copypage-feroceon.c
-===================================================================
---- linux-2.6.34.orig/arch/arm/mm/copypage-feroceon.c	2010-05-29 23:50:26.518121374 -0700
-+++ linux-2.6.34/arch/arm/mm/copypage-feroceon.c	2010-05-29 23:50:53.238196555 -0700
-@@ -18,7 +18,7 @@ feroceon_copy_user_page(void *kto, const
- {
- 	asm("\
- 	stmfd	sp!, {r4-r9, lr}		\n\
--	mov	ip, %0				\n\
-+	mov	ip, %2				\n\
- 1:	mov	lr, r1				\n\
- 	ldmia	r1!, {r2 - r9}			\n\
- 	pld	[lr, #32]			\n\
-@@ -64,7 +64,7 @@ feroceon_copy_user_page(void *kto, const
- 	mcr	p15, 0, ip, c7, c10, 4		@ drain WB\n\
- 	ldmfd	sp!, {r4-r9, pc}"
- 	:
--	: "I" (PAGE_SIZE));
-+	: "r" (kto), "r" (kfrom), "I" (PAGE_SIZE));
- }
- 
- void feroceon_copy_user_highpage(struct page *to, struct page *from,
-Index: linux-2.6.34/arch/arm/mm/copypage-xsc3.c
-===================================================================
---- linux-2.6.34.orig/arch/arm/mm/copypage-xsc3.c	2010-05-29 23:52:00.010626567 -0700
-+++ linux-2.6.34/arch/arm/mm/copypage-xsc3.c	2010-05-29 23:52:30.048147465 -0700
-@@ -34,7 +34,7 @@ xsc3_mc_copy_user_page(void *kto, const 
- {
- 	asm("\
- 	stmfd	sp!, {r4, r5, lr}		\n\
--	mov	lr, %0				\n\
-+	mov	lr, %2				\n\
- 						\n\
- 	pld	[r1, #0]			\n\
- 	pld	[r1, #32]			\n\
-@@ -67,7 +67,7 @@ xsc3_mc_copy_user_page(void *kto, const 
- 						\n\
- 	ldmfd	sp!, {r4, r5, pc}"
- 	:
--	: "I" (PAGE_SIZE / 64 - 1));
-+	: "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64 - 1));
- }
- 
- void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
diff --git a/recipes/linux/linux-openmoko-2.6.34/wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch b/recipes/linux/linux-openmoko-2.6.34/wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
index 52fe6262cc..ee9a3a09be 100644
--- a/recipes/linux/linux-openmoko-2.6.34/wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
@@ -1,7 +1,7 @@
-From 16722526979959805c493deabaac8cf9ba2f8ef6 Mon Sep 17 00:00:00 2001
+From d23270c39a5cd1af8df119c51645b6b0ed21f012 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 7 Nov 2009 20:33:06 +0100
-Subject: [PATCH 01/14] wm8753: fix build with gcc-4.4.2, which works ok with 4.1.2
+Subject: [PATCH 01/17] wm8753: fix build with gcc-4.4.2, which works ok with 4.1.2
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
-index 5ad677c..e148406 100644
+index 613199a..e270b9f 100644
 --- a/sound/soc/codecs/wm8753.c
 +++ b/sound/soc/codecs/wm8753.c
 @@ -710,7 +710,9 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
@@ -24,5 +24,5 @@ index 5ad677c..e148406 100644
  	K = Kpart & 0xFFFFFFFF;
  
 -- 
-1.7.1
+1.7.3
 
diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb
index a1eae7719e..d2728a493f 100644
--- a/recipes/linux/linux-openmoko-2.6.34_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.34_git.bb
@@ -1,9 +1,9 @@
 require linux.inc
 require linux-openmoko.inc
 
-KERNEL_RELEASE="2.6.34.6"
+KERNEL_RELEASE="2.6.34.7"
 
-SRCREV = "3f6725d43021d2d7597027e36020df5b44d0667e"
+SRCREV = "e4182f3551f1b8e8f8bd07a2d68e49a0ec4cd04a"
 OEV = "oe4.6"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 
@@ -13,7 +13,6 @@ SRC_URI = "\
   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;apply=yes;name=stablepatch \
 # build fix
   file://wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch \
-  file://0001-glamo-core-move-glamo_engine_reg_set-definition-outs.patch \
 # fix for lost touchscreen https://docs.openmoko.org/trac/ticket/2328
   file://touchscreen_ignoreunexpectedintr34.patch \
 # patches from Thomas White's gdrm-for-merging branch
@@ -32,13 +31,13 @@ SRC_URI = "\
   file://0002-usbhost.patch.patch \
   file://0003-ar6000_delay.patch.patch \
   file://0004-save_regs.patch.patch \
-# sysfs node path fix
-  file://0001-mach-gta02-fix-gsm-power_on-sysfs-node-path.patch \
+# fix PR2349  
+  file://0010-mach-gta02-fix-PR2349-do-not-manage-down.patch \
   file://defconfig \
 "
 
-SRC_URI[stablepatch.md5sum] = "49d8234d88bba062edcab19fd0ee28b4"
-SRC_URI[stablepatch.sha256sum] = "a62e9392ad435948ea4ea2cce12e60e042da6e6da806691936ba50bbaa0dc8cc"
+SRC_URI[stablepatch.md5sum] = "a88e4b5a9fcb23c2229301ac4dae1f1a"
+SRC_URI[stablepatch.sha256sum] = "b146904ea07cc87a3fbcbd4eab51d331d56718431539e6aa29c24b072e6b7832"
 
 S = "${WORKDIR}/git"