[meego-commits] 14987: Changes to devel:devices:n900/kernel-adaptation-n900

[Ilkka Koskinen]

Hi,
I have made the following changes to kernel-adaptation-n900 in project devel:devices:n900. Please review and accept ASAP.

Thank You,
Ilkka Koskinen

[This message was auto-generated]

---

Request #14987:

  submit:   home:ikoskine:devel:devices:n900/kernel-adaptation-n900 -> devel:devices:n900/kernel-adaptation-n900


Message:
    Fixes: Usb power consumption (BMC#14369), sleeping function called from invalid context (BMC#7657)

State:   new          2011-03-18T06:10:17 ikoskine
Comment: None



changes files:
--------------
--- kernel.changes
+++ kernel.changes
@@ -0,0 +1,6 @@
+* Fri Oct 18 2011 Ilkka Koskinen <ilkka.koskinen at nokia.com> - 2.6.37
+- Fix: N900: USB consumes excess power until cable plug/unplug
+  cycle is performed (BMC#14369)
+- Fix: [N900] BUG: sleeping function called from invalid context
+  at kernel/mutex.c:94 (BMC#7657)
+

new:
----
  linux-2.6-rtc-twl-Switch-to-using-threaded-irq.patch
  linux-2.6.38-n900-musb-fix-regulator-init-at-boot.patch

spec files:
-----------
--- kernel-adaptation-n900.spec
+++ kernel-adaptation-n900.spec
@@ -315,6 +315,8 @@
 Patch350: linux-2.6.39-ASoC-omap-rx51-Enable-McBSP2-sidetone.patch
 Patch351: linux-2.6-watchdog-omap-wdt-add-fine-grain-runtime-pm.patch
 Patch352: linux-2.6.39-omap3-wdtimer-fix-core-idle-transition.patch
+Patch353: linux-2.6.38-n900-musb-fix-regulator-init-at-boot.patch
+Patch354: linux-2.6-rtc-twl-Switch-to-using-threaded-irq.patch
 
 #
 # End of the Nokia N900 patches
@@ -730,6 +732,10 @@
 %patch351 -p1
 # linux-2.6.39-omap3-wdtimer-fix-core-idle-transition.patch
 %patch352 -p1
+# linux-2.6.38-n900-musb-fix-regulator-init-at-boot.patch
+%patch353 -p1
+# linux-2.6-rtc-twl-Switch-to-using-threaded-irq.patch
+%patch354 -p1
 
 #
 # End of the Nokia N900 patches

other changes:
--------------

++++++ linux-2.6-rtc-twl-Switch-to-using-threaded-irq.patch (new)
--- linux-2.6-rtc-twl-Switch-to-using-threaded-irq.patch
+++ linux-2.6-rtc-twl-Switch-to-using-threaded-irq.patch
+From e1a09e2aca70c2dc6f39734301da651a0b6b0500 Mon Sep 17 00:00:00 2001
+From: Ilkka Koskinen <ilkka.koskinen at nokia.com>
+Date: Wed, 16 Mar 2011 16:37:33 +0200
+Subject: [PATCH] rtc-twl: Switch to using threaded irq
+
+The driver is accessing to i2c bus in interrupt handler. Therefore,
+it should use threaded irq handler.
+
+Signed-off-by: Ilkka Koskinen <ilkka.koskinen at nokia.com>
+---
+ drivers/rtc/rtc-twl.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
+index ed1b868..2715b96 100644
+--- a/drivers/rtc/rtc-twl.c
++++ b/drivers/rtc/rtc-twl.c
+@@ -475,7 +475,7 @@ static int __devinit twl_rtc_probe(struct platform_device *pdev)
+ 	if (ret < 0)
+ 		goto out1;
+ 
+-	ret = request_irq(irq, twl_rtc_interrupt,
++	ret = request_threaded_irq(irq, NULL, twl_rtc_interrupt,
+ 				IRQF_TRIGGER_RISING,
+ 				dev_name(&rtc->dev), rtc);
+ 	if (ret < 0) {
+-- 
+1.7.0.4
+

++++++ linux-2.6.38-n900-musb-fix-regulator-init-at-boot.patch (new)
--- linux-2.6.38-n900-musb-fix-regulator-init-at-boot.patch
+++ linux-2.6.38-n900-musb-fix-regulator-init-at-boot.patch
+From 82fd1ac8650d297003de0ae3cdb13113a79c5fe8 Mon Sep 17 00:00:00 2001
+From: Kalle Jokiniemi <kalle.jokiniemi at nokia.com>
+Date: Tue, 15 Mar 2011 14:57:41 +0100
+Subject: [PATCH] N900: musb: fix regulator init at boot
+
+The omap2430 otg driver did a musb_platform_resume at init
+which caused also usb regulators to be enabled, which
+was unnecessary and caused the regulators to consume lot
+of power until usb cable was plugged in.
+
+Fixed by doing a specific only the needed init work instead
+of full musb_platform_resume.
+
+Similar patch already available in upstream 2.6.38, so this
+patch is not needed in next kernel version. See here:
+
+http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.
+git;a=commitdiff;h=c20aebb92796cf54ae8171ad7f53a8fa7c61d2d8
+
+Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi at nokia.com>
+---
+ drivers/usb/musb/omap2430.c |   15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
+index ed618bd..58eee95 100644
+--- a/drivers/usb/musb/omap2430.c
++++ b/drivers/usb/musb/omap2430.c
+@@ -202,7 +202,20 @@ int __init musb_platform_init(struct musb *musb, void *board_data)
+ 		return -ENODEV;
+ 	}
+ 
+-	musb_platform_resume(musb);
++	if (musb->clock) {
++		if (musb->set_clock)
++			musb->set_clock(musb->clock, 1);
++		else
++			clk_enable(musb->clock);
++
++		l = musb_readl(musb->mregs, OTG_SYSCONFIG);
++		l &= ~ENABLEWAKEUP;	/* disable wakeup */
++		musb_writel(musb->mregs, OTG_SYSCONFIG, l);
++
++		l = musb_readl(musb->mregs, OTG_FORCESTDBY);
++		l &= ~ENABLEFORCE;	/* disable MSTANDBY */
++		musb_writel(musb->mregs, OTG_FORCESTDBY, l);
++	}
+ 
+ 	l = musb_readl(musb->mregs, OTG_SYSCONFIG);
+ 	l &= ~ENABLEWAKEUP;	/* disable wakeup */
+-- 
+1.7.0.4
+

++++++ series
--- series
+++ series
@@ -158,6 +158,8 @@
 linux-2.6.39-ASoC-omap-rx51-Enable-McBSP2-sidetone.patch
 linux-2.6-watchdog-omap-wdt-add-fine-grain-runtime-pm.patch
 linux-2.6.39-omap3-wdtimer-fix-core-idle-transition.patch
+linux-2.6.38-n900-musb-fix-regulator-init-at-boot.patch
+linux-2.6-rtc-twl-Switch-to-using-threaded-irq.patch
 
 #
 # End of the Nokia N900 patches