I have made the following changes intended for : CE:Adaptation:N950-N9 / kernel-adaptation-n950
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/3571 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3571: Messages from BOSS: WARNING check_package_is_complete_sources (kernel-adaptation-n950) failed: Failed to get source file list from spec or dsc: Failed to parse spec file: can't parse specfile No dsc file found WARNING check_valid_changes (kernel-adaptation-n950) failed: Could not parse spec in kernel-adaptation-n950: can't parse specfile Could not notify CE-maintainers (no address found) State: review 2011-12-13T10:19:24 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:marquiz:n950 / kernel-adaptation-n950 -> CE:Adaptation:N950-N9 / kernel-adaptation-n950 changes files: -------------- --- kernel-adaptation-n950.changes +++ kernel-adaptation-n950.changes @@ -0,0 +1,3 @@ +* Thu Dec 01 2011 Markus Lehtonen <[email protected]> - 2.6.32.20112201 +- config: enable g_multi USB gadget driver + new: ---- 0001-fix-power-draw-for-g_multi.patch spec files: ----------- --- kernel-adaptation-n950.spec +++ kernel-adaptation-n950.spec @@ -278,6 +278,9 @@ # Initramfs hack Patch94: 0106-initramfs-hack-to-ignore-junk-data-in-decompression.patch +# Charging +Patch95: 0001-fix-power-draw-for-g_multi.patch + BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -601,6 +604,10 @@ # 0106-initramfs-hack-to-ignore-junk-data-in-decompression.patch %patch94 -p1 +# Charging +# 0001-fix-power-draw-for-g_multi.patch +%patch95 -p1 + # Drop some necessary files from the source dir into the buildroot # HARMATTAN: no build-time config file generation, copy ready-made config file cp $RPM_SOURCE_DIR/kernel-*config . other changes: -------------- ++++++ 0001-fix-power-draw-for-g_multi.patch (new) --- 0001-fix-power-draw-for-g_multi.patch +++ 0001-fix-power-draw-for-g_multi.patch @@ -0,0 +1,33 @@ +From 50a545250c4f8a36c42d90dca56b9f8dc0508ddc Mon Sep 17 00:00:00 2001 +From: Markus Lehtonen <[email protected]> +Date: Thu, 8 Dec 2011 23:07:26 +0200 +Subject: [PATCH] fix power draw for g_multi + +Allows USB charging with g_multi loaded. +--- + drivers/usb/gadget/multi.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c +index a05bd0c..ca9904e 100644 +--- a/drivers/usb/gadget/multi.c ++++ b/drivers/usb/gadget/multi.c +@@ -185,6 +185,7 @@ static struct usb_configuration rndis_config_driver = { + .bConfigurationValue = 2, + /* .iConfiguration = DYNAMIC */ + .bmAttributes = USB_CONFIG_ATT_SELFPOWER, ++ .bMaxPower = 250, /* 500mA */ + }; + + #endif +@@ -223,6 +224,7 @@ static struct usb_configuration cdc_config_driver = { + .bConfigurationValue = 1, + /* .iConfiguration = DYNAMIC */ + .bmAttributes = USB_CONFIG_ATT_SELFPOWER, ++ .bMaxPower = 250, /* 500mA */ + }; + + #endif +-- +1.7.7 + ++++++ kernel-adaptation-n950.config --- kernel-adaptation-n950.config +++ kernel-adaptation-n950.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.39 -# Sun Nov 20 13:26:02 2011 +# Thu Dec 8 23:10:06 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1223,7 +1223,7 @@ # # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_POWER_SUPPLY_DEBUG=y # CONFIG_PDA_POWER is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set @@ -1621,7 +1621,9 @@ CONFIG_USB_G_NOKIA=m # CONFIG_USB_G_MTP is not set CONFIG_USB_G_SOFTUPD=m -# CONFIG_USB_G_MULTI is not set +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_RNDIS=y +# CONFIG_USB_G_MULTI_CDC is not set # # OTG and related infrastructure ++++++ series --- series +++ series @@ -115,3 +115,6 @@ # Initramfs hack 0106-initramfs-hack-to-ignore-junk-data-in-decompression.patch + +# Charging +0001-fix-power-draw-for-g_multi.patch
