Well the pkg isn¹t building, so you need to fix it please...should be easy...
Also please check that your pkg builds before you submit it, as you can see, it fails in devel:kernel/kernel-mid for the same reason... rs On 12/7/10 5:42 PM, "Mai, Leonard" <[email protected]> wrote: > Helo Rolla, > > I'll keep this in mind and make sure to use 'vc' to reduce this kind of > mistake. Do you expect me to fix this issue and resubmit it? > > The kernel-mid project is located at devel:kernel -> kernel-mid > > Thanks > Leo > > -----Original Message----- > From: Selbak, Rolla N > Sent: Tuesday, December 07, 2010 4:35 PM > To: Mai, Leonard; [email protected]; [email protected] > Subject: Re: [meego-packaging] [meego-commits] 10667: Changes to > Trunk:Testing/kernel-mid > > Hello Leonard, > > Please next time don't manually change the .changes, you can use the > 'vc' > command to insert the correcty date, time, email, etc. > > This mis-spelling caused the pkg to fail (Dec, not Dev): > >> --- kernel.changes >> +++ kernel.changes >> @@ -0,0 +1,3 @@ >> +* Tue Dev 07 2010 Leonard D Mai <[email protected]> - 2.6.35.3 >> +- enable atmel multitouch > > Also where is the devel:kernel-mid project? > > I don't see it anymore... > > Thanks, > > rs > > > > On 12/7/10 11:49 AM, "Mai, Leonard" <[email protected]> wrote: > >> Yes it is the same. >> >> -----Original Message----- >> From: [email protected] >> [mailto:[email protected]] On Behalf Of Selbak, Rolla > N >> Sent: Tuesday, December 07, 2010 11:42 AM >> To: [email protected]; [email protected] >> Subject: Re: [meego-packaging] [meego-commits] 10667: Changes to >> Trunk:Testing/kernel-mid >> >> Is this the same as the 10668 commit from ldmai? Looks like it... >> >> rs >> >> >> On 12/7/10 11:26 AM, "Arjan van de Ven" <[email protected]> >> wrote: >> >> Hi, >> I have made the following changes to kernel-mid in project >> Trunk:Testing. Please review and accept ASAP. >> >> Thank You, >> Arjan van de Ven >> >> [This message was auto-generated] >> >> --- >> >> Request #10667: >> >> submit: devel:kernel/kernel-mid(r11) -> Trunk:Testing/kernel-mid >> >> >> Message: >> enable atmel multitouch >> >> State: new 2010-12-07T11:26:42 arjan >> Comment: None >> >> >> >> changes files: >> -------------- >> --- kernel.changes >> +++ kernel.changes >> @@ -0,0 +1,3 @@ >> +* Tue Dev 07 2010 Leonard D Mai <[email protected]> - 2.6.35.3 >> +- enable atmel multitouch >> + >> >> new: >> ---- >> linux-2.6.35-atmel-multitouch.patch >> >> spec files: >> ----------- >> --- kernel-ivi.spec >> +++ kernel-ivi.spec >> @@ -496,57 +496,58 @@ >> Patch425: linux-2.6.36-atmel-mrst-integration.patch >> Patch426: linux-2.6.36-atmel-2.patch >> Patch427: linux-2.6.36-atmel-3.patch >> +Patch428: linux-2.6.35-atmel-multitouch.patch >> >> -Patch428: linux-2.6.36-cyttsp-add-sTMA3406.patch >> -Patch429: linux-2.6.36-cyttsp-mrst-c.patch >> -Patch430: linux-2.6.36-cyttsp-low-power-mode.patch >> +Patch429: linux-2.6.36-cyttsp-add-sTMA3406.patch >> +Patch430: linux-2.6.36-cyttsp-mrst-c.patch >> +Patch431: linux-2.6.36-cyttsp-low-power-mode.patch >> >> # Various sensors connected to i2c >> -Patch431: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -Patch432: linux-2.6.35-lednames.patch >> -Patch433: linux-2.6.36-mfd-led-flash.patch >> -Patch434: linux-2.6.36-apds9802als-runtime-pm.patch >> -Patch435: linux-2.6.36-ak8974-add-runtime-pm.patch >> -Patch436: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> -Patch437: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> -Patch438: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> -Patch439: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> - >> - >> -Patch440: linux-2.6.37-APDS990X-upstream.patch >> -Patch441: linux-2.6.37-APDS990X-backport.patch >> -Patch442: linux-2.6.37-APDS990X-driver-name.patch >> -Patch443: linux-2.6.37-APDS990X-resource-setup.patch >> -Patch444: linux-2.6.37-APDS990X-mrst-c-part.patch >> +Patch432: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> +Patch433: linux-2.6.35-lednames.patch >> +Patch434: linux-2.6.36-mfd-led-flash.patch >> +Patch435: linux-2.6.36-apds9802als-runtime-pm.patch >> +Patch436: linux-2.6.36-ak8974-add-runtime-pm.patch >> +Patch437: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +Patch438: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +Patch439: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +Patch440: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> + >> + >> +Patch441: linux-2.6.37-APDS990X-upstream.patch >> +Patch442: linux-2.6.37-APDS990X-backport.patch >> +Patch443: linux-2.6.37-APDS990X-driver-name.patch >> +Patch444: linux-2.6.37-APDS990X-resource-setup.patch >> +Patch445: linux-2.6.37-APDS990X-mrst-c-part.patch >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> -Patch445: linux-2.6.36-broadcom-gps.patch >> -Patch446: linux-2.6.36-nfc-NXP-PN544.patch >> +Patch446: linux-2.6.36-broadcom-gps.patch >> +Patch447: linux-2.6.36-nfc-NXP-PN544.patch >> >> -Patch447: linux-2.6.35-lis-pm-init-fix.patch >> -Patch448: linux-2.6.36-lis-single-click.patch >> -Patch449: linux-2.6.36-lis3-6d-support.patch >> +Patch448: linux-2.6.35-lis-pm-init-fix.patch >> +Patch449: linux-2.6.36-lis-single-click.patch >> +Patch450: linux-2.6.36-lis3-6d-support.patch >> >> # Various devices connected to SPI >> -Patch450: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> +Patch451: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> >> >> # wifi/bluetooth connectivity >> -Patch451: linux-2.6.36-wl1271-add-platform_data.patch >> -Patch452: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> -Patch453: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +Patch452: linux-2.6.36-wl1271-add-platform_data.patch >> +Patch453: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> +Patch454: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> >> >> >> # other drivers >> -Patch454: linux-2.6.36-medfield-battery.patch >> -Patch455: linux-2.6.35-keycodes-fixup.patch >> -Patch456: linux-2.6.35-backlight-fixup.patch >> -Patch457: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +Patch455: linux-2.6.36-medfield-battery.patch >> +Patch456: linux-2.6.35-keycodes-fixup.patch >> +Patch457: linux-2.6.35-backlight-fixup.patch >> +Patch458: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> >> -Patch458: 0001-Medfield_Current_Monitoring_Driver.patch >> -Patch459: 0001-Medfield_Thermal_Driver_Rework.patch >> +Patch459: 0001-Medfield_Current_Monitoring_Driver.patch >> +Patch460: 0001-Medfield_Thermal_Driver_Rework.patch >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> @@ -1429,89 +1430,91 @@ >> %patch426 -p1 >> # linux-2.6.36-atmel-3.patch >> %patch427 -p1 >> +# linux-2.6.35-atmel-multitouch.patch >> +%patch428 -p1 >> >> # linux-2.6.36-cyttsp-add-sTMA3406.patch >> -%patch428 -p1 >> -# linux-2.6.36-cyttsp-mrst-c.patch >> %patch429 -p1 >> -# linux-2.6.36-cyttsp-low-power-mode.patch >> +# linux-2.6.36-cyttsp-mrst-c.patch >> %patch430 -p1 >> +# linux-2.6.36-cyttsp-low-power-mode.patch >> +%patch431 -p1 >> >> # Various sensors connected to i2c >> # linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -%patch431 -p1 >> -# linux-2.6.35-lednames.patch >> %patch432 -p1 >> -# linux-2.6.36-mfd-led-flash.patch >> +# linux-2.6.35-lednames.patch >> %patch433 -p1 >> -# linux-2.6.36-apds9802als-runtime-pm.patch >> +# linux-2.6.36-mfd-led-flash.patch >> %patch434 -p1 >> -# linux-2.6.36-ak8974-add-runtime-pm.patch >> +# linux-2.6.36-apds9802als-runtime-pm.patch >> %patch435 -p1 >> -# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +# linux-2.6.36-ak8974-add-runtime-pm.patch >> %patch436 -p1 >> -# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> %patch437 -p1 >> -# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> %patch438 -p1 >> -# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> %patch439 -p1 >> +# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +%patch440 -p1 >> >> >> # linux-2.6.37-APDS990X-upstream.patch >> -%patch440 -p1 >> -# linux-2.6.37-APDS990X-backport.patch >> %patch441 -p1 >> -# linux-2.6.37-APDS990X-driver-name.patch >> +# linux-2.6.37-APDS990X-backport.patch >> %patch442 -p1 >> -# linux-2.6.37-APDS990X-resource-setup.patch >> +# linux-2.6.37-APDS990X-driver-name.patch >> %patch443 -p1 >> -# linux-2.6.37-APDS990X-mrst-c-part.patch >> +# linux-2.6.37-APDS990X-resource-setup.patch >> %patch444 -p1 >> +# linux-2.6.37-APDS990X-mrst-c-part.patch >> +%patch445 -p1 >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> # linux-2.6.36-broadcom-gps.patch >> -%patch445 -p1 >> -# linux-2.6.36-nfc-NXP-PN544.patch >> %patch446 -p1 >> +# linux-2.6.36-nfc-NXP-PN544.patch >> +%patch447 -p1 >> >> # linux-2.6.35-lis-pm-init-fix.patch >> -%patch447 -p1 >> -# linux-2.6.36-lis-single-click.patch >> %patch448 -p1 >> -# linux-2.6.36-lis3-6d-support.patch >> +# linux-2.6.36-lis-single-click.patch >> %patch449 -p1 >> +# linux-2.6.36-lis3-6d-support.patch >> +%patch450 -p1 >> >> # Various devices connected to SPI >> # linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> -%patch450 -p1 >> +%patch451 -p1 >> >> >> # wifi/bluetooth connectivity >> # linux-2.6.36-wl1271-add-platform_data.patch >> -%patch451 -p1 >> -# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch452 -p1 >> -# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch453 -p1 >> +# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +%patch454 -p1 >> >> >> >> # other drivers >> # linux-2.6.36-medfield-battery.patch >> -%patch454 -p1 >> -# linux-2.6.35-keycodes-fixup.patch >> %patch455 -p1 >> -# linux-2.6.35-backlight-fixup.patch >> +# linux-2.6.35-keycodes-fixup.patch >> %patch456 -p1 >> -# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +# linux-2.6.35-backlight-fixup.patch >> %patch457 -p1 >> +# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +%patch458 -p1 >> >> # 0001-Medfield_Current_Monitoring_Driver.patch >> -%patch458 -p1 >> -# 0001-Medfield_Thermal_Driver_Rework.patch >> %patch459 -p1 >> +# 0001-Medfield_Thermal_Driver_Rework.patch >> +%patch460 -p1 >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> --- kernel-mid.spec >> +++ kernel-mid.spec >> @@ -497,57 +497,58 @@ >> Patch425: linux-2.6.36-atmel-mrst-integration.patch >> Patch426: linux-2.6.36-atmel-2.patch >> Patch427: linux-2.6.36-atmel-3.patch >> +Patch428: linux-2.6.35-atmel-multitouch.patch >> >> -Patch428: linux-2.6.36-cyttsp-add-sTMA3406.patch >> -Patch429: linux-2.6.36-cyttsp-mrst-c.patch >> -Patch430: linux-2.6.36-cyttsp-low-power-mode.patch >> +Patch429: linux-2.6.36-cyttsp-add-sTMA3406.patch >> +Patch430: linux-2.6.36-cyttsp-mrst-c.patch >> +Patch431: linux-2.6.36-cyttsp-low-power-mode.patch >> >> # Various sensors connected to i2c >> -Patch431: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -Patch432: linux-2.6.35-lednames.patch >> -Patch433: linux-2.6.36-mfd-led-flash.patch >> -Patch434: linux-2.6.36-apds9802als-runtime-pm.patch >> -Patch435: linux-2.6.36-ak8974-add-runtime-pm.patch >> -Patch436: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> -Patch437: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> -Patch438: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> -Patch439: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> - >> - >> -Patch440: linux-2.6.37-APDS990X-upstream.patch >> -Patch441: linux-2.6.37-APDS990X-backport.patch >> -Patch442: linux-2.6.37-APDS990X-driver-name.patch >> -Patch443: linux-2.6.37-APDS990X-resource-setup.patch >> -Patch444: linux-2.6.37-APDS990X-mrst-c-part.patch >> +Patch432: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> +Patch433: linux-2.6.35-lednames.patch >> +Patch434: linux-2.6.36-mfd-led-flash.patch >> +Patch435: linux-2.6.36-apds9802als-runtime-pm.patch >> +Patch436: linux-2.6.36-ak8974-add-runtime-pm.patch >> +Patch437: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +Patch438: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +Patch439: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +Patch440: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> + >> + >> +Patch441: linux-2.6.37-APDS990X-upstream.patch >> +Patch442: linux-2.6.37-APDS990X-backport.patch >> +Patch443: linux-2.6.37-APDS990X-driver-name.patch >> +Patch444: linux-2.6.37-APDS990X-resource-setup.patch >> +Patch445: linux-2.6.37-APDS990X-mrst-c-part.patch >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> -Patch445: linux-2.6.36-broadcom-gps.patch >> -Patch446: linux-2.6.36-nfc-NXP-PN544.patch >> +Patch446: linux-2.6.36-broadcom-gps.patch >> +Patch447: linux-2.6.36-nfc-NXP-PN544.patch >> >> -Patch447: linux-2.6.35-lis-pm-init-fix.patch >> -Patch448: linux-2.6.36-lis-single-click.patch >> -Patch449: linux-2.6.36-lis3-6d-support.patch >> +Patch448: linux-2.6.35-lis-pm-init-fix.patch >> +Patch449: linux-2.6.36-lis-single-click.patch >> +Patch450: linux-2.6.36-lis3-6d-support.patch >> >> # Various devices connected to SPI >> -Patch450: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> +Patch451: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> >> >> # wifi/bluetooth connectivity >> -Patch451: linux-2.6.36-wl1271-add-platform_data.patch >> -Patch452: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> -Patch453: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +Patch452: linux-2.6.36-wl1271-add-platform_data.patch >> +Patch453: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> +Patch454: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> >> >> >> # other drivers >> -Patch454: linux-2.6.36-medfield-battery.patch >> -Patch455: linux-2.6.35-keycodes-fixup.patch >> -Patch456: linux-2.6.35-backlight-fixup.patch >> -Patch457: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +Patch455: linux-2.6.36-medfield-battery.patch >> +Patch456: linux-2.6.35-keycodes-fixup.patch >> +Patch457: linux-2.6.35-backlight-fixup.patch >> +Patch458: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> >> -Patch458: 0001-Medfield_Current_Monitoring_Driver.patch >> -Patch459: 0001-Medfield_Thermal_Driver_Rework.patch >> +Patch459: 0001-Medfield_Current_Monitoring_Driver.patch >> +Patch460: 0001-Medfield_Thermal_Driver_Rework.patch >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> @@ -1430,89 +1431,91 @@ >> %patch426 -p1 >> # linux-2.6.36-atmel-3.patch >> %patch427 -p1 >> +# linux-2.6.35-atmel-multitouch.patch >> +%patch428 -p1 >> >> # linux-2.6.36-cyttsp-add-sTMA3406.patch >> -%patch428 -p1 >> -# linux-2.6.36-cyttsp-mrst-c.patch >> %patch429 -p1 >> -# linux-2.6.36-cyttsp-low-power-mode.patch >> +# linux-2.6.36-cyttsp-mrst-c.patch >> %patch430 -p1 >> +# linux-2.6.36-cyttsp-low-power-mode.patch >> +%patch431 -p1 >> >> # Various sensors connected to i2c >> # linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -%patch431 -p1 >> -# linux-2.6.35-lednames.patch >> %patch432 -p1 >> -# linux-2.6.36-mfd-led-flash.patch >> +# linux-2.6.35-lednames.patch >> %patch433 -p1 >> -# linux-2.6.36-apds9802als-runtime-pm.patch >> +# linux-2.6.36-mfd-led-flash.patch >> %patch434 -p1 >> -# linux-2.6.36-ak8974-add-runtime-pm.patch >> +# linux-2.6.36-apds9802als-runtime-pm.patch >> %patch435 -p1 >> -# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +# linux-2.6.36-ak8974-add-runtime-pm.patch >> %patch436 -p1 >> -# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> %patch437 -p1 >> -# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> %patch438 -p1 >> -# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> %patch439 -p1 >> +# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +%patch440 -p1 >> >> >> # linux-2.6.37-APDS990X-upstream.patch >> -%patch440 -p1 >> -# linux-2.6.37-APDS990X-backport.patch >> %patch441 -p1 >> -# linux-2.6.37-APDS990X-driver-name.patch >> +# linux-2.6.37-APDS990X-backport.patch >> %patch442 -p1 >> -# linux-2.6.37-APDS990X-resource-setup.patch >> +# linux-2.6.37-APDS990X-driver-name.patch >> %patch443 -p1 >> -# linux-2.6.37-APDS990X-mrst-c-part.patch >> +# linux-2.6.37-APDS990X-resource-setup.patch >> %patch444 -p1 >> +# linux-2.6.37-APDS990X-mrst-c-part.patch >> +%patch445 -p1 >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> # linux-2.6.36-broadcom-gps.patch >> -%patch445 -p1 >> -# linux-2.6.36-nfc-NXP-PN544.patch >> %patch446 -p1 >> +# linux-2.6.36-nfc-NXP-PN544.patch >> +%patch447 -p1 >> >> # linux-2.6.35-lis-pm-init-fix.patch >> -%patch447 -p1 >> -# linux-2.6.36-lis-single-click.patch >> %patch448 -p1 >> -# linux-2.6.36-lis3-6d-support.patch >> +# linux-2.6.36-lis-single-click.patch >> %patch449 -p1 >> +# linux-2.6.36-lis3-6d-support.patch >> +%patch450 -p1 >> >> # Various devices connected to SPI >> # linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> -%patch450 -p1 >> +%patch451 -p1 >> >> >> # wifi/bluetooth connectivity >> # linux-2.6.36-wl1271-add-platform_data.patch >> -%patch451 -p1 >> -# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch452 -p1 >> -# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch453 -p1 >> +# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +%patch454 -p1 >> >> >> >> # other drivers >> # linux-2.6.36-medfield-battery.patch >> -%patch454 -p1 >> -# linux-2.6.35-keycodes-fixup.patch >> %patch455 -p1 >> -# linux-2.6.35-backlight-fixup.patch >> +# linux-2.6.35-keycodes-fixup.patch >> %patch456 -p1 >> -# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +# linux-2.6.35-backlight-fixup.patch >> %patch457 -p1 >> +# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +%patch458 -p1 >> >> # 0001-Medfield_Current_Monitoring_Driver.patch >> -%patch458 -p1 >> -# 0001-Medfield_Thermal_Driver_Rework.patch >> %patch459 -p1 >> +# 0001-Medfield_Thermal_Driver_Rework.patch >> +%patch460 -p1 >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> --- kernel-n900.spec >> +++ kernel-n900.spec >> @@ -496,57 +496,58 @@ >> Patch425: linux-2.6.36-atmel-mrst-integration.patch >> Patch426: linux-2.6.36-atmel-2.patch >> Patch427: linux-2.6.36-atmel-3.patch >> +Patch428: linux-2.6.35-atmel-multitouch.patch >> >> -Patch428: linux-2.6.36-cyttsp-add-sTMA3406.patch >> -Patch429: linux-2.6.36-cyttsp-mrst-c.patch >> -Patch430: linux-2.6.36-cyttsp-low-power-mode.patch >> +Patch429: linux-2.6.36-cyttsp-add-sTMA3406.patch >> +Patch430: linux-2.6.36-cyttsp-mrst-c.patch >> +Patch431: linux-2.6.36-cyttsp-low-power-mode.patch >> >> # Various sensors connected to i2c >> -Patch431: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -Patch432: linux-2.6.35-lednames.patch >> -Patch433: linux-2.6.36-mfd-led-flash.patch >> -Patch434: linux-2.6.36-apds9802als-runtime-pm.patch >> -Patch435: linux-2.6.36-ak8974-add-runtime-pm.patch >> -Patch436: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> -Patch437: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> -Patch438: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> -Patch439: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> - >> - >> -Patch440: linux-2.6.37-APDS990X-upstream.patch >> -Patch441: linux-2.6.37-APDS990X-backport.patch >> -Patch442: linux-2.6.37-APDS990X-driver-name.patch >> -Patch443: linux-2.6.37-APDS990X-resource-setup.patch >> -Patch444: linux-2.6.37-APDS990X-mrst-c-part.patch >> +Patch432: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> +Patch433: linux-2.6.35-lednames.patch >> +Patch434: linux-2.6.36-mfd-led-flash.patch >> +Patch435: linux-2.6.36-apds9802als-runtime-pm.patch >> +Patch436: linux-2.6.36-ak8974-add-runtime-pm.patch >> +Patch437: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +Patch438: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +Patch439: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +Patch440: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> + >> + >> +Patch441: linux-2.6.37-APDS990X-upstream.patch >> +Patch442: linux-2.6.37-APDS990X-backport.patch >> +Patch443: linux-2.6.37-APDS990X-driver-name.patch >> +Patch444: linux-2.6.37-APDS990X-resource-setup.patch >> +Patch445: linux-2.6.37-APDS990X-mrst-c-part.patch >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> -Patch445: linux-2.6.36-broadcom-gps.patch >> -Patch446: linux-2.6.36-nfc-NXP-PN544.patch >> +Patch446: linux-2.6.36-broadcom-gps.patch >> +Patch447: linux-2.6.36-nfc-NXP-PN544.patch >> >> -Patch447: linux-2.6.35-lis-pm-init-fix.patch >> -Patch448: linux-2.6.36-lis-single-click.patch >> -Patch449: linux-2.6.36-lis3-6d-support.patch >> +Patch448: linux-2.6.35-lis-pm-init-fix.patch >> +Patch449: linux-2.6.36-lis-single-click.patch >> +Patch450: linux-2.6.36-lis3-6d-support.patch >> >> # Various devices connected to SPI >> -Patch450: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> +Patch451: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> >> >> # wifi/bluetooth connectivity >> -Patch451: linux-2.6.36-wl1271-add-platform_data.patch >> -Patch452: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> -Patch453: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +Patch452: linux-2.6.36-wl1271-add-platform_data.patch >> +Patch453: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> +Patch454: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> >> >> >> # other drivers >> -Patch454: linux-2.6.36-medfield-battery.patch >> -Patch455: linux-2.6.35-keycodes-fixup.patch >> -Patch456: linux-2.6.35-backlight-fixup.patch >> -Patch457: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +Patch455: linux-2.6.36-medfield-battery.patch >> +Patch456: linux-2.6.35-keycodes-fixup.patch >> +Patch457: linux-2.6.35-backlight-fixup.patch >> +Patch458: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> >> -Patch458: 0001-Medfield_Current_Monitoring_Driver.patch >> -Patch459: 0001-Medfield_Thermal_Driver_Rework.patch >> +Patch459: 0001-Medfield_Current_Monitoring_Driver.patch >> +Patch460: 0001-Medfield_Thermal_Driver_Rework.patch >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> @@ -1429,89 +1430,91 @@ >> %patch426 -p1 >> # linux-2.6.36-atmel-3.patch >> %patch427 -p1 >> +# linux-2.6.35-atmel-multitouch.patch >> +%patch428 -p1 >> >> # linux-2.6.36-cyttsp-add-sTMA3406.patch >> -%patch428 -p1 >> -# linux-2.6.36-cyttsp-mrst-c.patch >> %patch429 -p1 >> -# linux-2.6.36-cyttsp-low-power-mode.patch >> +# linux-2.6.36-cyttsp-mrst-c.patch >> %patch430 -p1 >> +# linux-2.6.36-cyttsp-low-power-mode.patch >> +%patch431 -p1 >> >> # Various sensors connected to i2c >> # linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -%patch431 -p1 >> -# linux-2.6.35-lednames.patch >> %patch432 -p1 >> -# linux-2.6.36-mfd-led-flash.patch >> +# linux-2.6.35-lednames.patch >> %patch433 -p1 >> -# linux-2.6.36-apds9802als-runtime-pm.patch >> +# linux-2.6.36-mfd-led-flash.patch >> %patch434 -p1 >> -# linux-2.6.36-ak8974-add-runtime-pm.patch >> +# linux-2.6.36-apds9802als-runtime-pm.patch >> %patch435 -p1 >> -# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +# linux-2.6.36-ak8974-add-runtime-pm.patch >> %patch436 -p1 >> -# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> %patch437 -p1 >> -# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> %patch438 -p1 >> -# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> %patch439 -p1 >> +# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +%patch440 -p1 >> >> >> # linux-2.6.37-APDS990X-upstream.patch >> -%patch440 -p1 >> -# linux-2.6.37-APDS990X-backport.patch >> %patch441 -p1 >> -# linux-2.6.37-APDS990X-driver-name.patch >> +# linux-2.6.37-APDS990X-backport.patch >> %patch442 -p1 >> -# linux-2.6.37-APDS990X-resource-setup.patch >> +# linux-2.6.37-APDS990X-driver-name.patch >> %patch443 -p1 >> -# linux-2.6.37-APDS990X-mrst-c-part.patch >> +# linux-2.6.37-APDS990X-resource-setup.patch >> %patch444 -p1 >> +# linux-2.6.37-APDS990X-mrst-c-part.patch >> +%patch445 -p1 >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> # linux-2.6.36-broadcom-gps.patch >> -%patch445 -p1 >> -# linux-2.6.36-nfc-NXP-PN544.patch >> %patch446 -p1 >> +# linux-2.6.36-nfc-NXP-PN544.patch >> +%patch447 -p1 >> >> # linux-2.6.35-lis-pm-init-fix.patch >> -%patch447 -p1 >> -# linux-2.6.36-lis-single-click.patch >> %patch448 -p1 >> -# linux-2.6.36-lis3-6d-support.patch >> +# linux-2.6.36-lis-single-click.patch >> %patch449 -p1 >> +# linux-2.6.36-lis3-6d-support.patch >> +%patch450 -p1 >> >> # Various devices connected to SPI >> # linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> -%patch450 -p1 >> +%patch451 -p1 >> >> >> # wifi/bluetooth connectivity >> # linux-2.6.36-wl1271-add-platform_data.patch >> -%patch451 -p1 >> -# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch452 -p1 >> -# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch453 -p1 >> +# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +%patch454 -p1 >> >> >> >> # other drivers >> # linux-2.6.36-medfield-battery.patch >> -%patch454 -p1 >> -# linux-2.6.35-keycodes-fixup.patch >> %patch455 -p1 >> -# linux-2.6.35-backlight-fixup.patch >> +# linux-2.6.35-keycodes-fixup.patch >> %patch456 -p1 >> -# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +# linux-2.6.35-backlight-fixup.patch >> %patch457 -p1 >> +# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +%patch458 -p1 >> >> # 0001-Medfield_Current_Monitoring_Driver.patch >> -%patch458 -p1 >> -# 0001-Medfield_Thermal_Driver_Rework.patch >> %patch459 -p1 >> +# 0001-Medfield_Thermal_Driver_Rework.patch >> +%patch460 -p1 >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> --- kernel-netbook.spec >> +++ kernel-netbook.spec >> @@ -496,57 +496,58 @@ >> Patch425: linux-2.6.36-atmel-mrst-integration.patch >> Patch426: linux-2.6.36-atmel-2.patch >> Patch427: linux-2.6.36-atmel-3.patch >> +Patch428: linux-2.6.35-atmel-multitouch.patch >> >> -Patch428: linux-2.6.36-cyttsp-add-sTMA3406.patch >> -Patch429: linux-2.6.36-cyttsp-mrst-c.patch >> -Patch430: linux-2.6.36-cyttsp-low-power-mode.patch >> +Patch429: linux-2.6.36-cyttsp-add-sTMA3406.patch >> +Patch430: linux-2.6.36-cyttsp-mrst-c.patch >> +Patch431: linux-2.6.36-cyttsp-low-power-mode.patch >> >> # Various sensors connected to i2c >> -Patch431: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -Patch432: linux-2.6.35-lednames.patch >> -Patch433: linux-2.6.36-mfd-led-flash.patch >> -Patch434: linux-2.6.36-apds9802als-runtime-pm.patch >> -Patch435: linux-2.6.36-ak8974-add-runtime-pm.patch >> -Patch436: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> -Patch437: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> -Patch438: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> -Patch439: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> - >> - >> -Patch440: linux-2.6.37-APDS990X-upstream.patch >> -Patch441: linux-2.6.37-APDS990X-backport.patch >> -Patch442: linux-2.6.37-APDS990X-driver-name.patch >> -Patch443: linux-2.6.37-APDS990X-resource-setup.patch >> -Patch444: linux-2.6.37-APDS990X-mrst-c-part.patch >> +Patch432: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> +Patch433: linux-2.6.35-lednames.patch >> +Patch434: linux-2.6.36-mfd-led-flash.patch >> +Patch435: linux-2.6.36-apds9802als-runtime-pm.patch >> +Patch436: linux-2.6.36-ak8974-add-runtime-pm.patch >> +Patch437: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +Patch438: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +Patch439: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +Patch440: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> + >> + >> +Patch441: linux-2.6.37-APDS990X-upstream.patch >> +Patch442: linux-2.6.37-APDS990X-backport.patch >> +Patch443: linux-2.6.37-APDS990X-driver-name.patch >> +Patch444: linux-2.6.37-APDS990X-resource-setup.patch >> +Patch445: linux-2.6.37-APDS990X-mrst-c-part.patch >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> -Patch445: linux-2.6.36-broadcom-gps.patch >> -Patch446: linux-2.6.36-nfc-NXP-PN544.patch >> +Patch446: linux-2.6.36-broadcom-gps.patch >> +Patch447: linux-2.6.36-nfc-NXP-PN544.patch >> >> -Patch447: linux-2.6.35-lis-pm-init-fix.patch >> -Patch448: linux-2.6.36-lis-single-click.patch >> -Patch449: linux-2.6.36-lis3-6d-support.patch >> +Patch448: linux-2.6.35-lis-pm-init-fix.patch >> +Patch449: linux-2.6.36-lis-single-click.patch >> +Patch450: linux-2.6.36-lis3-6d-support.patch >> >> # Various devices connected to SPI >> -Patch450: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> +Patch451: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> >> >> # wifi/bluetooth connectivity >> -Patch451: linux-2.6.36-wl1271-add-platform_data.patch >> -Patch452: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> -Patch453: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +Patch452: linux-2.6.36-wl1271-add-platform_data.patch >> +Patch453: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> +Patch454: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> >> >> >> # other drivers >> -Patch454: linux-2.6.36-medfield-battery.patch >> -Patch455: linux-2.6.35-keycodes-fixup.patch >> -Patch456: linux-2.6.35-backlight-fixup.patch >> -Patch457: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +Patch455: linux-2.6.36-medfield-battery.patch >> +Patch456: linux-2.6.35-keycodes-fixup.patch >> +Patch457: linux-2.6.35-backlight-fixup.patch >> +Patch458: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> >> -Patch458: 0001-Medfield_Current_Monitoring_Driver.patch >> -Patch459: 0001-Medfield_Thermal_Driver_Rework.patch >> +Patch459: 0001-Medfield_Current_Monitoring_Driver.patch >> +Patch460: 0001-Medfield_Thermal_Driver_Rework.patch >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> @@ -1429,89 +1430,91 @@ >> %patch426 -p1 >> # linux-2.6.36-atmel-3.patch >> %patch427 -p1 >> +# linux-2.6.35-atmel-multitouch.patch >> +%patch428 -p1 >> >> # linux-2.6.36-cyttsp-add-sTMA3406.patch >> -%patch428 -p1 >> -# linux-2.6.36-cyttsp-mrst-c.patch >> %patch429 -p1 >> -# linux-2.6.36-cyttsp-low-power-mode.patch >> +# linux-2.6.36-cyttsp-mrst-c.patch >> %patch430 -p1 >> +# linux-2.6.36-cyttsp-low-power-mode.patch >> +%patch431 -p1 >> >> # Various sensors connected to i2c >> # linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -%patch431 -p1 >> -# linux-2.6.35-lednames.patch >> %patch432 -p1 >> -# linux-2.6.36-mfd-led-flash.patch >> +# linux-2.6.35-lednames.patch >> %patch433 -p1 >> -# linux-2.6.36-apds9802als-runtime-pm.patch >> +# linux-2.6.36-mfd-led-flash.patch >> %patch434 -p1 >> -# linux-2.6.36-ak8974-add-runtime-pm.patch >> +# linux-2.6.36-apds9802als-runtime-pm.patch >> %patch435 -p1 >> -# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +# linux-2.6.36-ak8974-add-runtime-pm.patch >> %patch436 -p1 >> -# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> %patch437 -p1 >> -# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> %patch438 -p1 >> -# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> %patch439 -p1 >> +# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +%patch440 -p1 >> >> >> # linux-2.6.37-APDS990X-upstream.patch >> -%patch440 -p1 >> -# linux-2.6.37-APDS990X-backport.patch >> %patch441 -p1 >> -# linux-2.6.37-APDS990X-driver-name.patch >> +# linux-2.6.37-APDS990X-backport.patch >> %patch442 -p1 >> -# linux-2.6.37-APDS990X-resource-setup.patch >> +# linux-2.6.37-APDS990X-driver-name.patch >> %patch443 -p1 >> -# linux-2.6.37-APDS990X-mrst-c-part.patch >> +# linux-2.6.37-APDS990X-resource-setup.patch >> %patch444 -p1 >> +# linux-2.6.37-APDS990X-mrst-c-part.patch >> +%patch445 -p1 >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> # linux-2.6.36-broadcom-gps.patch >> -%patch445 -p1 >> -# linux-2.6.36-nfc-NXP-PN544.patch >> %patch446 -p1 >> +# linux-2.6.36-nfc-NXP-PN544.patch >> +%patch447 -p1 >> >> # linux-2.6.35-lis-pm-init-fix.patch >> -%patch447 -p1 >> -# linux-2.6.36-lis-single-click.patch >> %patch448 -p1 >> -# linux-2.6.36-lis3-6d-support.patch >> +# linux-2.6.36-lis-single-click.patch >> %patch449 -p1 >> +# linux-2.6.36-lis3-6d-support.patch >> +%patch450 -p1 >> >> # Various devices connected to SPI >> # linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> -%patch450 -p1 >> +%patch451 -p1 >> >> >> # wifi/bluetooth connectivity >> # linux-2.6.36-wl1271-add-platform_data.patch >> -%patch451 -p1 >> -# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch452 -p1 >> -# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch453 -p1 >> +# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +%patch454 -p1 >> >> >> >> # other drivers >> # linux-2.6.36-medfield-battery.patch >> -%patch454 -p1 >> -# linux-2.6.35-keycodes-fixup.patch >> %patch455 -p1 >> -# linux-2.6.35-backlight-fixup.patch >> +# linux-2.6.35-keycodes-fixup.patch >> %patch456 -p1 >> -# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +# linux-2.6.35-backlight-fixup.patch >> %patch457 -p1 >> +# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +%patch458 -p1 >> >> # 0001-Medfield_Current_Monitoring_Driver.patch >> -%patch458 -p1 >> -# 0001-Medfield_Thermal_Driver_Rework.patch >> %patch459 -p1 >> +# 0001-Medfield_Thermal_Driver_Rework.patch >> +%patch460 -p1 >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> --- kernel.spec >> +++ kernel.spec >> @@ -508,57 +508,58 @@ >> Patch425: linux-2.6.36-atmel-mrst-integration.patch >> Patch426: linux-2.6.36-atmel-2.patch >> Patch427: linux-2.6.36-atmel-3.patch >> +Patch428: linux-2.6.35-atmel-multitouch.patch >> >> -Patch428: linux-2.6.36-cyttsp-add-sTMA3406.patch >> -Patch429: linux-2.6.36-cyttsp-mrst-c.patch >> -Patch430: linux-2.6.36-cyttsp-low-power-mode.patch >> +Patch429: linux-2.6.36-cyttsp-add-sTMA3406.patch >> +Patch430: linux-2.6.36-cyttsp-mrst-c.patch >> +Patch431: linux-2.6.36-cyttsp-low-power-mode.patch >> >> # Various sensors connected to i2c >> -Patch431: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -Patch432: linux-2.6.35-lednames.patch >> -Patch433: linux-2.6.36-mfd-led-flash.patch >> -Patch434: linux-2.6.36-apds9802als-runtime-pm.patch >> -Patch435: linux-2.6.36-ak8974-add-runtime-pm.patch >> -Patch436: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> -Patch437: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> -Patch438: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> -Patch439: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> - >> - >> -Patch440: linux-2.6.37-APDS990X-upstream.patch >> -Patch441: linux-2.6.37-APDS990X-backport.patch >> -Patch442: linux-2.6.37-APDS990X-driver-name.patch >> -Patch443: linux-2.6.37-APDS990X-resource-setup.patch >> -Patch444: linux-2.6.37-APDS990X-mrst-c-part.patch >> +Patch432: linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> +Patch433: linux-2.6.35-lednames.patch >> +Patch434: linux-2.6.36-mfd-led-flash.patch >> +Patch435: linux-2.6.36-apds9802als-runtime-pm.patch >> +Patch436: linux-2.6.36-ak8974-add-runtime-pm.patch >> +Patch437: linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +Patch438: linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +Patch439: linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +Patch440: linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> + >> + >> +Patch441: linux-2.6.37-APDS990X-upstream.patch >> +Patch442: linux-2.6.37-APDS990X-backport.patch >> +Patch443: linux-2.6.37-APDS990X-driver-name.patch >> +Patch444: linux-2.6.37-APDS990X-resource-setup.patch >> +Patch445: linux-2.6.37-APDS990X-mrst-c-part.patch >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> -Patch445: linux-2.6.36-broadcom-gps.patch >> -Patch446: linux-2.6.36-nfc-NXP-PN544.patch >> +Patch446: linux-2.6.36-broadcom-gps.patch >> +Patch447: linux-2.6.36-nfc-NXP-PN544.patch >> >> -Patch447: linux-2.6.35-lis-pm-init-fix.patch >> -Patch448: linux-2.6.36-lis-single-click.patch >> -Patch449: linux-2.6.36-lis3-6d-support.patch >> +Patch448: linux-2.6.35-lis-pm-init-fix.patch >> +Patch449: linux-2.6.36-lis-single-click.patch >> +Patch450: linux-2.6.36-lis3-6d-support.patch >> >> # Various devices connected to SPI >> -Patch450: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> +Patch451: linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> >> >> # wifi/bluetooth connectivity >> -Patch451: linux-2.6.36-wl1271-add-platform_data.patch >> -Patch452: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> -Patch453: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +Patch452: linux-2.6.36-wl1271-add-platform_data.patch >> +Patch453: linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> +Patch454: linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> >> >> >> # other drivers >> -Patch454: linux-2.6.36-medfield-battery.patch >> -Patch455: linux-2.6.35-keycodes-fixup.patch >> -Patch456: linux-2.6.35-backlight-fixup.patch >> -Patch457: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +Patch455: linux-2.6.36-medfield-battery.patch >> +Patch456: linux-2.6.35-keycodes-fixup.patch >> +Patch457: linux-2.6.35-backlight-fixup.patch >> +Patch458: 0001-staging-sep-update-sep-driver-for-Medfield.patch >> >> -Patch458: 0001-Medfield_Current_Monitoring_Driver.patch >> -Patch459: 0001-Medfield_Thermal_Driver_Rework.patch >> +Patch459: 0001-Medfield_Current_Monitoring_Driver.patch >> +Patch460: 0001-Medfield_Thermal_Driver_Rework.patch >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> @@ -1471,89 +1472,91 @@ >> %patch426 -p1 >> # linux-2.6.36-atmel-3.patch >> %patch427 -p1 >> +# linux-2.6.35-atmel-multitouch.patch >> +%patch428 -p1 >> >> # linux-2.6.36-cyttsp-add-sTMA3406.patch >> -%patch428 -p1 >> -# linux-2.6.36-cyttsp-mrst-c.patch >> %patch429 -p1 >> -# linux-2.6.36-cyttsp-low-power-mode.patch >> +# linux-2.6.36-cyttsp-mrst-c.patch >> %patch430 -p1 >> +# linux-2.6.36-cyttsp-low-power-mode.patch >> +%patch431 -p1 >> >> # Various sensors connected to i2c >> # linux-2.6.35-apds9802als-fix-als-sensing-range-value.patch >> -%patch431 -p1 >> -# linux-2.6.35-lednames.patch >> %patch432 -p1 >> -# linux-2.6.36-mfd-led-flash.patch >> +# linux-2.6.35-lednames.patch >> %patch433 -p1 >> -# linux-2.6.36-apds9802als-runtime-pm.patch >> +# linux-2.6.36-mfd-led-flash.patch >> %patch434 -p1 >> -# linux-2.6.36-ak8974-add-runtime-pm.patch >> +# linux-2.6.36-apds9802als-runtime-pm.patch >> %patch435 -p1 >> -# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> +# linux-2.6.36-ak8974-add-runtime-pm.patch >> %patch436 -p1 >> -# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> +# linux-2.6.36-ak8974-optimize-i2c-transaction.patch >> %patch437 -p1 >> -# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> +# linux-2.6.36-hwmon-device-driver-for-ak8975-eCompass.patch >> %patch438 -p1 >> -# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +# linux-2.6.36-apds9802als-fix-runtime-pm.patch >> %patch439 -p1 >> +# linux-2.6.36-apds9802ps-fix-runtime-pm.patch >> +%patch440 -p1 >> >> >> # linux-2.6.37-APDS990X-upstream.patch >> -%patch440 -p1 >> -# linux-2.6.37-APDS990X-backport.patch >> %patch441 -p1 >> -# linux-2.6.37-APDS990X-driver-name.patch >> +# linux-2.6.37-APDS990X-backport.patch >> %patch442 -p1 >> -# linux-2.6.37-APDS990X-resource-setup.patch >> +# linux-2.6.37-APDS990X-driver-name.patch >> %patch443 -p1 >> -# linux-2.6.37-APDS990X-mrst-c-part.patch >> +# linux-2.6.37-APDS990X-resource-setup.patch >> %patch444 -p1 >> +# linux-2.6.37-APDS990X-mrst-c-part.patch >> +%patch445 -p1 >> >> # if only life was so simple that patches that get submitted actually >> # compile. >> # linux-2.6.36-broadcom-gps.patch >> -%patch445 -p1 >> -# linux-2.6.36-nfc-NXP-PN544.patch >> %patch446 -p1 >> +# linux-2.6.36-nfc-NXP-PN544.patch >> +%patch447 -p1 >> >> # linux-2.6.35-lis-pm-init-fix.patch >> -%patch447 -p1 >> -# linux-2.6.36-lis-single-click.patch >> %patch448 -p1 >> -# linux-2.6.36-lis3-6d-support.patch >> +# linux-2.6.36-lis-single-click.patch >> %patch449 -p1 >> +# linux-2.6.36-lis3-6d-support.patch >> +%patch450 -p1 >> >> # Various devices connected to SPI >> # linux-2.6.35-mrst_max3110-Make-the-IRQ-option-runtime.patch >> -%patch450 -p1 >> +%patch451 -p1 >> >> >> # wifi/bluetooth connectivity >> # linux-2.6.36-wl1271-add-platform_data.patch >> -%patch451 -p1 >> -# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch452 -p1 >> -# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +# linux-2.6.36-mrst.c-add-platform-support-for-wl12xx.patch >> %patch453 -p1 >> +# linux-2.6.36-mrst.c-Add-btfm_init-to-enable-bluetooth.patch >> +%patch454 -p1 >> >> >> >> # other drivers >> # linux-2.6.36-medfield-battery.patch >> -%patch454 -p1 >> -# linux-2.6.35-keycodes-fixup.patch >> %patch455 -p1 >> -# linux-2.6.35-backlight-fixup.patch >> +# linux-2.6.35-keycodes-fixup.patch >> %patch456 -p1 >> -# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +# linux-2.6.35-backlight-fixup.patch >> %patch457 -p1 >> +# 0001-staging-sep-update-sep-driver-for-Medfield.patch >> +%patch458 -p1 >> >> # 0001-Medfield_Current_Monitoring_Driver.patch >> -%patch458 -p1 >> -# 0001-Medfield_Thermal_Driver_Rework.patch >> %patch459 -p1 >> +# 0001-Medfield_Thermal_Driver_Rework.patch >> +%patch460 -p1 >> #0001-Cleanup-and-Improvement-patch-to-Intel-MSIC-Battery-.patch >> >> # >> >> other changes: >> -------------- >> >> ++++++ linux-2.6.35-atmel-multitouch.patch (new) >> --- linux-2.6.35-atmel-multitouch.patch >> +++ linux-2.6.35-atmel-multitouch.patch >> +Plus some other requested fixes on the previous submission. >> + >> +Will not work without some matching X related work. Bug already > logged >> +to get the mtev package installed and a config update. >> + >> +Signed-off-by: Ken Lierman <[email protected]> >> +--- >> + drivers/input/touchscreen/atmel_maxtouch.c | 548 >> +++++++++++++++------------- >> + 1 files changed, 285 insertions(+), 263 deletions(-) >> + >> +diff --git a/drivers/input/touchscreen/atmel_maxtouch.c >> b/drivers/input/touchscreen/atmel_maxtouch.c >> +index 1c9985b..4a03d10 100644 >> +--- a/drivers/input/touchscreen/atmel_maxtouch.c >> ++++ b/drivers/input/touchscreen/atmel_maxtouch.c >> +@@ -46,13 +46,14 @@ static int mxt_write_block(struct i2c_client >> *client, u16 addr, u16 length, >> + u8 *value); >> + >> + #define DRIVER_VERSION "0.9a" >> ++#define MULTI_TOUCH_ENABLED 1 >> + >> +-static int debug = DEBUG_INFO; >> +-static int comms; >> ++static int debug = DEBUG_TRACE; >> + module_param(debug, int, 0644); >> +-module_param(comms, int, 0644); >> +- >> + MODULE_PARM_DESC(debug, "Activate debugging output"); >> ++ >> ++static int comms; >> ++module_param(comms, int, 0644); >> + MODULE_PARM_DESC(comms, "Select communications mode"); >> + >> + /* Device Info descriptor */ >> +@@ -166,42 +167,17 @@ struct mxt_data { >> + struct mutex msg_mutex; >> + }; >> + >> ++/* >> ++ * This struct is used for i2c transfers. >> ++ */ >> ++struct mxt_i2c_byte_transfer { >> ++ __le16 le_addr; >> ++ u8 data; >> ++} __attribute__ ((packed)); >> ++ >> + #define I2C_RETRY_COUNT 5 >> + #define I2C_PAYLOAD_SIZE 254 >> + >> +-/* Returns the start address of object in mXT memory. */ >> +-#define MXT_BASE_ADDR(object_type, mxt) >> \ >> +- get_object_address(object_type, 0, mxt->object_table, >> \ >> +- mxt->device_info.num_objs) >> +- >> +-/* Maps a report ID to an object type (object type number). */ >> +-#define REPORT_ID_TO_OBJECT(rid, mxt) \ >> +- (((rid) == 0xff) ? 0 : mxt->rid_map[rid].object) >> +- >> +-/* Maps a report ID to an object type (string). */ >> +-#define REPORT_ID_TO_OBJECT_NAME(rid, mxt) >> \ >> +- object_type_name[REPORT_ID_TO_OBJECT(rid, mxt)] >> +- >> +-/* Returns non-zero if given object is a touch object */ >> +-#define IS_TOUCH_OBJECT(object) \ >> +- ((object == MXT_TOUCH_MULTITOUCHSCREEN_T9) || \ >> +- (object == MXT_TOUCH_KEYARRAY_T15) || \ >> +- (object == MXT_TOUCH_PROXIMITY_T23) || \ >> +- (object == MXT_TOUCH_SINGLETOUCHSCREEN_T10) || \ >> +- (object == MXT_TOUCH_XSLIDER_T11) || \ >> +- (object == MXT_TOUCH_YSLIDER_T12) || \ >> +- (object == MXT_TOUCH_XWHEEL_T13) || \ >> +- (object == MXT_TOUCH_YWHEEL_T14) || \ >> +- (object == MXT_TOUCH_KEYSET_T31) || \ >> +- (object == MXT_TOUCH_XSLIDERSET_T32) ? 1 : 0) >> +- >> +-#define mxt_debug(level, ...) \ >> +- do { \ >> +- if (debug >= (level)) \ >> +- pr_debug(__VA_ARGS__); \ >> +- } while (0) >> +- >> +- >> + /* >> + * Check whether we have multi-touch enabled kernel; if not, report >> just the >> + * first touch (on mXT224, the maximum is 10 simultaneous touches). >> +@@ -216,7 +192,7 @@ struct mxt_data { >> + * >> + */ >> + >> +-#ifdef ABS_MT_TRACKING_ID >> ++#ifdef MULTI_TOUCH_ENABLED >> + static inline void report_mt(int touch_number, int size, int x, int > y, >> struct >> + mxt_data *mxt) { >> + input_report_abs(mxt->input, ABS_MT_TRACKING_ID, > touch_number); >> +@@ -236,14 +212,7 @@ static inline void report_mt(int touch_number, > int >> size, int x, int y, struct >> + } >> + #endif >> + >> +- >> +-static inline void report_gesture(int data, struct mxt_data *mxt) >> +-{ >> +- input_event(mxt->input, EV_MSC, MSC_GESTURE, data); >> +-} >> +- >> +- >> +-static const u8 *object_type_name[] = { >> ++static const u8 *obj_typ_name[] = { >> + [0] = "Reserved", >> + [5] = "GEN_MESSAGEPROCESSOR_T5", >> + [6] = "GEN_COMMANDPROCESSOR_T6", >> +@@ -270,16 +239,64 @@ static const u8 *object_type_name[] = { >> + }; >> + >> + >> ++/* Writes the address pointer (to set up following reads). */ >> ++static int mxt_write_ap(struct mxt_data *mxt, u16 ap) >> ++{ >> ++ struct i2c_client *client; >> ++ __le16 le_ap = cpu_to_le16(ap); >> ++ client = mxt->client; >> ++ if (mxt != NULL) >> ++ mxt->last_read_addr = -1; >> ++ if (i2c_master_send(client, (u8 *) &le_ap, 2) == 2) { >> ++ dev_dbg(&mxt->client->dev, "Address pointer set to >> %d\n", ap); >> ++ return 0; >> ++ } else { >> ++ dev_dbg(&mxt->client->dev, "Error writing address >> pointer!\n"); >> ++ return -EIO; >> ++ } >> ++} >> ++ >> ++/* Reads a block of bytes from current address from mXT chip. */ >> ++static int mxt_read_block_wo_addr(struct i2c_client *client, >> ++ u16 length, >> ++ u8 *value) >> ++{ >> ++ if (i2c_master_recv(client, value, length) == length) { >> ++ dev_dbg(&client->dev, "I2C block read ok\n"); >> ++ return length; >> ++ } else { >> ++ dev_dbg(&client->dev, "I2C block read failed\n"); >> ++ return -EIO; >> ++ } >> ++ >> ++} >> ++ >> ++/* Returns object address in mXT chip, or zero if object is not > found >> */ >> + static u16 get_object_address(uint8_t object_type, >> + uint8_t instance, >> + struct mxt_object *object_table, >> +- int max_objs); >> +- >> +-static int mxt_write_ap(struct mxt_data *mxt, u16 ap); >> +- >> +-static int mxt_read_block_wo_addr(struct i2c_client *client, >> +- u16 length, >> +- u8 *value); >> ++ int max_objs) >> ++{ >> ++ uint8_t object_table_index = 0; >> ++ uint8_t address_found = 0; >> ++ uint16_t address = 0; >> ++ struct mxt_object *obj; >> ++ while ((object_table_index < max_objs) && !address_found) { >> ++ obj = &object_table[object_table_index]; >> ++ if (obj->type == object_type) { >> ++ address_found = 1; >> ++ /* Are there enough instances defined in the > FW? >> */ >> ++ if (obj->instances >= instance) { >> ++ address = obj->chip_addr + >> ++ (obj->size + 1) * instance; >> ++ } else { >> ++ return 0; >> ++ } >> ++ } >> ++ object_table_index++; >> ++ } >> ++ return address; >> ++} >> + >> + ssize_t debug_data_read(struct mxt_data *mxt, char *buf, size_t > count, >> + loff_t *ppos, u8 debug_command){ >> +@@ -303,20 +320,33 @@ ssize_t debug_data_read(struct mxt_data *mxt, >> char *buf, size_t count, >> + /* If first read after open, read all data to buffer. */ >> + if (mxt->current_debug_datap == 0) { >> + >> +- diagnostics_reg = >> MXT_BASE_ADDR(MXT_GEN_COMMANDPROCESSOR_T6, >> +- mxt) + >> +- MXT_ADR_T6_DIAGNOSTIC; >> ++ diagnostics_reg = >> ++ > get_object_address(MXT_GEN_COMMANDPROCESSOR_T6, >> ++ 0, >> ++ mxt->object_table, >> ++ mxt->device_info.num_objs) + >> MXT_ADR_T6_DIAGNOSTIC; >> ++ >> + if (count > (mxt->device_info.num_nodes * 2)) >> + count = mxt->device_info.num_nodes; >> + >> +- debug_data_addr = >> MXT_BASE_ADDR(MXT_DEBUG_DIAGNOSTIC_T37, mxt) + >> (837 more lines skipped) >> >> ++++++ series >> --- series >> +++ series >> @@ -339,6 +339,7 @@ >> linux-2.6.36-atmel-mrst-integration.patch >> linux-2.6.36-atmel-2.patch >> linux-2.6.36-atmel-3.patch >> +linux-2.6.35-atmel-multitouch.patch >> >> linux-2.6.36-cyttsp-add-sTMA3406.patch >> linux-2.6.36-cyttsp-mrst-c.patch >> >> _______________________________________________ >> MeeGo-commits mailing list >> [email protected] >> http://lists.meego.com/listinfo/meego-commits >> >> _______________________________________________ >> MeeGo-packaging mailing list >> [email protected] >> http://lists.meego.com/listinfo/meego-packaging > _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
