[meego-commits] 6686: Changes to Trunk:Testing/kernel
Ameya Palande
ameya.palande at nokia.com
Mon Aug 16 09:12:06 UTC 2010
Hi,
I have made the following changes to kernel in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Ameya Palande
[This message was auto-generated]
---
Request #6686:
submit: devel:kernel/kernel(r128) -> Trunk:Testing/kernel
Message:
- ARM: Introduce EEM support in g_nokia which shuold fix usb networking
- Fix scanning while associated problem in wl1251
- ARM: Enable mtdoops for N900
- ARM: Enable CONFIG_SCHED_DEBUG for bootchart
- Fix bug #4871 by disabling CONFIG_SYSFS_DEPRECATED
- Disable bootup penguin logo to increase the screen space
- Enable CONFIG_SCHEDSTATS needed for bootchart
- Covert watchdog drivers to built-in, so that device won't reboot in case of
rootfs mounting problem
--This line, and those below, will be ignored--
State: new 2010-08-15T19:12:42 apalande
Comment: None
changes files:
--------------
--- kernel.changes
+++ kernel.changes
@@ -0,0 +1,15 @@
+* Fri Aug 13 2010 Ameya Palande <ameya.palande at nokia.com> - 2.6.35
+- ARM: Introduce EEM support in g_nokia which shuold fix usb networking
+- Fix scanning while associated problem in wl1251
+
+* Wed Aug 12 2010 Ameya Palande <ameya.palande at nokia.com> - 2.6.35
+- ARM: Enable mtdoops for N900
+- ARM: Enable CONFIG_SCHED_DEBUG for bootchart
+
+* Wed Aug 11 2010 Ameya Palande <ameya.palande at nokia.com> - 2.6.35
+- Fix bug #4871 by disabling CONFIG_SYSFS_DEPRECATED
+- Disable bootup penguin logo to increase the screen space
+- Enable CONFIG_SCHEDSTATS needed for bootchart
+- Covert watchdog drivers to built-in, so that device won't reboot in case of
+ rootfs mounting problem
+
new:
----
linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
linux-2.6.37-EEM-support-for-g_nokia.patch
spec files:
-----------
--- kernel-ivi.spec
+++ kernel-ivi.spec
@@ -249,6 +249,10 @@
Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
# Cellular modem support
Patch310: linux-2.6-n900-modem-support.patch
+# Fix wl1251 scanning while associated
+Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+# Introduce EEM support in g_nokia which should fix usb networking
+Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
#
#
@@ -609,6 +613,12 @@
# Cellular modem support
# linux-2.6-n900-modem-support.patch
%patch310 -p1
+# Fix wl1251 scanning while associated
+# linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+%patch311 -p1
+# Introduce EEM support in g_nokia which should fix usb networking
+# linux-2.6.37-EEM-support-for-g_nokia.patch
+%patch312 -p1
#
#
--- kernel-mrst.spec
+++ kernel-mrst.spec
@@ -250,6 +250,10 @@
Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
# Cellular modem support
Patch310: linux-2.6-n900-modem-support.patch
+# Fix wl1251 scanning while associated
+Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+# Introduce EEM support in g_nokia which should fix usb networking
+Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
#
#
@@ -610,6 +614,12 @@
# Cellular modem support
# linux-2.6-n900-modem-support.patch
%patch310 -p1
+# Fix wl1251 scanning while associated
+# linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+%patch311 -p1
+# Introduce EEM support in g_nokia which should fix usb networking
+# linux-2.6.37-EEM-support-for-g_nokia.patch
+%patch312 -p1
#
#
--- kernel-n900.spec
+++ kernel-n900.spec
@@ -249,6 +249,10 @@
Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
# Cellular modem support
Patch310: linux-2.6-n900-modem-support.patch
+# Fix wl1251 scanning while associated
+Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+# Introduce EEM support in g_nokia which should fix usb networking
+Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
#
#
@@ -609,6 +613,12 @@
# Cellular modem support
# linux-2.6-n900-modem-support.patch
%patch310 -p1
+# Fix wl1251 scanning while associated
+# linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+%patch311 -p1
+# Introduce EEM support in g_nokia which should fix usb networking
+# linux-2.6.37-EEM-support-for-g_nokia.patch
+%patch312 -p1
#
#
--- kernel-netbook.spec
+++ kernel-netbook.spec
@@ -249,6 +249,10 @@
Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
# Cellular modem support
Patch310: linux-2.6-n900-modem-support.patch
+# Fix wl1251 scanning while associated
+Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+# Introduce EEM support in g_nokia which should fix usb networking
+Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
#
#
@@ -609,6 +613,12 @@
# Cellular modem support
# linux-2.6-n900-modem-support.patch
%patch310 -p1
+# Fix wl1251 scanning while associated
+# linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+%patch311 -p1
+# Introduce EEM support in g_nokia which should fix usb networking
+# linux-2.6.37-EEM-support-for-g_nokia.patch
+%patch312 -p1
#
#
--- kernel.spec
+++ kernel.spec
@@ -261,6 +261,10 @@
Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
# Cellular modem support
Patch310: linux-2.6-n900-modem-support.patch
+# Fix wl1251 scanning while associated
+Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+# Introduce EEM support in g_nokia which should fix usb networking
+Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
#
#
@@ -651,6 +655,12 @@
# Cellular modem support
# linux-2.6-n900-modem-support.patch
%patch310 -p1
+# Fix wl1251 scanning while associated
+# linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+%patch311 -p1
+# Introduce EEM support in g_nokia which should fix usb networking
+# linux-2.6.37-EEM-support-for-g_nokia.patch
+%patch312 -p1
#
#
other changes:
--------------
++++++ config-arm-generic
--- config-arm-generic
+++ config-arm-generic
@@ -30,8 +30,6 @@
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_TINY_RCU is not set
# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
# CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set
CONFIG_RD_GZIP=y
@@ -745,7 +743,6 @@
#
# CONFIG_DEBUG_SHIRQ is not set
# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_SCHEDSTATS is not set
# CONFIG_TIMER_STATS is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
# CONFIG_DEBUG_LIST is not set
@@ -761,6 +758,7 @@
# CONFIG_DEBUG_ERRORS is not set
# CONFIG_DEBUG_LL is not set
# CONFIG_OC_ETM is not set
+CONFIG_SCHED_DEBUG=y
# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
++++++ config-arm-n900
--- config-arm-n900
+++ config-arm-n900
@@ -108,7 +108,7 @@
#
# Boot options
#
-CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootwait console=tty1 console=ttyS2,115200n8 omapfb.vram=0:2M,1:2M,2:2M nosplash"
+CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootwait console=tty1 console=ttyS2,115200n8 omapfb.vram=0:2M,1:2M,2:2M mtdoops.mtddev=2 nosplash"
#
# IP: Netfilter Configuration
@@ -146,8 +146,8 @@
CONFIG_GPIO_TWL4030=y
-CONFIG_OMAP_WATCHDOG=m
-CONFIG_TWL4030_WATCHDOG=m
+CONFIG_OMAP_WATCHDOG=y
+CONFIG_TWL4030_WATCHDOG=y
CONFIG_TWL4030_CORE=y
CONFIG_REGULATOR=y
@@ -187,8 +187,6 @@
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_VGA16=y
CONFIG_HID=m
CONFIG_USB_DEVICE_CLASS=y
@@ -215,6 +213,7 @@
CONFIG_USB_ETH_RNDIS=y
CONFIG_USB_ETH_EEM=y
CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_NOKIA_EEM=y
CONFIG_USB_OTG_UTILS=y
CONFIG_TWL4030_USB=y
@@ -427,3 +426,5 @@
CONFIG_SSI_PROTOCOL=m
CONFIG_HSI_CHAR=m
CONFIG_HSI_CMT_SPEECH=m
+
+CONFIG_MTD_OOPS=y
++++++ linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch (new)
--- linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+++ linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+From: "Kululin Yuri (EXT-Teleca/RussianFed)" <EXT-Yuri.Kululin at nokia.com>
+To: "kvalo at adurom.com" <kvalo at adurom.com>
+CC: "linux-wireless at vger.kernel.org" <linux-wireless at vger.kernel.org>, "Palande Ameya (Nokia-MS/Helsinki)" <ameya.palande at nokia.com>, "Kululin Yuri (EXT-Teleca/RussianFed)" <EXT-Yuri.Kululin at nokia.com>
+Date: Fri, 13 Aug 2010 11:46:12 +0200
+Subject: [PATCH 1/1] wl1251: fix trigger scan timeout usage
+
+From: Yuri Kululin <ext-yuri.kululin at nokia.com>
+
+Use appropriate command (CMD_TRIGGER_SCAN_TO) instead of scan command
+(CMD_SCAN) to configure trigger scan timeout.
+
+This was broken in commit 3a98c30f3e8bb1f32b5bcb74a39647b3670de275.
+
+Cc: stable at kernel.org
+Signed-off-by: Yuri Ershov <ext-yuri.ershov at nokia.com>
+Signed-off-by: Yuri Kululin <ext-yuri.kululin at nokia.com>
+---
+ drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c
+index a37b30c..ce3722f 100644
+--- a/drivers/net/wireless/wl12xx/wl1251_cmd.c
++++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c
+@@ -484,7 +484,7 @@ int wl1251_cmd_trigger_scan_to(struct wl1251 *wl, u32 timeout)
+
+ cmd->timeout = timeout;
+
+- ret = wl1251_cmd_send(wl, CMD_SCAN, cmd, sizeof(*cmd));
++ ret = wl1251_cmd_send(wl, CMD_TRIGGER_SCAN_TO, cmd, sizeof(*cmd));
+ if (ret < 0) {
+ wl1251_error("cmd trigger scan to failed: %d", ret);
+ goto out;
+--
+1.7.1.1
+
+
++++++ linux-2.6.37-EEM-support-for-g_nokia.patch (new)
--- linux-2.6.37-EEM-support-for-g_nokia.patch
+++ linux-2.6.37-EEM-support-for-g_nokia.patch
+From: Ameya Palande <ameya.palande at nokia.com>
+Date: Fri, 13 Aug 2010 10:32:08 +0300
+Subject: [PATCH] EEM support for g_nokia
+
+Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
+---
+ drivers/usb/gadget/Kconfig | 16 ++++++++++++++++
+ drivers/usb/gadget/nokia.c | 21 ++++++++++++++++++---
+ 2 files changed, 34 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
+index 591ae9f..9f3031c 100644
+--- a/drivers/usb/gadget/Kconfig
++++ b/drivers/usb/gadget/Kconfig
+@@ -860,6 +860,22 @@ config USB_G_NOKIA
+ It's only really useful for N900 hardware. If you're building
+ a kernel for N900, say Y or M here. If unsure, say N.
+
++config USB_G_NOKIA_EEM
++ bool "Ethernet Emulation Model (EEM) support"
++ depends on USB_G_NOKIA
++ default n
++ help
++ CDC EEM is a newer USB standard that is somewhat simpler than CDC ECM
++ and therefore can be supported by more hardware. Technically ECM and
++ EEM are designed for different applications. The ECM model extends
++ the network interface to the target (e.g. a USB cable modem), and the
++ EEM model is for mobile devices to communicate with hosts using
++ ethernet over USB. For Linux gadgets, however, the interface with
++ the host is the same (a usbX device), so the differences are minimal.
++
++ If you say "y" here, the Ethernet gadget driver will use the EEM
++ protocol rather than ECM. If unsure, say "n".
++
+ config USB_G_MULTI
+ tristate "Multifunction Composite Gadget (EXPERIMENTAL)"
+ depends on BLOCK && NET
+diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c
+index 7d6b66a..f1c2647 100644
+--- a/drivers/usb/gadget/nokia.c
++++ b/drivers/usb/gadget/nokia.c
+@@ -46,6 +46,7 @@
+ #include "u_serial.c"
+ #include "f_acm.c"
+ #include "f_ecm.c"
++#include "f_eem.c"
+ #include "f_obex.c"
+ #include "f_serial.c"
+ #include "f_phonet.c"
+@@ -97,6 +98,14 @@ static struct usb_device_descriptor device_desc = {
+
+ /*-------------------------------------------------------------------------*/
+
++#ifdef CONFIG_USB_G_NOKIA_EEM
++static int use_eem = 1;
++#else
++static int use_eem;
++#endif
++module_param(use_eem, bool, 0);
++MODULE_PARM_DESC(use_eem, "use CDC EEM mode");
++
+ /* Module */
+ MODULE_DESCRIPTION("Nokia composite gadget driver for N900");
+ MODULE_AUTHOR("Felipe Balbi");
+@@ -126,9 +135,15 @@ static int __init nokia_bind_config(struct usb_configuration *c)
+ if (status)
+ printk(KERN_DEBUG "could not bind acm config\n");
+
+- status = ecm_bind_config(c, hostaddr);
+- if (status)
+- printk(KERN_DEBUG "could not bind ecm config\n");
++ if (use_eem) {
++ status = eem_bind_config(c);
++ if (status)
++ printk(KERN_DEBUG "could not bind eem config\n");
++ } else {
++ status = ecm_bind_config(c, hostaddr);
++ if (status)
++ printk(KERN_DEBUG "could not bind ecm config\n");
++ }
+
+ return status;
+ }
+--
+1.7.0.4
+
++++++ series
--- series
+++ series
@@ -94,6 +94,10 @@
linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
# Cellular modem support
linux-2.6-n900-modem-support.patch
+# Fix wl1251 scanning while associated
+linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
+# Introduce EEM support in g_nokia which should fix usb networking
+linux-2.6.37-EEM-support-for-g_nokia.patch
#
#
More information about the MeeGo-commits
mailing list