linux-openmoko: bump SRCREV to latest revision, drop applied patches

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

7 files changed, 30 insertions, 328 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 517b0c0eeb..207c320a66 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -147,11 +147,11 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
-SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
-SRCREV_pn-linux-openmoko-2.6.32 ?= "5e5d518ecad86cc891d91c88d3b144eb30339bca"
+SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "5827b20d022fb47ce9c9731d0fb894d361e16ffe"
 SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
-SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967"
+SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
 SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
diff --git a/recipes/linux/linux-openmoko-2.6.31/0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch b/recipes/linux/linux-openmoko-2.6.31/0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch
new file mode 100644
index 0000000000..a6fa77daf4
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.31/0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch
@@ -0,0 +1,25 @@
+From f0acf76b4f0f16f0e5934daaccbfbec67b875bdd Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sun, 17 Jan 2010 19:08:17 +0100
+Subject: [PATCH] gta02_defconfig: disable LEDS_GTA02_VIBRATOR
+
+---
+ arch/arm/configs/gta02_defconfig |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig
+index acf225e..fec7b03 100644
+--- a/arch/arm/configs/gta02_defconfig
++++ b/arch/arm/configs/gta02_defconfig
+@@ -1338,7 +1338,7 @@ CONFIG_LEDS_GPIO_PLATFORM=y
+ # CONFIG_LEDS_DAC124S085 is not set
+ # CONFIG_LEDS_PWM is not set
+ # CONFIG_LEDS_BD2802 is not set
+-CONFIG_LEDS_GTA02_VIBRATOR=y
++# CONFIG_LEDS_GTA02_VIBRATOR is not set
+ 
+ #
+ # LED Triggers
+-- 
+1.6.6
+
diff --git a/recipes/linux/linux-openmoko-2.6.31_git.bb b/recipes/linux/linux-openmoko-2.6.31_git.bb
index e801a5c07a..15301f5da4 100644
--- a/recipes/linux/linux-openmoko-2.6.31_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.31_git.bb
@@ -23,7 +23,8 @@ SRC_URI = "\
   file://0004-gta02_defconfig-Enable-UBI-support.patch;patch=1 \
   file://0005-gta02_defconfig-Enable-UBI-debug.patch;patch=1 \
   file://0001-gta02_defconfig-Enable-GLAMO_DRM.patch;patch=1 \
-  file://0006-gta02-defconfig-enable-NFS-and-INOTIFY_USER.patch \
+  file://0006-gta02-defconfig-enable-NFS-and-INOTIFY_USER.patch;patch=1 \
+  file://0007-gta02_defconfig-disable-LEDS_GTA02_VIBRATOR.patch;patch=1 \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0001-Fix-s3c-adc-suspend.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0001-Fix-s3c-adc-suspend.patch
deleted file mode 100644
index 6627e698f0..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel/0001-Fix-s3c-adc-suspend.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From e22e97d2266d100f501f1e22275595eb68dd3e6f Mon Sep 17 00:00:00 2001
-From: Vasily Khoruzhick <anarsoul@gmail.com>
-Date: Thu, 1 Oct 2009 20:58:18 -0500
-Subject: [PATCH 1/7] Fix s3c-adc suspend
-
-Fix for a bug that shows when the s3c2410 TS driver requests
-a conversion from the s3c-adc driver and the machine goes into suspend.
-In this case the touchscreen stops working.
-
-Note: Nelson edited the original patch with a few small changes.
-
-Reported-by: Radek Polak <psonek2@seznam.cz>
-Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
----
- arch/arm/plat-s3c24xx/adc.c |   42 +++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 37 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c
-index 9056bcc..4ce45c5 100644
---- a/arch/arm/plat-s3c24xx/adc.c
-+++ b/arch/arm/plat-s3c24xx/adc.c
-@@ -43,6 +43,7 @@ struct s3c_adc_client {
- 	unsigned int		 nr_samples;
- 	unsigned char		 is_ts;
- 	unsigned char		 channel;
-+	unsigned selected;
- 
- 	void	(*select_cb)(unsigned selected);
- 	void	(*convert_cb)(unsigned val1, unsigned val2,
-@@ -68,6 +69,7 @@ static struct adc_device *adc_dev;
- static LIST_HEAD(adc_pending);
- 
- #define adc_dbg(_adc, msg...) dev_dbg(&(_adc)->pdev->dev, msg)
-+#define adc_info(_adc, msg...) dev_info(&(_adc)->pdev->dev, msg)
- 
- #define AUTOPST	(S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | \
- 		 S3C2410_ADCTSC_XP_SEN | S3C2410_ADCTSC_AUTO_PST | \
-@@ -91,7 +93,10 @@ static inline void s3c_adc_select(struct adc_device *adc,
- {
- 	unsigned con = readl(adc->regs + S3C2410_ADCCON);
- 
--	client->select_cb(1);
-+	if (!client->selected) {
-+		client->selected = 1;
-+		client->select_cb(1);
-+	}
- 
- 	con &= ~S3C2410_ADCCON_MUXMASK;
- 	con &= ~S3C2410_ADCCON_STDBM;
-@@ -115,12 +120,9 @@ void s3c_adc_try(struct adc_device *adc)
- {
- 	struct s3c_adc_client *next = adc->ts_pend;
- 
--	if (!next && !list_empty(&adc_pending)) {
-+	if (!next && !list_empty(&adc_pending))
- 		next = list_first_entry(&adc_pending,
- 					struct s3c_adc_client, pend);
--		list_del(&next->pend);
--	} else
--		adc->ts_pend = NULL;
- 
- 	if (next) {
- 		adc_dbg(adc, "new client is %p\n", next);
-@@ -229,9 +231,16 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
- 		/* fire another conversion for this */
- 
- 		client->select_cb(1);
-+		client->selected = 1;
- 		s3c_adc_convert(adc);
- 	} else {
- 		local_irq_save(flags);
-+		client->selected = 0;
-+		if (!adc->cur->is_ts)
-+			list_del(&adc->cur->pend);
-+		else
-+			adc->ts_pend = NULL;
-+
- 		(client->select_cb)(0);
- 		adc->cur = NULL;
- 
-@@ -341,20 +350,43 @@ static int s3c_adc_suspend(struct platform_device *pdev, pm_message_t state)
- 	writel(con, adc->regs + S3C2410_ADCCON);
- 
- 	clk_disable(adc->clk);
-+	disable_irq(IRQ_ADC);
-+
-+	if (!list_empty(&adc_pending) || adc->ts_pend)
-+		adc_info(adc, "%s:We still have clients pending\n", __func__);
- 
- 	return 0;
- }
- 
-+static struct work_struct resume_work;
-+
-+static void adc_resume_work(struct work_struct *work)
-+{
-+	struct adc_device *adc = platform_get_drvdata(adc_dev->pdev);
-+
-+	adc_info(adc, "%s:We still have clients pending\n", __func__);
-+	s3c_adc_try(adc_dev);
-+}
-+
- static int s3c_adc_resume(struct platform_device *pdev)
- {
- 	struct adc_device *adc = platform_get_drvdata(pdev);
- 
-+	enable_irq(IRQ_ADC);
- 	clk_enable(adc->clk);
- 
- 	writel(adc->prescale | S3C2410_ADCCON_PRSCEN,
- 	       adc->regs + S3C2410_ADCCON);
- 	writel(adc->delay, adc->regs + S3C2410_ADCDLY);
- 
-+	/* Schedule task if there are clients pending. */
-+	if (!list_empty(&adc_pending) || adc_dev->ts_pend) {
-+		INIT_WORK(&resume_work, adc_resume_work);
-+		if (!schedule_work(&resume_work))
-+			dev_err(&pdev->dev,
-+				"Failed to schedule adc_resume work!\n");
-+	}
-+
- 	return 0;
- }
- 
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0002-GTA01-GTA02-disable-android-drivers-in-default-confi.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0002-GTA01-GTA02-disable-android-drivers-in-default-confi.patch
deleted file mode 100644
index 797f2fb27b..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel/0002-GTA01-GTA02-disable-android-drivers-in-default-confi.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 18713d582b94c7f132f306c01c43fd22a12a1fc5 Mon Sep 17 00:00:00 2001
-From: Radek Polak <psonek2@seznam.cz>
-Date: Fri, 2 Oct 2009 20:54:29 +0200
-Subject: [PATCH 2/7] GTA01/GTA02: disable android drivers in default configs
-
-Android drivers are not needed for standard linux systems. We can save
-memory by disabling them.
-
-Android low memory killer (CONFIG_ANDROID_LOW_MEMORY_KILLER) also
-prevents using swap by killing applications before swapping can start
-on non android systems.
-
-Reported-by: Jim Morris <morris@wolfman.com>
-Signed-off-by: Radek Polak <psonek2@seznam.cz>
-Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
----
- arch/arm/configs/gta01_moredrivers_defconfig |   21 ++++++++++-----------
- arch/arm/configs/gta02_moredrivers_defconfig |   19 ++++++++-----------
- arch/arm/configs/gta02_packaging_defconfig   |   19 ++++++++-----------
- 3 files changed, 26 insertions(+), 33 deletions(-)
-
-diff --git a/arch/arm/configs/gta01_moredrivers_defconfig b/arch/arm/configs/gta01_moredrivers_defconfig
-index 411acab..68b95e7 100644
---- a/arch/arm/configs/gta01_moredrivers_defconfig
-+++ b/arch/arm/configs/gta01_moredrivers_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.29-rc3
--# Tue Feb 24 02:13:21 2009
-+# Fri Oct  2 16:49:49 2009
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -203,6 +203,7 @@ CONFIG_S3C_GPIO_SPACE=0
- CONFIG_S3C_GPIO_TRACK=y
- CONFIG_S3C_DMA=y
- CONFIG_S3C_PWM=y
-+CONFIG_S3C_DEV_USB_HOST=y
- 
- #
- # S3C2400 Machines
-@@ -1159,6 +1160,7 @@ CONFIG_WATCHDOG=y
- #
- # CONFIG_SOFT_WATCHDOG is not set
- CONFIG_S3C2410_WATCHDOG=m
-+CONFIG_PCF50606_WATCHDOG=y
- 
- #
- # USB-based Watchdog Cards
-@@ -1686,17 +1688,14 @@ CONFIG_STAGING=y
- #
- # Android
- #
--CONFIG_ANDROID=y
--CONFIG_ANDROID_BINDER_IPC=y
--CONFIG_ANDROID_LOGGER=y
--CONFIG_ANDROID_RAM_CONSOLE=y
--CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
--# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
--# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
--CONFIG_ANDROID_TIMED_GPIO=y
--CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-+# CONFIG_ANDROID is not set
-+# CONFIG_ANDROID_BINDER_IPC is not set
-+# CONFIG_ANDROID_LOGGER is not set
-+# CONFIG_ANDROID_RAM_CONSOLE is not set
-+# CONFIG_ANDROID_TIMED_GPIO is not set
-+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
- # CONFIG_ANDROID_WAKELOCK is not set
--CONFIG_ANDROID_PARANOID_NETWORK=y
-+# CONFIG_ANDROID_PARANOID_NETWORK is not set
- 
- #
- # File systems
-diff --git a/arch/arm/configs/gta02_moredrivers_defconfig b/arch/arm/configs/gta02_moredrivers_defconfig
-index 13b4121..e4fe9a9 100644
---- a/arch/arm/configs/gta02_moredrivers_defconfig
-+++ b/arch/arm/configs/gta02_moredrivers_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.29-rc3
--# Sun Apr 19 23:22:38 2009
-+# Fri Oct  2 20:52:45 2009
- #
- CONFIG_ARM=y
- CONFIG_HAVE_PWM=y
-@@ -1782,17 +1782,14 @@ CONFIG_STAGING=y
- #
- # Android
- #
--CONFIG_ANDROID=y
--CONFIG_ANDROID_BINDER_IPC=y
--CONFIG_ANDROID_LOGGER=y
--CONFIG_ANDROID_RAM_CONSOLE=y
--CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
--# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
--# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
--CONFIG_ANDROID_TIMED_GPIO=y
--CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-+# CONFIG_ANDROID is not set
-+# CONFIG_ANDROID_BINDER_IPC is not set
-+# CONFIG_ANDROID_LOGGER is not set
-+# CONFIG_ANDROID_RAM_CONSOLE is not set
-+# CONFIG_ANDROID_TIMED_GPIO is not set
-+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
- # CONFIG_ANDROID_WAKELOCK is not set
--CONFIG_ANDROID_PARANOID_NETWORK=y
-+# CONFIG_ANDROID_PARANOID_NETWORK is not set
- 
- #
- # File systems
-diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig
-index 03c72d5..e2dbbef 100644
---- a/arch/arm/configs/gta02_packaging_defconfig
-+++ b/arch/arm/configs/gta02_packaging_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.29-rc3
--# Sun Apr 19 22:57:25 2009
-+# Fri Oct  2 20:51:57 2009
- #
- CONFIG_ARM=y
- CONFIG_HAVE_PWM=y
-@@ -1785,17 +1785,14 @@ CONFIG_STAGING=y
- #
- # Android
- #
--CONFIG_ANDROID=y
--CONFIG_ANDROID_BINDER_IPC=y
--CONFIG_ANDROID_LOGGER=y
--CONFIG_ANDROID_RAM_CONSOLE=y
--CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
--# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
--# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
--CONFIG_ANDROID_TIMED_GPIO=y
--CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-+# CONFIG_ANDROID is not set
-+# CONFIG_ANDROID_BINDER_IPC is not set
-+# CONFIG_ANDROID_LOGGER is not set
-+# CONFIG_ANDROID_RAM_CONSOLE is not set
-+# CONFIG_ANDROID_TIMED_GPIO is not set
-+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
- # CONFIG_ANDROID_WAKELOCK is not set
--CONFIG_ANDROID_PARANOID_NETWORK=y
-+# CONFIG_ANDROID_PARANOID_NETWORK is not set
- 
- #
- # File systems
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0003-glamo-spi-missing-semicolon-after-MODULE_AUTHOR.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0003-glamo-spi-missing-semicolon-after-MODULE_AUTHOR.patch
deleted file mode 100644
index 0eed294911..0000000000
--- a/recipes/linux/linux-openmoko-shr-drm-devel/0003-glamo-spi-missing-semicolon-after-MODULE_AUTHOR.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From cf7ef93a6d5eff863034fade19d7a1d6bc19789a Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 4 Nov 2009 20:09:03 +0100
-Subject: [PATCH 3/7] glamo-spi: missing semicolon after MODULE_AUTHOR()
-
-Fix compilation error due to missing semicolon
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Signed-off-by: Paul Fertser <fercerpav@gmail.com>
----
- drivers/mfd/glamo/glamo-lcm-spi.c  |    2 +-
- drivers/mfd/glamo/glamo-spi-gpio.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c
-index a7129fe..446f058 100644
---- a/drivers/mfd/glamo/glamo-lcm-spi.c
-+++ b/drivers/mfd/glamo/glamo-lcm-spi.c
-@@ -236,5 +236,5 @@ module_init(glamo_spi_init);
- module_exit(glamo_spi_exit);
- 
- MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
--MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>")
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
- MODULE_LICENSE("GPL");
-diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
-index b92e48a..6ebf498 100644
---- a/drivers/mfd/glamo/glamo-spi-gpio.c
-+++ b/drivers/mfd/glamo/glamo-spi-gpio.c
-@@ -274,5 +274,5 @@ module_init(glamo_spi_init);
- module_exit(glamo_spi_exit);
- 
- MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
--MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>")
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
- MODULE_LICENSE("GPL");
--- 
-1.6.5.2
-
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
index 494e4cebd7..a142d1f9c5 100644
--- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
+++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
@@ -15,9 +15,6 @@ SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \
   file://fix-install.patch;patch=1 \
   file://0001-Add-drm-to-Makefile-version.patch;patch=1 \
-  file://0001-Fix-s3c-adc-suspend.patch;patch=1 \
-  file://0002-GTA01-GTA02-disable-android-drivers-in-default-confi.patch;patch=1 \
-  file://0003-glamo-spi-missing-semicolon-after-MODULE_AUTHOR.patch;patch=1 \
   file://0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch;patch=1 \
   file://0005-Enable-DRM-and-MFD_GLAMO_DRM.patch;patch=1 \
   file://0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch;patch=1 \