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/7745 Thank You, philippedeswert [This message was auto-generated] --- Request # 7745: Messages from BOSS: State: review at 2013-01-25T22:48:23 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : 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:philippedeswert:branches:CE:Adaptation:N950-N9 / kernel-adaptation-n950 -> CE:Adaptation:N950-N9 / kernel-adaptation-n950 changes files: -------------- --- kernel-adaptation-n950.changes +++ kernel-adaptation-n950.changes @@ -0,0 +1,3 @@ +* Fri Jan 25 2013 Philippe De Swert <[email protected]> - 2.6.32.20130125.1 +- Set CONFIG_USB_GADGET_VBUS_DRAW to 500 to allow for usb charging without g_nokia + old: ---- kernel-n9-2.6.32.20121810.5.tar.bz2 new: ---- kernel-n9-2.6.32.20130125.1.tar.bz2 spec files: ----------- --- kernel-adaptation-n950-debug.spec +++ kernel-adaptation-n950-debug.spec @@ -1,6 +1,6 @@ Name: kernel-adaptation-n950-debug Summary: Kernel Adaptation for n950 -Version: 2.6.32.20121810.5 +Version: 2.6.32.20130125.1 Release: 1 Group: Kernel/Linux Kernel License: GPLv2 @@ -50,7 +50,7 @@ cp %{SOURCE1} ./.config # make sure EXTRAVERSION says what we want it to say -perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20121810.5-n950-debug/" Makefile +perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20130125.1-n950-debug/" Makefile # Verify this spec is using the latest template version /usr/bin/mer_verify_kernel_spec 1 --fatal-if-old --- kernel-adaptation-n950.spec +++ kernel-adaptation-n950.spec @@ -1,6 +1,6 @@ Name: kernel-adaptation-n950 Summary: Kernel Adaptation for n950 -Version: 2.6.32.20121810.5 +Version: 2.6.32.20130125.1 Release: 1 Group: Kernel/Linux Kernel License: GPLv2 @@ -50,7 +50,7 @@ cp %{SOURCE1} ./.config # make sure EXTRAVERSION says what we want it to say -perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20121810.5-n950/" Makefile +perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20130125.1-n950/" Makefile # Verify this spec is using the latest template version /usr/bin/mer_verify_kernel_spec 1 --fatal-if-old other changes: -------------- ++++++ generate-spec.sh --- generate-spec.sh +++ generate-spec.sh @@ -3,7 +3,7 @@ DEBUG_SUFFIX=n950-debug SUFFIX=n950 HW=n950 -EXTRA=20121810.5 +EXTRA=20130125.1 sed -e "s/SUFFIX/${SUFFIX}/" \ -e "s/HARDWARE/${HW}/" \ ++++++ kernel-adaptation-n950-debug.config --- kernel-adaptation-n950-debug.config +++ kernel-adaptation-n950-debug.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.54 -# Sun Oct 28 22:33:46 2012 +# Linux kernel version: 2.6.32-1-n950 +# Sun Aug 26 10:13:49 2012 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -30,7 +30,6 @@ # General setup # CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN=y CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -49,7 +48,10 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set -# CONFIG_TASKSTATS is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_AUDIT=y # @@ -61,8 +63,7 @@ CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set @@ -98,7 +99,7 @@ CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -701,7 +702,7 @@ # CONFIG_MAC80211_DEBUG_COUNTERS is not set # CONFIG_WIMAX is not set CONFIG_RFKILL=y -CONFIG_RFKILL_INPUT=y +# CONFIG_RFKILL_INPUT is not set # CONFIG_NET_9P is not set # @@ -832,7 +833,6 @@ # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MG_DISK is not set -# CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y # CONFIG_ICS932S401 is not set CONFIG_OMAP_SDTI=y @@ -913,20 +913,6 @@ # CONFIG_DM_MULTIPATH is not set # CONFIG_DM_DELAY is not set # CONFIG_DM_UEVENT is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# You can enable one or both FireWire driver stacks. -# - -# -# See the help texts for more information. -# -# CONFIG_FIREWIRE is not set -# CONFIG_IEEE1394 is not set CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set @@ -1241,7 +1227,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 @@ -1492,8 +1478,8 @@ # CONFIG_OMAP2_DSS_USE_DSI_PLL is not set CONFIG_OMAP2_DSS_FAKE_VSYNC=y CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 -CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y -CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y +# CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET is not set +# CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET is not set CONFIG_FB_OMAP2=y CONFIG_FB_OMAP2_DEBUG_SUPPORT=y CONFIG_FB_OMAP2_NUM_FBS=3 @@ -1601,7 +1587,7 @@ # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set @@ -1628,8 +1614,7 @@ CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_ETH_EEM is not set -CONFIG_USB_G_NCM=m -CONFIG_USB_GADGETFS=m +# CONFIG_USB_GADGETFS is not set CONFIG_USB_FUNCTIONFS=m # CONFIG_USB_FUNCTIONFS_ETH is not set # CONFIG_USB_FUNCTIONFS_RNDIS is not set @@ -1698,12 +1683,10 @@ # # CONFIG_LEDS_TRIGGERS is not set # CONFIG_ACCESSIBILITY is not set -# CONFIG_INFINIBAND is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_DEBUG=y +# CONFIG_RTC_HCTOSYS is not set +# CONFIG_RTC_DEBUG is not set # # RTC interfaces @@ -1727,7 +1710,7 @@ # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set -CONFIG_RTC_DRV_TWL4030=y +CONFIG_RTC_DRV_TWL4030=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8581 is not set @@ -1770,38 +1753,7 @@ # # TI VLYNQ # -CONFIG_STAGING=y -# CONFIG_STAGING_EXCLUDE_BUILD is not set -# CONFIG_ECHO is not set - -# -# Android -# -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -# CONFIG_ANDROID_LOGGER is not set -# CONFIG_ANDROID_RAM_CONSOLE is not set -CONFIG_ANDROID_TIMED_OUTPUT=y -# CONFIG_ANDROID_TIMED_GPIO is not set -# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set - -# -# Qualcomm MSM Camera And Video -# - -# -# Camera Sensor Selection -# -# CONFIG_INPUT_GPIO is not set -# CONFIG_DST is not set -# CONFIG_POHMELFS is not set -# CONFIG_PLAN9AUTH is not set - -# -# RAR Register Driver -# -# CONFIG_RAR_REGISTER is not set -# CONFIG_IIO is not set +# CONFIG_STAGING is not set CONFIG_MPU_BRIDGE=m CONFIG_BRIDGE_DVFS=y CONFIG_BRIDGE_MEMPOOL_SIZE=0x600000 @@ -1893,7 +1845,6 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -# CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set CONFIG_MISC_FILESYSTEMS=y @@ -2027,50 +1978,37 @@ CONFIG_DEBUG_FS=y (100 more lines skipped) ++++++ kernel-adaptation-n950.config --- kernel-adaptation-n950.config +++ kernel-adaptation-n950.config @@ -1043,7 +1043,7 @@ # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set -CONFIG_KEYBOARD_TWL4030=m +CONFIG_KEYBOARD_TWL4030=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set @@ -1080,7 +1080,7 @@ # CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set -CONFIG_INPUT_TWL4030_PWRBUTTON=m +CONFIG_INPUT_TWL4030_PWRBUTTON=y CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_ECI=y @@ -1350,7 +1350,7 @@ CONFIG_TWL4030_POWER=y CONFIG_TWL4030_CODEC=y CONFIG_TWL4030_MADC=y -CONFIG_TWL5031_ACI=m +CONFIG_TWL5031_ACI=y CONFIG_WL1273_CORE=y # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set @@ -1572,7 +1572,7 @@ # # CONFIG_HID_APPLE is not set # CONFIG_HID_WACOM is not set -CONFIG_HID_TWL4030_VIBRA=m +CONFIG_HID_TWL4030_VIBRA=y CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -1602,7 +1602,7 @@ # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set ++++++ kernel-n9-2.6.32.20121810.5.tar.bz2 -> kernel-n9-2.6.32.20130125.1.tar.bz2 --- arch/arm/mm/proc-v7.S +++ arch/arm/mm/proc-v7.S @@ -41,10 +41,6 @@ #endif ENTRY(cpu_v7_proc_init) - mrc p15, 0, r0, c1, c0, 1 @ aux ctrl register - orr r0, r0, #0x2 @ L2EN - mcr p15, 0, r0, c1, c0, 1 @ enable L2 cache - mov pc, lr ENDPROC(cpu_v7_proc_init) --- drivers/i2c/busses/i2c-omap.c +++ drivers/i2c/busses/i2c-omap.c @@ -1032,8 +1032,8 @@ /* calculate wakeup latency constraint for MPU */ if (dev->set_mpu_wkup_lat != NULL) - dev->latency = min(100, (1000000 * dev->fifo_size) / - (1000 * speed / 8)); + dev->latency = (1000000 * dev->fifo_size) / + (1000 * speed / 8); } /* reset ASAP, clearing any IRQs */ --- drivers/input/ff-memless.c +++ drivers/input/ff-memless.c @@ -38,7 +38,7 @@ MODULE_DESCRIPTION("Force feedback support for memoryless devices"); /* Number of effects handled with memoryless devices */ -#define FF_MEMLESS_EFFECTS 64 +#define FF_MEMLESS_EFFECTS 16 /* Envelope update interval in ms */ #define FF_ENVELOPE_INTERVAL 50
