[oe-commits] Martin Jansa : linux-openmoko-2.6.32: upgrade to 2.6.32. 23 and add 3 patches from qtmoko
git version control
git at git.openembedded.org
Mon Sep 27 20:12:16 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: e105b26afd7f2f23c3e7eb1d6bb51a1adb963e57
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e105b26afd7f2f23c3e7eb1d6bb51a1adb963e57
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Mon Sep 27 09:57:51 2010 +0200
linux-openmoko-2.6.32: upgrade to 2.6.32.23 and add 3 patches from qtmoko
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
...me-dev-s3c2410_serialXXX-to-dev-ttySACXXX.patch | 29 +++++++
...-Enable-powering-off-after-8s-POWER-press.patch | 50 +++++++++++
...t-remember-state-of-bluetooth-in-variable.patch | 87 ++++++++++++++++++++
recipes/linux/linux-openmoko-2.6.32_git.bb | 9 ++-
4 files changed, 172 insertions(+), 3 deletions(-)
diff --git a/recipes/linux/linux-openmoko-2.6.32/0026-Rename-dev-s3c2410_serialXXX-to-dev-ttySACXXX.patch b/recipes/linux/linux-openmoko-2.6.32/0026-Rename-dev-s3c2410_serialXXX-to-dev-ttySACXXX.patch
new file mode 100644
index 0000000..63b5d19
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0026-Rename-dev-s3c2410_serialXXX-to-dev-ttySACXXX.patch
@@ -0,0 +1,29 @@
+From 16ee10ac5e52ccfabf233637d1187d4927caa37a Mon Sep 17 00:00:00 2001
+From: Radek Polak <psonek2 at seznam.cz>
+Date: Tue, 21 Sep 2010 20:55:41 +0200
+Subject: [PATCH 26/28] Rename /dev/s3c2410_serialXXX to /dev/ttySACXXX
+
+It's nice that devtmpfs now creates the serial port with well known
+name.
+
+http://docs.openmoko.org/trac/ticket/2338
+---
+ drivers/serial/samsung.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
+index e0062b5..efae23c 100644
+--- a/drivers/serial/samsung.c
++++ b/drivers/serial/samsung.c
+@@ -878,7 +878,7 @@ static struct uart_ops s3c24xx_serial_ops = {
+
+ static struct uart_driver s3c24xx_uart_drv = {
+ .owner = THIS_MODULE,
+- .dev_name = "s3c2410_serial",
++ .dev_name = S3C24XX_SERIAL_NAME,
+ .nr = CONFIG_SERIAL_SAMSUNG_UARTS,
+ .cons = S3C24XX_SERIAL_CONSOLE,
+ .driver_name = S3C24XX_SERIAL_NAME,
+--
+1.7.3
+
diff --git a/recipes/linux/linux-openmoko-2.6.32/0027-Enable-powering-off-after-8s-POWER-press.patch b/recipes/linux/linux-openmoko-2.6.32/0027-Enable-powering-off-after-8s-POWER-press.patch
new file mode 100644
index 0000000..f35e24e
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0027-Enable-powering-off-after-8s-POWER-press.patch
@@ -0,0 +1,50 @@
+From fa4a89103998631989a32c8e620a1bc94683d781 Mon Sep 17 00:00:00 2001
+From: Radek Polak <psonek2 at seznam.cz>
+Date: Thu, 16 Sep 2010 07:36:50 +0200
+Subject: [PATCH 27/28] Enable powering off after 8s POWER press
+
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+---
+ arch/arm/mach-s3c2442/mach-gta02.c | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
+index 5ecc57b..8a7d3ea 100644
+--- a/arch/arm/mach-s3c2442/mach-gta02.c
++++ b/arch/arm/mach-s3c2442/mach-gta02.c
+@@ -569,6 +569,11 @@ static struct pcf50633_bl_platform_data gta02_backlight_data = {
+ .ramp_time = 3,
+ };
+
++static void gta02_poweroff(void)
++{
++ pcf50633_reg_set_bit_mask(gta02_pcf, PCF50633_REG_OOCSHDWN, 1, 1);
++}
++
+ struct pcf50633_platform_data gta02_pcf_pdata = {
+ .resumers = {
+ [0] = PCF50633_INT1_USBINS |
+@@ -717,6 +722,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = {
+ },
+ .probe_done = gta02_pmu_attach_child_devices,
+ .mbc_event_callback = gta02_pmu_event_callback,
++ .force_shutdown = gta02_poweroff,
+ };
+
+
+@@ -1348,12 +1354,6 @@ static void gta02_pmu_attach_child_devices(struct pcf50633 *pcf)
+ ARRAY_SIZE(gta02_devices_pmu_children));
+ }
+
+-static void gta02_poweroff(void)
+-{
+- pcf50633_reg_set_bit_mask(gta02_pcf, PCF50633_REG_OOCSHDWN, 1, 1);
+-}
+-
+-
+ struct gta02_device_children {
+ const char *dev_name;
+ size_t num_children;
+--
+1.7.3
+
diff --git a/recipes/linux/linux-openmoko-2.6.32/0028-GTA02-bt-remember-state-of-bluetooth-in-variable.patch b/recipes/linux/linux-openmoko-2.6.32/0028-GTA02-bt-remember-state-of-bluetooth-in-variable.patch
new file mode 100644
index 0000000..5499cfb
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.32/0028-GTA02-bt-remember-state-of-bluetooth-in-variable.patch
@@ -0,0 +1,87 @@
+From 938c3c293884822a5e07f5adf4b711226855b71b Mon Sep 17 00:00:00 2001
+From: Radek Polak <psonek2 at seznam.cz>
+Date: Tue, 21 Sep 2010 20:03:14 +0200
+Subject: [PATCH 28/28] GTA02 bt - remember state of bluetooth in variable
+
+Reading bt status before suspend for some reason does not work. It
+always resumes with bluetooth turned off.
+
+This patch remembers if bluetooth is switched on/off in variable
+and after resume bluetooth ends up in the same state as was before
+suspend.
+
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+---
+ arch/arm/mach-s3c2442/gta02-pm-bt.c | 18 +++++++++++-------
+ 1 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/arch/arm/mach-s3c2442/gta02-pm-bt.c b/arch/arm/mach-s3c2442/gta02-pm-bt.c
+index 8bb2a12..ce87087 100644
+--- a/arch/arm/mach-s3c2442/gta02-pm-bt.c
++++ b/arch/arm/mach-s3c2442/gta02-pm-bt.c
+@@ -53,7 +53,8 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
+ }
+ }
+
+-static void __gta02_pm_bt_toggle_radio(struct device *dev, unsigned int on)
++static void __gta02_pm_bt_toggle_radio(struct device *dev, unsigned int on,
++ bool remember_state)
+ {
+ struct gta02_pm_bt_data *bt_data = dev_get_drvdata(dev);
+
+@@ -72,6 +73,9 @@ static void __gta02_pm_bt_toggle_radio(struct device *dev, unsigned int on)
+ }
+
+ s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on);
++
++ if (remember_state)
++ bt_data->pre_resume_state = on;
+ }
+
+
+@@ -79,7 +83,7 @@ static int bt_rfkill_set_block(void *data, bool blocked)
+ {
+ struct device *dev = data;
+
+- __gta02_pm_bt_toggle_radio(dev, !blocked);
++ __gta02_pm_bt_toggle_radio(dev, !blocked, true);
+
+ return 0;
+ }
+@@ -98,7 +102,7 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
+ if (!strcmp(attr->attr.name, "power_on")) {
+ rfkill_set_sw_state(bt_data->rfkill, on ? 1 : 0);
+
+- __gta02_pm_bt_toggle_radio(dev, on);
++ __gta02_pm_bt_toggle_radio(dev, on, true);
+ } else if (!strcmp(attr->attr.name, "reset")) {
+ /* reset is low-active, so we need to invert */
+ s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
+@@ -113,12 +117,12 @@ static DEVICE_ATTR(reset, 0644, bt_read, bt_write);
+ #ifdef CONFIG_PM
+ static int gta02_bt_suspend(struct platform_device *pdev, pm_message_t state)
+ {
+- struct gta02_pm_bt_data *bt_data = dev_get_drvdata(&pdev->dev);
++/* struct gta02_pm_bt_data *bt_data = dev_get_drvdata(&pdev->dev); */
+
+ dev_dbg(&pdev->dev, DRVMSG ": suspending\n");
+
+- bt_data->pre_resume_state = s3c2410_gpio_getpin(GTA02_GPIO_BT_EN);
+- __gta02_pm_bt_toggle_radio(&pdev->dev, 0);
++ /* bt_data->pre_resume_state = s3c2410_gpio_getpin(GTA02_GPIO_BT_EN); */
++ __gta02_pm_bt_toggle_radio(&pdev->dev, 0, false);
+
+ return 0;
+ }
+@@ -128,7 +132,7 @@ static int gta02_bt_resume(struct platform_device *pdev)
+ struct gta02_pm_bt_data *bt_data = dev_get_drvdata(&pdev->dev);
+ dev_dbg(&pdev->dev, DRVMSG ": resuming\n");
+
+- __gta02_pm_bt_toggle_radio(&pdev->dev, bt_data->pre_resume_state);
++ __gta02_pm_bt_toggle_radio(&pdev->dev, bt_data->pre_resume_state, false);
+ return 0;
+ }
+ #else
+--
+1.7.3
+
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
index 828ef22..246b7d9 100644
--- a/recipes/linux/linux-openmoko-2.6.32_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -1,7 +1,7 @@
require linux.inc
require linux-openmoko.inc
-KERNEL_RELEASE="2.6.32.22"
+KERNEL_RELEASE="2.6.32.23"
SRCREV = "a9254be10ac2294ea20165a87c09ea6afcf66d94"
OEV = "oe3.3"
@@ -21,6 +21,9 @@ SRC_URI = "\
file://0003-usbhost.patch.patch \
file://0004-ar6000_delay.patch.patch \
file://0005-save_regs.patch.patch \
+ file://0026-Rename-dev-s3c2410_serialXXX-to-dev-ttySACXXX.patch \
+ file://0027-Enable-powering-off-after-8s-POWER-press.patch \
+ file://0028-GTA02-bt-remember-state-of-bluetooth-in-variable.patch \
# patches from Weiss's gdrm-for-merging branch
file://0007-DRM-for-platform-devices.patch \
file://0008-Glamo-DRM-and-KMS-driver.patch \
@@ -45,8 +48,8 @@ SRC_URI = "\
file://defconfig \
"
-SRC_URI[stablepatch.md5sum] = "da1431a1d659298c6bd11714416c840f"
-SRC_URI[stablepatch.sha256sum] = "9f04a819a6ae1ac9a4793ce229bc9a2cb095ac10a2d46955ec1e6769283c4de4"
+SRC_URI[stablepatch.md5sum] = "6eac9aebbf9e74546b7c44c0fb9348a7"
+SRC_URI[stablepatch.sha256sum] = "c252375c7c2d2557cb8d4b708bc7e3ca4d23b81afbf3278b87f8721c8ca5f8c9"
S = "${WORKDIR}/git"
More information about the Openembedded-commits
mailing list