[meego-commits] 6848: Changes to Trunk:Testing/kernel
Arjan van de Ven
arjan at linux.intel.com
Thu Aug 19 22:48:12 UTC 2010
Hi,
I have made the following changes to kernel in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Arjan van de Ven
[This message was auto-generated]
---
Request #6848:
submit: devel:kernel/kernel(r137) -> Trunk:Testing/kernel
Message:
this hotfix might fix the netbook crash
State: new 2010-08-19T10:38:38 arjan
Comment: None
changes files:
--------------
--- kernel.changes
+++ kernel.changes
@@ -0,0 +1,7 @@
+* Thu Aug 19 2010 Arjan van de Ven <arjan at linux.intel.com> - 2.6.35.2
+- hotfix patch from Linus for 2.6.35.2
+- patch (going into 2.6.36) that makes PowerTOP2 possible
+
+* Thu Aug 19 2010 Ameya Palande <ameya.palande at nokia.com> - 2.6.35.2
+- N900: Add lp5523 led platform data and drivers
+
new:
----
linux-2.6.35.2-hotfix.patch
linux-2.6.36-powertop-timer-tracing.patch
linux-2.6.37-leds-Add-lp5523-led-driver.patch
linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
spec files:
-----------
--- kernel-ivi.spec
+++ kernel-ivi.spec
@@ -163,12 +163,13 @@
#
Patch1: patch-2.6.35.2.bz2
+Patch2: linux-2.6.35.2-hotfix.patch
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch2: linux-2.6-build-nonintconfig.patch
+Patch3: linux-2.6-build-nonintconfig.patch
@@ -257,6 +258,10 @@
Patch313: linux-2.6-omap3camera.patch
# TI dspbridge driver
Patch314: linux-2.6.36-tidspbridge.patch
+# lp5523 led chip driver
+Patch315: linux-2.6.37-leds-Add-lp5523-led-driver.patch
+# lp5523 platform data for rx51 board
+Patch316: linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
#
# End of the Nokia N900 patches
@@ -354,22 +359,23 @@
Patch704: linux-2.6.33-vfs-tracepoints.patch
Patch705: linux-2.6.33-ahci-alpm-accounting.patch
Patch706: linux-2.6.35-rc4-annotate-device-pm.patch
+Patch707: linux-2.6.36-powertop-timer-tracing.patch
#
# Fix the slab timer to not be a power hog
#
-Patch707: linux-2.6.35-slab-timer.patch
+Patch708: linux-2.6.35-slab-timer.patch
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
-Patch708: linux-2.6.35-dont-skew-the-tick.patch
+Patch709: linux-2.6.35-dont-skew-the-tick.patch
#
# Atom C state fixes
#
-Patch709: linux-2.6.35-intel-idle.patch
+Patch710: linux-2.6.35-intel-idle.patch
#
# End of the boot time and power patches
@@ -386,14 +392,14 @@
# Multitouch input driver for event devices
-Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch711: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch712: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch712: linux-2.6.35-fatal-signals.patch
+Patch713: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -513,13 +519,15 @@
# patch-2.6.35.2.bz2
%patch1 -p1
+# linux-2.6.35.2-hotfix.patch
+%patch2 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch2 -p1
+%patch3 -p1
@@ -629,6 +637,12 @@
# TI dspbridge driver
# linux-2.6.36-tidspbridge.patch
%patch314 -p1
+# lp5523 led chip driver
+# linux-2.6.37-leds-Add-lp5523-led-driver.patch
+%patch315 -p1
+# lp5523 platform data for rx51 board
+# linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
+%patch316 -p1
#
# End of the Nokia N900 patches
@@ -737,25 +751,27 @@
%patch705 -p1
# linux-2.6.35-rc4-annotate-device-pm.patch
%patch706 -p1
+# linux-2.6.36-powertop-timer-tracing.patch
+%patch707 -p1
#
# Fix the slab timer to not be a power hog
#
# linux-2.6.35-slab-timer.patch
-%patch707 -p1
+%patch708 -p1
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
# linux-2.6.35-dont-skew-the-tick.patch
-%patch708 -p1
+%patch709 -p1
#
# Atom C state fixes
#
# linux-2.6.35-intel-idle.patch
-%patch709 -p1
+%patch710 -p1
#
# End of the boot time and power patches
@@ -773,16 +789,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
-%patch710 -p1
+%patch711 -p1
# Enable stantum and cando drivers to use mtdev driver
# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
-%patch711 -p1
+%patch712 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch712 -p1
+%patch713 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
--- kernel-mrst.spec
+++ kernel-mrst.spec
@@ -164,12 +164,13 @@
#
Patch1: patch-2.6.35.2.bz2
+Patch2: linux-2.6.35.2-hotfix.patch
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch2: linux-2.6-build-nonintconfig.patch
+Patch3: linux-2.6-build-nonintconfig.patch
@@ -258,6 +259,10 @@
Patch313: linux-2.6-omap3camera.patch
# TI dspbridge driver
Patch314: linux-2.6.36-tidspbridge.patch
+# lp5523 led chip driver
+Patch315: linux-2.6.37-leds-Add-lp5523-led-driver.patch
+# lp5523 platform data for rx51 board
+Patch316: linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
#
# End of the Nokia N900 patches
@@ -355,22 +360,23 @@
Patch704: linux-2.6.33-vfs-tracepoints.patch
Patch705: linux-2.6.33-ahci-alpm-accounting.patch
Patch706: linux-2.6.35-rc4-annotate-device-pm.patch
+Patch707: linux-2.6.36-powertop-timer-tracing.patch
#
# Fix the slab timer to not be a power hog
#
-Patch707: linux-2.6.35-slab-timer.patch
+Patch708: linux-2.6.35-slab-timer.patch
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
-Patch708: linux-2.6.35-dont-skew-the-tick.patch
+Patch709: linux-2.6.35-dont-skew-the-tick.patch
#
# Atom C state fixes
#
-Patch709: linux-2.6.35-intel-idle.patch
+Patch710: linux-2.6.35-intel-idle.patch
#
# End of the boot time and power patches
@@ -387,14 +393,14 @@
# Multitouch input driver for event devices
-Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch711: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch712: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch712: linux-2.6.35-fatal-signals.patch
+Patch713: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -514,13 +520,15 @@
# patch-2.6.35.2.bz2
%patch1 -p1
+# linux-2.6.35.2-hotfix.patch
+%patch2 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch2 -p1
+%patch3 -p1
@@ -630,6 +638,12 @@
# TI dspbridge driver
# linux-2.6.36-tidspbridge.patch
%patch314 -p1
+# lp5523 led chip driver
+# linux-2.6.37-leds-Add-lp5523-led-driver.patch
+%patch315 -p1
+# lp5523 platform data for rx51 board
+# linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
+%patch316 -p1
#
# End of the Nokia N900 patches
@@ -738,25 +752,27 @@
%patch705 -p1
# linux-2.6.35-rc4-annotate-device-pm.patch
%patch706 -p1
+# linux-2.6.36-powertop-timer-tracing.patch
+%patch707 -p1
#
# Fix the slab timer to not be a power hog
#
# linux-2.6.35-slab-timer.patch
-%patch707 -p1
+%patch708 -p1
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
# linux-2.6.35-dont-skew-the-tick.patch
-%patch708 -p1
+%patch709 -p1
#
# Atom C state fixes
#
# linux-2.6.35-intel-idle.patch
-%patch709 -p1
+%patch710 -p1
#
# End of the boot time and power patches
@@ -774,16 +790,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
-%patch710 -p1
+%patch711 -p1
# Enable stantum and cando drivers to use mtdev driver
# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
-%patch711 -p1
+%patch712 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch712 -p1
+%patch713 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
--- kernel-n900.spec
+++ kernel-n900.spec
@@ -163,12 +163,13 @@
#
Patch1: patch-2.6.35.2.bz2
+Patch2: linux-2.6.35.2-hotfix.patch
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch2: linux-2.6-build-nonintconfig.patch
+Patch3: linux-2.6-build-nonintconfig.patch
@@ -257,6 +258,10 @@
Patch313: linux-2.6-omap3camera.patch
# TI dspbridge driver
Patch314: linux-2.6.36-tidspbridge.patch
+# lp5523 led chip driver
+Patch315: linux-2.6.37-leds-Add-lp5523-led-driver.patch
+# lp5523 platform data for rx51 board
+Patch316: linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
#
# End of the Nokia N900 patches
@@ -354,22 +359,23 @@
Patch704: linux-2.6.33-vfs-tracepoints.patch
Patch705: linux-2.6.33-ahci-alpm-accounting.patch
Patch706: linux-2.6.35-rc4-annotate-device-pm.patch
+Patch707: linux-2.6.36-powertop-timer-tracing.patch
#
# Fix the slab timer to not be a power hog
#
-Patch707: linux-2.6.35-slab-timer.patch
+Patch708: linux-2.6.35-slab-timer.patch
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
-Patch708: linux-2.6.35-dont-skew-the-tick.patch
+Patch709: linux-2.6.35-dont-skew-the-tick.patch
#
# Atom C state fixes
#
-Patch709: linux-2.6.35-intel-idle.patch
+Patch710: linux-2.6.35-intel-idle.patch
#
# End of the boot time and power patches
@@ -386,14 +392,14 @@
# Multitouch input driver for event devices
-Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch711: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch712: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch712: linux-2.6.35-fatal-signals.patch
+Patch713: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -513,13 +519,15 @@
# patch-2.6.35.2.bz2
%patch1 -p1
+# linux-2.6.35.2-hotfix.patch
+%patch2 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch2 -p1
+%patch3 -p1
@@ -629,6 +637,12 @@
# TI dspbridge driver
# linux-2.6.36-tidspbridge.patch
%patch314 -p1
+# lp5523 led chip driver
+# linux-2.6.37-leds-Add-lp5523-led-driver.patch
+%patch315 -p1
+# lp5523 platform data for rx51 board
+# linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
+%patch316 -p1
#
# End of the Nokia N900 patches
@@ -737,25 +751,27 @@
%patch705 -p1
# linux-2.6.35-rc4-annotate-device-pm.patch
%patch706 -p1
+# linux-2.6.36-powertop-timer-tracing.patch
+%patch707 -p1
#
# Fix the slab timer to not be a power hog
#
# linux-2.6.35-slab-timer.patch
-%patch707 -p1
+%patch708 -p1
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
# linux-2.6.35-dont-skew-the-tick.patch
-%patch708 -p1
+%patch709 -p1
#
# Atom C state fixes
#
# linux-2.6.35-intel-idle.patch
-%patch709 -p1
+%patch710 -p1
#
# End of the boot time and power patches
@@ -773,16 +789,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
-%patch710 -p1
+%patch711 -p1
# Enable stantum and cando drivers to use mtdev driver
# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
-%patch711 -p1
+%patch712 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch712 -p1
+%patch713 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
--- kernel-netbook.spec
+++ kernel-netbook.spec
@@ -163,12 +163,13 @@
#
Patch1: patch-2.6.35.2.bz2
+Patch2: linux-2.6.35.2-hotfix.patch
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch2: linux-2.6-build-nonintconfig.patch
+Patch3: linux-2.6-build-nonintconfig.patch
@@ -257,6 +258,10 @@
Patch313: linux-2.6-omap3camera.patch
# TI dspbridge driver
Patch314: linux-2.6.36-tidspbridge.patch
+# lp5523 led chip driver
+Patch315: linux-2.6.37-leds-Add-lp5523-led-driver.patch
+# lp5523 platform data for rx51 board
+Patch316: linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
#
# End of the Nokia N900 patches
@@ -354,22 +359,23 @@
Patch704: linux-2.6.33-vfs-tracepoints.patch
Patch705: linux-2.6.33-ahci-alpm-accounting.patch
Patch706: linux-2.6.35-rc4-annotate-device-pm.patch
+Patch707: linux-2.6.36-powertop-timer-tracing.patch
#
# Fix the slab timer to not be a power hog
#
-Patch707: linux-2.6.35-slab-timer.patch
+Patch708: linux-2.6.35-slab-timer.patch
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
-Patch708: linux-2.6.35-dont-skew-the-tick.patch
+Patch709: linux-2.6.35-dont-skew-the-tick.patch
#
# Atom C state fixes
#
-Patch709: linux-2.6.35-intel-idle.patch
+Patch710: linux-2.6.35-intel-idle.patch
#
# End of the boot time and power patches
@@ -386,14 +392,14 @@
# Multitouch input driver for event devices
-Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch711: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch712: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch712: linux-2.6.35-fatal-signals.patch
+Patch713: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -513,13 +519,15 @@
# patch-2.6.35.2.bz2
%patch1 -p1
+# linux-2.6.35.2-hotfix.patch
+%patch2 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch2 -p1
+%patch3 -p1
@@ -629,6 +637,12 @@
# TI dspbridge driver
# linux-2.6.36-tidspbridge.patch
%patch314 -p1
+# lp5523 led chip driver
+# linux-2.6.37-leds-Add-lp5523-led-driver.patch
+%patch315 -p1
+# lp5523 platform data for rx51 board
+# linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
+%patch316 -p1
#
# End of the Nokia N900 patches
@@ -737,25 +751,27 @@
%patch705 -p1
# linux-2.6.35-rc4-annotate-device-pm.patch
%patch706 -p1
+# linux-2.6.36-powertop-timer-tracing.patch
+%patch707 -p1
#
# Fix the slab timer to not be a power hog
#
# linux-2.6.35-slab-timer.patch
-%patch707 -p1
+%patch708 -p1
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
# linux-2.6.35-dont-skew-the-tick.patch
-%patch708 -p1
+%patch709 -p1
#
# Atom C state fixes
#
# linux-2.6.35-intel-idle.patch
-%patch709 -p1
+%patch710 -p1
#
# End of the boot time and power patches
@@ -773,16 +789,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
-%patch710 -p1
+%patch711 -p1
# Enable stantum and cando drivers to use mtdev driver
# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
-%patch711 -p1
+%patch712 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch712 -p1
+%patch713 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
--- kernel.spec
+++ kernel.spec
@@ -175,12 +175,13 @@
#
Patch1: patch-2.6.35.2.bz2
+Patch2: linux-2.6.35.2-hotfix.patch
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch2: linux-2.6-build-nonintconfig.patch
+Patch3: linux-2.6-build-nonintconfig.patch
@@ -269,6 +270,10 @@
Patch313: linux-2.6-omap3camera.patch
# TI dspbridge driver
Patch314: linux-2.6.36-tidspbridge.patch
+# lp5523 led chip driver
+Patch315: linux-2.6.37-leds-Add-lp5523-led-driver.patch
+# lp5523 platform data for rx51 board
+Patch316: linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
#
# End of the Nokia N900 patches
@@ -366,22 +371,23 @@
Patch704: linux-2.6.33-vfs-tracepoints.patch
Patch705: linux-2.6.33-ahci-alpm-accounting.patch
Patch706: linux-2.6.35-rc4-annotate-device-pm.patch
+Patch707: linux-2.6.36-powertop-timer-tracing.patch
#
# Fix the slab timer to not be a power hog
#
-Patch707: linux-2.6.35-slab-timer.patch
+Patch708: linux-2.6.35-slab-timer.patch
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
-Patch708: linux-2.6.35-dont-skew-the-tick.patch
+Patch709: linux-2.6.35-dont-skew-the-tick.patch
#
# Atom C state fixes
#
-Patch709: linux-2.6.35-intel-idle.patch
+Patch710: linux-2.6.35-intel-idle.patch
#
# End of the boot time and power patches
@@ -398,14 +404,14 @@
# Multitouch input driver for event devices
-Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch711: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch712: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch712: linux-2.6.35-fatal-signals.patch
+Patch713: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -555,13 +561,15 @@
# patch-2.6.35.2.bz2
%patch1 -p1
+# linux-2.6.35.2-hotfix.patch
+%patch2 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch2 -p1
+%patch3 -p1
@@ -671,6 +679,12 @@
# TI dspbridge driver
# linux-2.6.36-tidspbridge.patch
%patch314 -p1
+# lp5523 led chip driver
+# linux-2.6.37-leds-Add-lp5523-led-driver.patch
+%patch315 -p1
+# lp5523 platform data for rx51 board
+# linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
+%patch316 -p1
#
# End of the Nokia N900 patches
@@ -779,25 +793,27 @@
%patch705 -p1
# linux-2.6.35-rc4-annotate-device-pm.patch
%patch706 -p1
+# linux-2.6.36-powertop-timer-tracing.patch
+%patch707 -p1
#
# Fix the slab timer to not be a power hog
#
# linux-2.6.35-slab-timer.patch
-%patch707 -p1
+%patch708 -p1
#
# Fix Linux deliberately skewing the timer for
# historic reasons that are no longer true.
#
# linux-2.6.35-dont-skew-the-tick.patch
-%patch708 -p1
+%patch709 -p1
#
# Atom C state fixes
#
# linux-2.6.35-intel-idle.patch
-%patch709 -p1
+%patch710 -p1
#
# End of the boot time and power patches
@@ -815,16 +831,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
-%patch710 -p1
+%patch711 -p1
# Enable stantum and cando drivers to use mtdev driver
# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
-%patch711 -p1
+%patch712 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch712 -p1
+%patch713 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
other changes:
--------------
++++++ config-arm-generic
--- config-arm-generic
+++ config-arm-generic
@@ -666,19 +666,6 @@
# CONFIG_MMC_AT91 is not set
# CONFIG_MMC_ATMELMCI is not set
-
-CONFIG_LEDS_CLASS=m
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_REGULATOR is not set
-
-#
-# LED Triggers
-#
-# CONFIG_LEDS_TRIGGERS is not set
-
#
# Platform RTC drivers
#
++++++ config-arm-n900
--- config-arm-n900
+++ config-arm-n900
@@ -486,3 +486,8 @@
# CONFIG_VIDEO_UPD64083 is not set
# CONFIG_V4L_USB_DRIVERS is not set
# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+
+CONFIG_LEDS_CLASS=m
+# CONFIG_LEDS_REGULATOR is not set
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_TRIGGER_GPIO=m
++++++ config-generic
--- config-generic
+++ config-generic
@@ -3540,4 +3540,4 @@
# CONFIG_USBPCWATCHDOG is not set
# CONFIG_VIDEO_SMIAREGS is not set
CONFIG_CRYPTO_MANAGER_TESTS=y
-
+# CONFIG_LEDS_LP5523 is not set
++++++ linux-2.6.35.2-hotfix.patch (new)
--- linux-2.6.35.2-hotfix.patch
+++ linux-2.6.35.2-hotfix.patch
+ mm/memory.c | 13 ++++++-------
+ 1 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/mm/memory.c b/mm/memory.c
+index 9b3b73f..b6e5fd2 100644
+--- a/mm/memory.c
++++ b/mm/memory.c
+@@ -2792,24 +2792,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+ spinlock_t *ptl;
+ pte_t entry;
+
+- if (check_stack_guard_page(vma, address) < 0) {
+- pte_unmap(page_table);
++ pte_unmap(page_table);
++
++ /* Check if we need to add a guard page to the stack */
++ if (check_stack_guard_page(vma, address) < 0)
+ return VM_FAULT_SIGBUS;
+- }
+
++ /* Use the zero-page for reads */
+ if (!(flags & FAULT_FLAG_WRITE)) {
+ entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
+ vma->vm_page_prot));
+- ptl = pte_lockptr(mm, pmd);
+- spin_lock(ptl);
++ page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
+ if (!pte_none(*page_table))
+ goto unlock;
+ goto setpte;
+ }
+
+ /* Allocate our own private page. */
+- pte_unmap(page_table);
+-
+ if (unlikely(anon_vma_prepare(vma)))
+ goto oom;
+ page = alloc_zeroed_user_highpage_movable(vma, address);
++++++ linux-2.6.36-powertop-timer-tracing.patch (new)
--- linux-2.6.36-powertop-timer-tracing.patch
+++ linux-2.6.36-powertop-timer-tracing.patch
+From fe9633af11395d339880417439a1931bb9e7e493 Mon Sep 17 00:00:00 2001
+From: Arjan van de Ven <arjan at linux.intel.com>
+Date: Wed, 18 Aug 2010 15:28:59 -0400
+Subject: [PATCH] tracing: Make timer tracing actually useful
+
+PowerTOP would like to be able to trace timers.
+Unfortunately, the current timer tracing is not very useful, the actual
+timer function is not recorded in the trace at the start of timer execution.
+
+Although this is recorded for timer "start" time (when it gets armed), this
+is not useful; most timers get started early, and a tracer like PowerTOP
+will never see this event, but will only see the actual running of the timer.
+
+This patch just adds the function to the timer tracing; I've verified with
+PowerTOP that now it can get useful information about timers.
+
+Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
+---
+ include/trace/events/timer.h | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
+index c624126..94511c8 100644
+--- a/include/trace/events/timer.h
++++ b/include/trace/events/timer.h
+@@ -81,14 +81,16 @@ TRACE_EVENT(timer_expire_entry,
+ TP_STRUCT__entry(
+ __field( void *, timer )
+ __field( unsigned long, now )
++ __field( void *, function )
+ ),
+
+ TP_fast_assign(
+ __entry->timer = timer;
+ __entry->now = jiffies;
++ __entry->function = timer->function;
+ ),
+
+- TP_printk("timer=%p now=%lu", __entry->timer, __entry->now)
++ TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now)
+ );
+
+ /**
+@@ -200,14 +202,16 @@ TRACE_EVENT(hrtimer_expire_entry,
+ TP_STRUCT__entry(
+ __field( void *, hrtimer )
+ __field( s64, now )
++ __field( void *, function )
+ ),
+
+ TP_fast_assign(
+ __entry->hrtimer = hrtimer;
+ __entry->now = now->tv64;
++ __entry->function = hrtimer->function;
+ ),
+
+- TP_printk("hrtimer=%p now=%llu", __entry->hrtimer,
++ TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function,
+ (unsigned long long)ktime_to_ns((ktime_t) { .tv64 = __entry->now }))
+ );
+
+--
+1.6.1.3
+
++++++ linux-2.6.37-leds-Add-lp5523-led-driver.patch (new)
--- linux-2.6.37-leds-Add-lp5523-led-driver.patch
+++ linux-2.6.37-leds-Add-lp5523-led-driver.patch
+From bcfba368c9a791876e8acd27482f9cc8ee3cad6a Mon Sep 17 00:00:00 2001
+From: Ameya Palande <ameya.palande at nokia.com>
+Date: Wed, 18 Aug 2010 17:06:57 +0300
+Subject: [PATCH 2/2] leds: Add lp5523 led driver
+
+Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
+---
+ drivers/leds/Kconfig | 7 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/leds-lp5523.c | 973 +++++++++++++++++++++++++++++++++++++++++++
+ include/linux/leds-lp5523.h | 18 +
+ 4 files changed, 999 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/leds/leds-lp5523.c
+ create mode 100644 include/linux/leds-lp5523.h
+
+diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
+index 81bf25e..7a4685e 100644
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
+@@ -302,6 +302,13 @@ config LEDS_MC13783
+ This option enable support for on-chip LED drivers found
+ on Freescale Semiconductor MC13783 PMIC.
+
++config LEDS_LP5523
++ tristate "LED Support for LP5523 chip"
++ depends on I2C
++ help
++ This option enables support for the National Semiconductor
++ LP5523 LED chip.
++
+ config LEDS_TRIGGERS
+ bool "LED Trigger support"
+ help
+diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
+index 2493de4..83e913d 100644
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
+@@ -37,6 +37,7 @@ obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o
+ obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o
+ obj-$(CONFIG_LEDS_DELL_NETBOOKS) += dell-led.o
+ obj-$(CONFIG_LEDS_MC13783) += leds-mc13783.o
++obj-$(CONFIG_LEDS_LP5523) += leds-lp5523.o
+
+ # LED SPI Drivers
+ obj-$(CONFIG_LEDS_DAC124S085) += leds-dac124s085.o
+diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
+new file mode 100644
+index 0000000..8448c9b
+--- /dev/null
++++ b/drivers/leds/leds-lp5523.c
+@@ -0,0 +1,973 @@
++/*
++ * lp5523.c - LP5523 LED Driver
++ *
++ * Copyright (C) 2008 Nokia Corporation
++ *
++ * Contact: Mathias Nyman <mathias.nyman at nokia.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * version 2 as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++
++#include <linux/module.h>
++#include <linux/i2c.h>
++#include <linux/slab.h>
++#include <linux/leds.h>
++#include <linux/mutex.h>
++#include <linux/workqueue.h>
++#include <linux/gpio.h>
++#include <linux/interrupt.h>
++#include <linux/delay.h>
++#include <linux/ctype.h>
++#include <linux/spinlock.h>
++#include <linux/wait.h>
++#include <linux/leds-lp5523.h>
++
++#define LP5523_REG_ENABLE 0x00
++#define LP5523_REG_OP_MODE 0x01
++#define LP5523_REG_RATIOMETRIC_MSB 0x02
++#define LP5523_REG_RATIOMETRIC_LSB 0x03
++#define LP5523_REG_ENABLE_LEDS_MSB 0x04
++#define LP5523_REG_ENABLE_LEDS_LSB 0x05
++#define LP5523_REG_LED_CNTRL_BASE 0x06
++#define LP5523_REG_LED_PWM_BASE 0x16
++#define LP5523_REG_LED_CURRENT_BASE 0x26
++#define LP5523_REG_CONFIG 0x36
++#define LP5523_REG_CHANNEL1_PC 0x37
++#define LP5523_REG_CHANNEL2_PC 0x38
++#define LP5523_REG_CHANNEL3_PC 0x39
++#define LP5523_REG_STATUS 0x3a
++#define LP5523_REG_GPO 0x3b
++#define LP5523_REG_VARIABLE 0x3c
++#define LP5523_REG_RESET 0x3d
++#define LP5523_REG_TEMP_CTRL 0x3e
++#define LP5523_REG_TEMP_READ 0x3f
++#define LP5523_REG_TEMP_WRITE 0x40
++#define LP5523_REG_LED_TEST_CTRL 0x41
++#define LP5523_REG_LED_TEST_ADC 0x42
++#define LP5523_REG_ENG1_VARIABLE 0x45
++#define LP5523_REG_ENG2_VARIABLE 0x46
++#define LP5523_REG_ENG3_VARIABLE 0x47
++#define LP5523_REG_MASTER_FADER1 0x48
++#define LP5523_REG_MASTER_FADER2 0x49
++#define LP5523_REG_MASTER_FADER3 0x4a
++#define LP5523_REG_CH1_PROG_START 0x4c
++#define LP5523_REG_CH2_PROG_START 0x4d
++#define LP5523_REG_CH3_PROG_START 0x4e
++#define LP5523_REG_PROG_PAGE_SEL 0x4f
++#define LP5523_REG_PROG_MEM 0x50
++
++#define LP5523_CMD_LOAD 0x15 /* 00010101 */
++#define LP5523_CMD_RUN 0x2a /* 00101010 */
++#define LP5523_CMD_DISABLED 0x00 /* 00000000 */
++
++#define LP5523_ENABLE 0x40
++#define LP5523_AUTO_INC 0x40
++#define LP5523_PWR_SAVE 0x20
++#define LP5523_PWM_PWR_SAVE 0x04
++#define LP5523_CP_1 0x08
++#define LP5523_CP_1_5 0x10
++#define LP5523_CP_AUTO 0x18
++#define LP5523_INT_CLK 0x01
++#define LP5523_AUTO_CLK 0x02
++#define LP5523_EN_LEDTEST 0x80
++#define LP5523_LEDTEST_DONE 0x80
++
++#define LP5523_DEFAULT_CURRENT 50 /* microAmps */
++#define LP5523_PROGRAM_LENGTH 32 /* in bytes */
++#define LP5523_PROGRAM_PAGES 6
++#define LP5523_ADC_SHORTCIRC_LIM 80
++#define LP5523_ADC_OPEN_LIM 180
++
++#define LP5523_LEDS 9
++#define LP5523_CHANNELS 3
++
++#define LP5523_ENG_MASK_BASE 0x30 /* 00110000 */
++
++#define LP5523_ENG_STATUS_MASK 0x07 /* 00000111 */
++
++#define LP5523_IRQ_FLAGS IRQF_TRIGGER_FALLING
++
++
++#define LED_ACTIVE(mux, led) (!!(mux & (0x0001 << led)))
++#define SHIFT_MASK(id) (((id) - 1) * 2)
++
++struct lp5523_engine {
++ const struct attribute_group *attributes;
++ int id;
++ u8 mode;
++ u8 prog_page;
++ u8 mux_page;
++ u16 led_mux;
++ u8 engine_mask;
++};
++
++struct lp5523_led {
++ int id;
++ u8 led_nr;
++ u8 led_current;
++ struct led_classdev cdev;
++};
++
++struct lp5523_chip {
++ struct mutex lock;
++ struct i2c_client *client;
++ struct work_struct work;
++ u8 active_led;
++ struct lp5523_engine engines[LP5523_CHANNELS];
++ struct lp5523_led leds[LP5523_LEDS];
++ u8 num_leds;
++ int irq;
++ int chip_en;
++ /* for initialisation */
++ wait_queue_head_t configured;
++ u8 engine_config;
++};
++
++#define cdev_to_led(c) container_of(c, struct lp5523_led, cdev)
++
++static struct lp5523_chip *engine_to_lp5523(struct lp5523_engine *engine)
++{
++ return container_of(engine, struct lp5523_chip,
++ engines[engine->id - 1]);
++}
++
++static struct lp5523_chip *led_to_lp5523(struct lp5523_led *led)
++{
(853 more lines skipped)
++++++ linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch (new)
--- linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
+++ linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
+From a42810ff1898ffe1269aaec57840c34f58295ca3 Mon Sep 17 00:00:00 2001
+From: Ameya Palande <ameya.palande at nokia.com>
+Date: Wed, 18 Aug 2010 17:50:23 +0300
+Subject: [PATCH 1/2] omap3: rx51: Platform support for lp5523 led chip
+
+Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
+---
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 88 +++++++++++++++++++++++++-
+ 1 files changed, 87 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
+index 39b0dc2..00fa0a9 100644
+--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
++++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
+@@ -46,6 +46,7 @@
+
+ #include <sound/tlv320aic3x.h>
+ #include <sound/tpa6130a2-plat.h>
++#include <linux/leds-lp5523.h>
+
+ #include "mux.h"
+ #include "hsmmc.h"
+@@ -68,6 +69,9 @@
+ #define LIS302_IRQ1_GPIO 181
+ #define LIS302_IRQ2_GPIO 180 /* Not yet in use */
+
++#define RX51_LP5523_IRQ_GPIO 55
++#define RX51_LP5523_CHIP_EN_GPIO 41
++
+ /* list all spi devices here */
+ enum {
+ RX51_SPI_WL1251,
+@@ -155,6 +159,55 @@ static struct tsl2563_platform_data rx51_tsl2563_platform_data = {
+ };
+ #endif
+
++#if defined(CONFIG_LEDS_LP5523) || defined(CONFIG_LEDS_LP5523_MODULE)
++static struct lp5523_led_config rx51_lp5523_led_config[] = {
++ {
++ .name = "kb1",
++ .led_nr = 0,
++ .led_current = 50,
++ }, {
++ .name = "kb2",
++ .led_nr = 1,
++ .led_current = 50,
++ }, {
++ .name = "kb3",
++ .led_nr = 2,
++ .led_current = 50,
++ }, {
++ .name = "kb4",
++ .led_nr = 3,
++ .led_current = 50,
++ }, {
++ .name = "b",
++ .led_nr = 4,
++ .led_current = 50,
++ }, {
++ .name = "g",
++ .led_nr = 5,
++ .led_current = 50,
++ }, {
++ .name = "r",
++ .led_nr = 6,
++ .led_current = 50,
++ }, {
++ .name = "kb5",
++ .led_nr = 7,
++ .led_current = 50,
++ }, {
++ .name = "kb6",
++ .led_nr = 8,
++ .led_current = 50,
++ }
++};
++
++static struct lp5523_platform_data rx51_lp5523_platform_data = {
++ .led_config = rx51_lp5523_led_config,
++ .num_leds = 9,
++ .irq = OMAP_GPIO_IRQ(RX51_LP5523_IRQ_GPIO),
++ .chip_en = RX51_LP5523_CHIP_EN_GPIO,
++};
++#endif
++
+ static struct omap2_mcspi_device_config wl1251_mcspi_config = {
+ .turbo_mode = 0,
+ .single_channel = 1,
+@@ -886,6 +939,12 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
+ .platform_data = &rx51_tsl2563_platform_data,
+ },
+ #endif
++#if defined(CONFIG_LEDS_LP5523) || defined(CONFIG_LEDS_LP5523_MODULE)
++ {
++ I2C_BOARD_INFO("lp5523", 0x32),
++ .platform_data = &rx51_lp5523_platform_data,
++ },
++#endif
+ {
+ I2C_BOARD_INFO("tpa6130a2", 0x60),
+ .platform_data = &rx51_tpa6130a2_data,
+@@ -1219,6 +1278,33 @@ static void __init rx51_ssi_init(void)
+ hsi_register_board_info(rx51_ssi_cl, ARRAY_SIZE(rx51_ssi_cl));
+ }
+
++#if defined(CONFIG_LEDS_LP5523) || defined(CONFIG_LEDS_LP5523_MODULE)
++static void __init rx51_init_lp5523(void)
++{
++ int err;
++
++ err = gpio_request(RX51_LP5523_IRQ_GPIO, "lp5523 IRQ");
++ if (err < 0) {
++ pr_err("Unable to get lp5523 IRQ GPIO\n");
++ return;
++ }
++
++ err = gpio_request(RX51_LP5523_CHIP_EN_GPIO, "lp5523 CHIP EN");
++ if (err < 0) {
++ pr_err("Unable to get lp5523 CHIP EN GPIO\n");
++ gpio_free(RX51_LP5523_IRQ_GPIO);
++ return;
++ }
++
++ gpio_direction_input(RX51_LP5523_IRQ_GPIO);
++ gpio_direction_output(RX51_LP5523_CHIP_EN_GPIO, 1);
++}
++#else
++static inline void rx51_init_lp5523(void)
++{
++}
++#endif
++
+ void __init rx51_peripherals_init(void)
+ {
+ rx51_i2c_init();
+@@ -1234,5 +1320,5 @@ void __init rx51_peripherals_init(void)
+ spi_register_board_info(rx51_peripherals_spi_board_info,
+ ARRAY_SIZE(rx51_peripherals_spi_board_info));
+ omap2_hsmmc_init(mmc);
++ rx51_init_lp5523();
+ }
+-
+--
+1.7.0.4
+
++++++ series
--- series
+++ series
@@ -8,6 +8,7 @@
#
patch-2.6.35.2.bz2
+linux-2.6.35.2-hotfix.patch
#
# Patch to add a "nonintconfig" option to the Makefile
@@ -102,6 +103,10 @@
linux-2.6-omap3camera.patch
# TI dspbridge driver
linux-2.6.36-tidspbridge.patch
+# lp5523 led chip driver
+linux-2.6.37-leds-Add-lp5523-led-driver.patch
+# lp5523 platform data for rx51 board
+linux-2.6.37-omap3-rx51-Platform-support-for-lp5523-led-chip.patch
#
# End of the Nokia N900 patches
@@ -199,6 +204,7 @@
linux-2.6.33-vfs-tracepoints.patch
linux-2.6.33-ahci-alpm-accounting.patch
linux-2.6.35-rc4-annotate-device-pm.patch
+linux-2.6.36-powertop-timer-tracing.patch
#
# Fix the slab timer to not be a power hog
More information about the MeeGo-commits
mailing list