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/7422 Thank You, kjokinie [This message was auto-generated] --- Request # 7422: Messages from BOSS: State: new at 2012-11-26T16:39:41 by sage Reviews: accepted by bossbot : Prechecks succeeded. accepted by CE-maintainers (sage) : ok Changes: submit: home:kjokinie:branches:Mer:MDS:Core:armv7hl / kernel-adaptation-n950 -> CE:Adaptation:N950-N9 / kernel-adaptation-n950 changes files: -------------- --- kernel-adaptation-n950.changes +++ kernel-adaptation-n950.changes @@ -0,0 +1,4 @@ +* Mon Nov 19 2012 Kalle Jokiniemi <[email protected]> - 2.6.32.20121810.4 +- Increased amount of supported vibra effects to 64 +- Fixed perf issue in i2c by capping mpu wake up latency constraints to 100us + old: ---- kernel-n9-2.6.32.20121810.2.tar.bz2 new: ---- kernel-n9-2.6.32.20121810.4.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.2 +Version: 2.6.32.20121810.4 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.2-n950-debug/" Makefile +perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20121810.4-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.2 +Version: 2.6.32.20121810.4 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.2-n950/" Makefile +perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .20121810.4-n950/" Makefile # Verify this spec is using the latest template version /usr/bin/mer_verify_kernel_spec 1 --fatal-if-old other changes: -------------- ++++++ README --- README +++ README @@ -12,7 +12,7 @@ The kernel tarball generation (using git-archive): -git archive --format=tar --prefix=kernel-n9-2.6.32.YYYYMMDD.X nemo-n9-2.6.32.YYYYMMDD.X |bzip2 > kernel-n9-2.6.32.YYYYMMDD.X.tar.bz2 +git archive --format=tar --prefix=kernel-n9-2.6.32.YYYYMMDD.X/ nemo-n9-2.6.32.YYYYMMDD.X |bzip2 > kernel-n9-2.6.32.YYYYMMDD.X.tar.bz2 Spec file generation: - Generate spec files from kernel-adaptation-n950.spec.tpl using generate-spec.sh. ++++++ generate-spec.sh --- generate-spec.sh +++ generate-spec.sh @@ -3,7 +3,7 @@ DEBUG_SUFFIX=n950-debug SUFFIX=n950 HW=n950 -EXTRA=20121810.2 +EXTRA=20121810.4 sed -e "s/SUFFIX/${SUFFIX}/" \ -e "s/HARDWARE/${HW}/" \ ++++++ kernel-n9-2.6.32.20121810.2.tar.bz2 -> kernel-n9-2.6.32.20121810.4.tar.bz2 --- 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 = (1000000 * dev->fifo_size) / - (1000 * speed / 8); + dev->latency = min(100, (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 16 +#define FF_MEMLESS_EFFECTS 64 /* Envelope update interval in ms */ #define FF_ENVELOPE_INTERVAL 50
