[meego-commits] 5396: Changes to Trunk:Testing/kernel
Arjan van de Ven
arjan at linux.intel.com
Wed Jul 7 16:26:24 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 #5396:
submit: devel:kernel/kernel(r50) -> Trunk:Testing/kernel
Message:
Move to -rc4, add some medfield drivers
State: new 2010-07-07T04:22:00 arjan
Comment: None
changes files:
--------------
--- kernel.changes
+++ kernel.changes
@@ -0,0 +1,14 @@
+* Wed Jul 07 2010 Arjan van de Ven <arjan at linux.intel.com> - 2.6.35-rc4
+- update to 2.6.35-rc4
+- refresh matching -ac patch
+ - add Synaptics Clearpad TM1217 controller driver
+ - add Avago APDS9802 ALS Sensor module driver
+ - graphics driver refresh
+- fix the x86 build up after Ameya
+
+* Tue Jul 06 2010 Ameya Palande <ameya.palande at nokia.com> - 2.6.35-rc3
+- Refresh N900 patches
+- Enable FM TX, headphone, tv-out, basic jack detection, ear piece and
+ headset support for N900
+- Fix wireless lan (wl1251_spi) module autoloading
+
old:
----
linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
linux-2.6.35-rc3-ac-20100629.patch
linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
patch-2.6.35-rc3.bz2
new:
----
linux-2.6-Earpiece-and-headset-support-for-N900.patch
linux-2.6-SGX-PVR-driver-for-N900.patch
linux-2.6.35-rc4-ac-20100707.patch
linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
patch-2.6.35-rc4.bz2
spec files:
-----------
--- kernel-aava.spec
+++ kernel-aava.spec
@@ -35,7 +35,7 @@
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
%if 0%{?rcrev}
@@ -208,7 +208,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc3-ac-20100629.patch
+Patch200: linux-2.6.35-rc4-ac-20100707.patch
#
# End of the Moorsetown architecture patches
@@ -224,22 +224,26 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
+# Hacks
+Patch300: linux-2.6-Hacks-for-Nokia-N900.patch
# Touch screen
-Patch300: linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+Patch301: linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
# GPU
-Patch301: linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+Patch302: linux-2.6-SGX-PVR-driver-for-N900.patch
# Bluetooth
-Patch302: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-# MADC (Battery Charging)
-Patch303: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
+Patch303: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
+# TWL4030 MADC (Battery Charging)
+Patch304: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
# Ambient light sensor
-Patch304: linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
-# Sound
-Patch305: linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
-# Hacks
-Patch306: linux-2.6-Hacks-for-Nokia-N900.patch
+Patch305: linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
# Accelerometer
-Patch307: linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+Patch306: linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+# FM TX, headphone, TV-out and basic jack detection
+Patch307: linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
+# Earpiece and headset support
+Patch308: linux-2.6-Earpiece-and-headset-support-for-N900.patch
+# Fixes
+Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
#
# End of the Nokia N900 patches
@@ -525,7 +529,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc3-ac-20100629.patch
+# linux-2.6.35-rc4-ac-20100707.patch
%patch200 -p1
#
@@ -542,30 +546,36 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
-# Touch screen
-# linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+# Hacks
+# linux-2.6-Hacks-for-Nokia-N900.patch
%patch300 -p1
-# GPU
-# linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+# Touch screen
+# linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
%patch301 -p1
+# GPU
+# linux-2.6-SGX-PVR-driver-for-N900.patch
+%patch302 -p1
# Bluetooth
# linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-%patch302 -p1
-# MADC (Battery Charging)
-# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch303 -p1
-# Ambient light sensor
-# linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
+# TWL4030 MADC (Battery Charging)
+# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch304 -p1
-# Sound
-# linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
+# Ambient light sensor
+# linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
%patch305 -p1
-# Hacks
-# linux-2.6-Hacks-for-Nokia-N900.patch
-%patch306 -p1
# Accelerometer
-# linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+# linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+%patch306 -p1
+# FM TX, headphone, TV-out and basic jack detection
+# linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
%patch307 -p1
+# Earpiece and headset support
+# linux-2.6-Earpiece-and-headset-support-for-N900.patch
+%patch308 -p1
+# Fixes
+# linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
+%patch309 -p1
#
# End of the Nokia N900 patches
--- kernel-ivi.spec
+++ kernel-ivi.spec
@@ -35,7 +35,7 @@
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
%if 0%{?rcrev}
@@ -208,7 +208,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc3-ac-20100629.patch
+Patch200: linux-2.6.35-rc4-ac-20100707.patch
#
# End of the Moorsetown architecture patches
@@ -224,22 +224,26 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
+# Hacks
+Patch300: linux-2.6-Hacks-for-Nokia-N900.patch
# Touch screen
-Patch300: linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+Patch301: linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
# GPU
-Patch301: linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+Patch302: linux-2.6-SGX-PVR-driver-for-N900.patch
# Bluetooth
-Patch302: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-# MADC (Battery Charging)
-Patch303: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
+Patch303: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
+# TWL4030 MADC (Battery Charging)
+Patch304: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
# Ambient light sensor
-Patch304: linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
-# Sound
-Patch305: linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
-# Hacks
-Patch306: linux-2.6-Hacks-for-Nokia-N900.patch
+Patch305: linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
# Accelerometer
-Patch307: linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+Patch306: linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+# FM TX, headphone, TV-out and basic jack detection
+Patch307: linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
+# Earpiece and headset support
+Patch308: linux-2.6-Earpiece-and-headset-support-for-N900.patch
+# Fixes
+Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
#
# End of the Nokia N900 patches
@@ -525,7 +529,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc3-ac-20100629.patch
+# linux-2.6.35-rc4-ac-20100707.patch
%patch200 -p1
#
@@ -542,30 +546,36 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
-# Touch screen
-# linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+# Hacks
+# linux-2.6-Hacks-for-Nokia-N900.patch
%patch300 -p1
-# GPU
-# linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+# Touch screen
+# linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
%patch301 -p1
+# GPU
+# linux-2.6-SGX-PVR-driver-for-N900.patch
+%patch302 -p1
# Bluetooth
# linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-%patch302 -p1
-# MADC (Battery Charging)
-# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch303 -p1
-# Ambient light sensor
-# linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
+# TWL4030 MADC (Battery Charging)
+# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch304 -p1
-# Sound
-# linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
+# Ambient light sensor
+# linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
%patch305 -p1
-# Hacks
-# linux-2.6-Hacks-for-Nokia-N900.patch
-%patch306 -p1
# Accelerometer
-# linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+# linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+%patch306 -p1
+# FM TX, headphone, TV-out and basic jack detection
+# linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
%patch307 -p1
+# Earpiece and headset support
+# linux-2.6-Earpiece-and-headset-support-for-N900.patch
+%patch308 -p1
+# Fixes
+# linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
+%patch309 -p1
#
# End of the Nokia N900 patches
--- kernel-n900.spec
+++ kernel-n900.spec
@@ -35,7 +35,7 @@
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
%if 0%{?rcrev}
@@ -208,7 +208,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc3-ac-20100629.patch
+Patch200: linux-2.6.35-rc4-ac-20100707.patch
#
# End of the Moorsetown architecture patches
@@ -224,22 +224,26 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
+# Hacks
+Patch300: linux-2.6-Hacks-for-Nokia-N900.patch
# Touch screen
-Patch300: linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+Patch301: linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
# GPU
-Patch301: linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+Patch302: linux-2.6-SGX-PVR-driver-for-N900.patch
# Bluetooth
-Patch302: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-# MADC (Battery Charging)
-Patch303: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
+Patch303: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
+# TWL4030 MADC (Battery Charging)
+Patch304: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
# Ambient light sensor
-Patch304: linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
-# Sound
-Patch305: linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
-# Hacks
-Patch306: linux-2.6-Hacks-for-Nokia-N900.patch
+Patch305: linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
# Accelerometer
-Patch307: linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+Patch306: linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+# FM TX, headphone, TV-out and basic jack detection
+Patch307: linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
+# Earpiece and headset support
+Patch308: linux-2.6-Earpiece-and-headset-support-for-N900.patch
+# Fixes
+Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
#
# End of the Nokia N900 patches
@@ -525,7 +529,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc3-ac-20100629.patch
+# linux-2.6.35-rc4-ac-20100707.patch
%patch200 -p1
#
@@ -542,30 +546,36 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
-# Touch screen
-# linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+# Hacks
+# linux-2.6-Hacks-for-Nokia-N900.patch
%patch300 -p1
-# GPU
-# linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+# Touch screen
+# linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
%patch301 -p1
+# GPU
+# linux-2.6-SGX-PVR-driver-for-N900.patch
+%patch302 -p1
# Bluetooth
# linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-%patch302 -p1
-# MADC (Battery Charging)
-# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch303 -p1
-# Ambient light sensor
-# linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
+# TWL4030 MADC (Battery Charging)
+# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch304 -p1
-# Sound
-# linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
+# Ambient light sensor
+# linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
%patch305 -p1
-# Hacks
-# linux-2.6-Hacks-for-Nokia-N900.patch
-%patch306 -p1
# Accelerometer
-# linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+# linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+%patch306 -p1
+# FM TX, headphone, TV-out and basic jack detection
+# linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
%patch307 -p1
+# Earpiece and headset support
+# linux-2.6-Earpiece-and-headset-support-for-N900.patch
+%patch308 -p1
+# Fixes
+# linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
+%patch309 -p1
#
# End of the Nokia N900 patches
--- kernel-netbook.spec
+++ kernel-netbook.spec
@@ -35,7 +35,7 @@
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
%if 0%{?rcrev}
@@ -208,7 +208,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc3-ac-20100629.patch
+Patch200: linux-2.6.35-rc4-ac-20100707.patch
#
# End of the Moorsetown architecture patches
@@ -224,22 +224,26 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
+# Hacks
+Patch300: linux-2.6-Hacks-for-Nokia-N900.patch
# Touch screen
-Patch300: linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+Patch301: linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
# GPU
-Patch301: linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+Patch302: linux-2.6-SGX-PVR-driver-for-N900.patch
# Bluetooth
-Patch302: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-# MADC (Battery Charging)
-Patch303: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
+Patch303: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
+# TWL4030 MADC (Battery Charging)
+Patch304: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
# Ambient light sensor
-Patch304: linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
-# Sound
-Patch305: linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
-# Hacks
-Patch306: linux-2.6-Hacks-for-Nokia-N900.patch
+Patch305: linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
# Accelerometer
-Patch307: linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+Patch306: linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+# FM TX, headphone, TV-out and basic jack detection
+Patch307: linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
+# Earpiece and headset support
+Patch308: linux-2.6-Earpiece-and-headset-support-for-N900.patch
+# Fixes
+Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
#
# End of the Nokia N900 patches
@@ -525,7 +529,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc3-ac-20100629.patch
+# linux-2.6.35-rc4-ac-20100707.patch
%patch200 -p1
#
@@ -542,30 +546,36 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
-# Touch screen
-# linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+# Hacks
+# linux-2.6-Hacks-for-Nokia-N900.patch
%patch300 -p1
-# GPU
-# linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+# Touch screen
+# linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
%patch301 -p1
+# GPU
+# linux-2.6-SGX-PVR-driver-for-N900.patch
+%patch302 -p1
# Bluetooth
# linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-%patch302 -p1
-# MADC (Battery Charging)
-# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch303 -p1
-# Ambient light sensor
-# linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
+# TWL4030 MADC (Battery Charging)
+# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch304 -p1
-# Sound
-# linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
+# Ambient light sensor
+# linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
%patch305 -p1
-# Hacks
-# linux-2.6-Hacks-for-Nokia-N900.patch
-%patch306 -p1
# Accelerometer
-# linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+# linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+%patch306 -p1
+# FM TX, headphone, TV-out and basic jack detection
+# linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
%patch307 -p1
+# Earpiece and headset support
+# linux-2.6-Earpiece-and-headset-support-for-N900.patch
+%patch308 -p1
+# Fixes
+# linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
+%patch309 -p1
#
# End of the Nokia N900 patches
--- kernel-shcdk.spec
+++ kernel-shcdk.spec
@@ -35,7 +35,7 @@
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
%if 0%{?rcrev}
@@ -208,7 +208,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc3-ac-20100629.patch
+Patch200: linux-2.6.35-rc4-ac-20100707.patch
#
# End of the Moorsetown architecture patches
@@ -224,22 +224,26 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
+# Hacks
+Patch300: linux-2.6-Hacks-for-Nokia-N900.patch
# Touch screen
-Patch300: linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+Patch301: linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
# GPU
-Patch301: linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+Patch302: linux-2.6-SGX-PVR-driver-for-N900.patch
# Bluetooth
-Patch302: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-# MADC (Battery Charging)
-Patch303: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
+Patch303: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
+# TWL4030 MADC (Battery Charging)
+Patch304: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
# Ambient light sensor
-Patch304: linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
-# Sound
-Patch305: linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
-# Hacks
-Patch306: linux-2.6-Hacks-for-Nokia-N900.patch
+Patch305: linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
# Accelerometer
-Patch307: linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+Patch306: linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+# FM TX, headphone, TV-out and basic jack detection
+Patch307: linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
+# Earpiece and headset support
+Patch308: linux-2.6-Earpiece-and-headset-support-for-N900.patch
+# Fixes
+Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
#
# End of the Nokia N900 patches
@@ -525,7 +529,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc3-ac-20100629.patch
+# linux-2.6.35-rc4-ac-20100707.patch
%patch200 -p1
#
@@ -542,30 +546,36 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
-# Touch screen
-# linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+# Hacks
+# linux-2.6-Hacks-for-Nokia-N900.patch
%patch300 -p1
-# GPU
-# linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+# Touch screen
+# linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
%patch301 -p1
+# GPU
+# linux-2.6-SGX-PVR-driver-for-N900.patch
+%patch302 -p1
# Bluetooth
# linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-%patch302 -p1
-# MADC (Battery Charging)
-# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch303 -p1
-# Ambient light sensor
-# linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
+# TWL4030 MADC (Battery Charging)
+# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch304 -p1
-# Sound
-# linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
+# Ambient light sensor
+# linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
%patch305 -p1
-# Hacks
-# linux-2.6-Hacks-for-Nokia-N900.patch
-%patch306 -p1
# Accelerometer
-# linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+# linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+%patch306 -p1
+# FM TX, headphone, TV-out and basic jack detection
+# linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
%patch307 -p1
+# Earpiece and headset support
+# linux-2.6-Earpiece-and-headset-support-for-N900.patch
+%patch308 -p1
+# Fixes
+# linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
+%patch309 -p1
#
# End of the Nokia N900 patches
--- kernel.spec
+++ kernel.spec
@@ -35,7 +35,7 @@
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
%if 0%{?rcrev}
@@ -221,7 +221,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc3-ac-20100629.patch
+Patch200: linux-2.6.35-rc4-ac-20100707.patch
#
# End of the Moorsetown architecture patches
@@ -237,22 +237,26 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
+# Hacks
+Patch300: linux-2.6-Hacks-for-Nokia-N900.patch
# Touch screen
-Patch300: linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+Patch301: linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
# GPU
-Patch301: linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+Patch302: linux-2.6-SGX-PVR-driver-for-N900.patch
# Bluetooth
-Patch302: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-# MADC (Battery Charging)
-Patch303: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
+Patch303: linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
+# TWL4030 MADC (Battery Charging)
+Patch304: linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
# Ambient light sensor
-Patch304: linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
-# Sound
-Patch305: linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
-# Hacks
-Patch306: linux-2.6-Hacks-for-Nokia-N900.patch
+Patch305: linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
# Accelerometer
-Patch307: linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+Patch306: linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+# FM TX, headphone, TV-out and basic jack detection
+Patch307: linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
+# Earpiece and headset support
+Patch308: linux-2.6-Earpiece-and-headset-support-for-N900.patch
+# Fixes
+Patch309: linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
#
# End of the Nokia N900 patches
@@ -573,7 +577,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc3-ac-20100629.patch
+# linux-2.6.35-rc4-ac-20100707.patch
%patch200 -p1
#
@@ -590,30 +594,36 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
-# Touch screen
-# linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+# Hacks
+# linux-2.6-Hacks-for-Nokia-N900.patch
%patch300 -p1
-# GPU
-# linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+# Touch screen
+# linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
%patch301 -p1
+# GPU
+# linux-2.6-SGX-PVR-driver-for-N900.patch
+%patch302 -p1
# Bluetooth
# linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-%patch302 -p1
-# MADC (Battery Charging)
-# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch303 -p1
-# Ambient light sensor
-# linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
+# TWL4030 MADC (Battery Charging)
+# linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
%patch304 -p1
-# Sound
-# linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
+# Ambient light sensor
+# linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
%patch305 -p1
-# Hacks
-# linux-2.6-Hacks-for-Nokia-N900.patch
-%patch306 -p1
# Accelerometer
-# linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+# linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+%patch306 -p1
+# FM TX, headphone, TV-out and basic jack detection
+# linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
%patch307 -p1
+# Earpiece and headset support
+# linux-2.6-Earpiece-and-headset-support-for-N900.patch
+%patch308 -p1
+# Fixes
+# linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
+%patch309 -p1
#
# End of the Nokia N900 patches
other changes:
--------------
++++++ config-generic
--- config-generic
+++ config-generic
@@ -3437,7 +3437,7 @@
# CONFIG_HID_PICOLCD_LEDS is not set
# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set
CONFIG_INTEL_SCU_IPC_UTIL=y
-CONFIG_PVR_RELEASE="release"
+CONFIG_PVR_RELEASE=y
CONFIG_PVR_SERVICES4=y
CONFIG_PVR_XOPEN_SOURCE=600
CONFIG_PVR2D_VALIDATE_INPUT_PARAMS=y
@@ -3494,3 +3494,5 @@
# CONFIG_SPI_INTEL_MID_SSP is not set
CONFIG_CAIF_SPI_SLAVE=y
CONFIG_CAIF_SPI_SYNC=y
+# CONFIG_APDS9802ALS is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
++++++ config-mrst
--- config-mrst
+++ config-mrst
@@ -138,3 +138,14 @@
CONFIG_ISL29020=y
CONFIG_SPI_INTEL_MID_SSP=y
CONFIG_PVR_RELEASE="release"
+CONFIG_APDS9802ALS=y
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=y
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_FILE_STORAGE=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_MULTI=m
+# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_G_MULTI_RNDIS is not set
+# CONFIG_USB_G_MULTI_CDC is not set
+
++++++ kernel.spec.in
--- kernel.spec.in
+++ kernel.spec.in
@@ -35,7 +35,7 @@
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-%define rcrev 3
+%define rcrev 4
%if 0%{?rcrev}
++++++ linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
--- linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
+++ linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
@@ -1,7 +1,7 @@
-From ec4e22802371ead6ae6163f2a84ffa30f8b01d37 Mon Sep 17 00:00:00 2001
+From cd320710da1ab5b340bff78311fa492f9ff9b9c6 Mon Sep 17 00:00:00 2001
From: Ville Tervo <ville.tervo at nokia.com>
Date: Fri, 9 Apr 2010 11:56:16 +0300
-Subject: [PATCH 3/8] Bluetooth: Support for n900 bluetooth hardware
+Subject: [PATCH 04/11] Bluetooth: Support for n900 bluetooth hardware
Adds support for N900 bluetooth hardware
++++++ linux-2.6-Earpiece-and-headset-support-for-N900.patch (new)
--- linux-2.6-Earpiece-and-headset-support-for-N900.patch
+++ linux-2.6-Earpiece-and-headset-support-for-N900.patch
+From 3a00b962f5d60f67b0c447a47ed173d8826ffa0b Mon Sep 17 00:00:00 2001
+From: Jarkko Nikula <jhnikula at gmail.com>
+Date: Tue, 29 Jun 2010 14:44:50 +0300
+Subject: [PATCH 09/11] Earpiece and headset support for N900
+
+This patch is combination of following patches:
+
+1. ASoC: RX-51: Add aic34b_dummy driver only for the RX-51
+
+Only purpose of this dummy driver is to support a few audio connections
+on Nokia RX-51/N900 HW. Currently ASoC framework supports only single audio
+codec per card. The RX-51 has two of them since the TLV320AIC34 audio codec
+used in RX-51 integrates basically two TLV320AIC33 codecs into a same chip.
+These instances are called as AIC34A and AIC34B. The AIC34A is used as an
+audio codec and the AIC34B is used kind of audio amplifier and mic bias
+driver.
+
+Ideally features of this driver are supported by the tlv320aic3x codec
+driver but as only single instance of it can exist currently, this driver
+registers needed features as additional controls and widgets for the card.
+
+This driver should vanish as soon as the ASoC multi-component framework
+maturises and gets integrated into mainline.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+2. omap: rx51: Add second instance of the TLV320AIC34 codec
+
+TLV320AIC34 integrates basically two TLV320AIC33 audio codecs. The AIC34A
+is found from I2C address 0x18 and AIC34B from 0x19.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+3. ASoC: RX-51: Add support for earpiece
+
+Earpiece is connected to HPL pins of the second TLV320AIC34 codec instance.
+Audio routings between AIC34A, AIC34B and earpiece is following
+
+ AIC34A MONO_LOUT -> AIC34B LINE2R -> AIC34B HPL -> earpiece
+
+Add support for this routing by using the aic34b_dummy driver.
+
+As the aic34b_dummy should vanish after the ASoC multi-component is ready,
+also this patch must be edited by modifying the audio_map accordingly.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+4. ASoC: RX-51: Add mic input to AV jack
+
+Mic input is connected to LINE1L of the AIC34A via ECI_SW2 (name took from
+the Maemo 2.6.28 kernel sources) switch. This patch adds the headset feature
+to AV jack. Headset is combination of headphone stereo output with mic
+input.
+
+This patch doesn't drive the mic bias so signal will be too weak to be
+usable. The mic bias feature will be introduced by another patch.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+5. SoC: RX-51: Add route for AIC34B generated mic bias
+
+This patch adds support for headset mic bias by using a feature provided
+by the aic34b_dummy driver.
+
+As the aic34b_dummy should vanish after the ASoC multi-component is ready,
+also this patch must be edited by modifying the audio_map accordingly.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+---
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 3 +
+ sound/soc/omap/Makefile | 2 +-
+ sound/soc/omap/aic34b_dummy.c | 260 ++++++++++++++++++++++++++
+ sound/soc/omap/aic34b_dummy.h | 29 +++
+ sound/soc/omap/rx51.c | 62 ++++++-
+ 5 files changed, 353 insertions(+), 3 deletions(-)
+ create mode 100644 sound/soc/omap/aic34b_dummy.c
+ create mode 100644 sound/soc/omap/aic34b_dummy.h
+
+diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
+index 0aab1a0..0d98752 100644
+--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
++++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
+@@ -853,6 +853,9 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
+ I2C_BOARD_INFO("tlv320aic3x", 0x18),
+ .platform_data = &rx51_aic3x_data,
+ },
++ {
++ I2C_BOARD_INFO("aic34b_dummy", 0x19),
++ },
+ #if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)
+ {
+ I2C_BOARD_INFO("tsl2563", 0x29),
+diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
+index ba9fc65..0a7374f 100644
+--- a/sound/soc/omap/Makefile
++++ b/sound/soc/omap/Makefile
+@@ -24,7 +24,7 @@ snd-soc-zoom2-objs := zoom2.o
+ snd-soc-igep0020-objs := igep0020.o
+
+ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
+-obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o
++obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o aic34b_dummy.o
+ obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o
+ obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o
+ obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o
+diff --git a/sound/soc/omap/aic34b_dummy.c b/sound/soc/omap/aic34b_dummy.c
+new file mode 100644
+index 0000000..bace5fc
+--- /dev/null
++++ b/sound/soc/omap/aic34b_dummy.c
+@@ -0,0 +1,260 @@
++/*
++ * aic34b_dummy.c -- Dummy driver for AIC34 block B parts used in Nokia RX51
++ *
++ * Purpose for this driver is to cover few audio connections on Nokia RX51 HW
++ * which are connected into block B of TLV320AIC34 dual codec.
++ *
++ * Copyright (C) 2008 Nokia Corporation
++ *
++ * 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
++ *
++ * TODO:
++ * - Get rid of this driver, at least when ASoC multi-component is merged into
++ * mainline.
++ * This driver is hacked only for Nokia RX51 HW.
++ */
++
++#include <linux/module.h>
++#include <linux/errno.h>
++#include <linux/device.h>
++#include <linux/i2c.h>
++#include <sound/soc.h>
++#include <sound/soc-dapm.h>
++#include <sound/tlv.h>
++
++#include "../codecs/tlv320aic3x.h"
++
++struct i2c_client *aic34b_client;
++
++static int aic34b_read(struct i2c_client *client, unsigned int reg)
++{
++ int val;
++
++ val = i2c_smbus_read_byte_data(client, reg);
++
++ return val;
++}
++
++static int aic34b_write(struct i2c_client *client, unsigned int reg,
++ u8 value)
++{
++ u8 data[2];
++
++ data[0] = reg & 0xff;
++ data[1] = value & 0xff;
++
++ return (i2c_master_send(client, data, 2) == 2) ? 0 : -EIO;
++}
++
++static int aic34b_get_volsw(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct soc_mixer_control *mc =
++ (struct soc_mixer_control *)kcontrol->private_value;
++ unsigned int reg = mc->reg;
++ unsigned int shift = mc->shift;
++ int max = mc->max;
++ unsigned int mask = (1 << fls(max)) - 1;
++ unsigned int invert = mc->invert;
++ int val;
++
++ if (aic34b_client == NULL)
++ return 0;
++
++ val = (aic34b_read(aic34b_client, reg) >> shift) & mask;
++ if (invert)
++ val = max - val;
++ ucontrol->value.integer.value[0] = val;
++
++ return 0;
++}
++
++static int aic34b_put_volsw(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct soc_mixer_control *mc =
(379 more lines skipped)
++++++ linux-2.6-Hacks-for-Nokia-N900.patch
--- linux-2.6-Hacks-for-Nokia-N900.patch
+++ linux-2.6-Hacks-for-Nokia-N900.patch
@@ -1,22 +1,28 @@
-1. OMAP2/3 clock: implement clock rate/parent change notifiers
+From df0b24d1e5fcb0a409debf3f9f1fcfd32f6cb2e8 Mon Sep 17 00:00:00 2001
+From: Felipe Balbi <felipe.balbi at nokia.com>
+Date: Mon, 4 Jan 2010 15:05:37 +0200
+Subject: [PATCH 01/11] Hacks for Nokia N900
- Signed-off-by: Paul Walmsley <paul at pwsan.com>
- Signed-off-by: Tero Kristo <tero.kristo at nokia.com>
+This patch is combination of following hacks:
-2. PM: export clk_notifier_{register/unregister}
- PM: export omap_pm_set_min_bus_tput
+1. usb: musb: add mA and charger sysfs entries
- Signed-off-by: Imre Deak <imre.deak at nokia.com>
- Signed-off-by: Roger Quadros <roger.quadros at nokia.com>
+ This is the same mA entry and charger entry used in Fremantle program.
+ We are adding it as __deprecated because it will change and this is
+ done just for us to be able to test USB charging funtionality.
-3. usb: musb: add mA and charger sysfs entries
+ One difference from Fremantle is that we now issue
+ sysfs_notify() when that value changes.
Signed-off-by: Felipe Balbi <felipe.balbi at nokia.com>
Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
-4. usb: musb: suspend notification only when needed
- usb: musb: Notify sysfs on suspend
- usb: musb: fix build with MUSB Host only mode
+2. usb: musb: add suspend sysfs entry
+
+ This patch is combination of following patches:
+ 1. usb: musb: suspend notification only when needed
+ 2. usb: musb: Notify sysfs on suspend
+ 3. usb: musb: fix build with MUSB Host only mode
Signed-off-by: Niilo Minkkinen <ext-niilo.1.minkkinen at nokia.com>
Signed-off-by: Heikki Krogerus <ext-heikki.krogerus at nokia.com>
@@ -25,9 +31,81 @@
Signed-off-by: Jouni Hogander <jouni.hogander at nokia.com>
Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
-5. usb: otg: add detect_charger field to otg_transceiver
+3. usb: otg: add detect_charger field to otg_transceiver
+
+ Then we can allow musb to kick charger detection on transceiver.
+ This is added as __deprecated because it only exists to mimic
+ the behavior we had in Fremantle.
Signed-off-by: Felipe Balbi <felipe.balbi at nokia.com>
+
+4. OMAP2/3 clock: implement clock rate/parent change notifiers
+
+ Patch-Mainline: Not sure
+
+ This patch allows core code and driver code to register for
+ notification when a clock's rate or parent changes. These are useful
+ because drivers don't have exclusive control over a clock's rate:
+ power management code (e.g., CPUFreq) may cause rate changes across
+ large parts of the clock tree.
+
+ There are three notifier messages:
+
+ 1. a pre-change notifier, called before the change;
+
+ 2. a post-change notifier, called after the change; and
+
+ 3. an abort notifier, called if the change fails for any reason after
+ the pre-change notifier callbacks have run.
+
+ Since the implementation uses a blocking notifier, notifier code may
+ block waiting for devices to quiesce; but long delays here will reduce
+ the effectiveness of DVFS. Since notifier callbacks are called with
+ clocks_mutex held, callback code must not re-enter the clock framework.
+
+ Pre-change notifiers are passed the current clock rate and the
+ post-change notifiers the new clock rate. The notifiers are called even
+ if the clock rate is the same before and after the change. This is
+ because reprogramming a clock's parent or rate may briefly disrupt the
+ clock.
+
+ There are likely to be few users of these notifiers, compared to the
+ total number of clocks. So, rather than storing one notifier per
+ struct clk, notifiers are stored in a separate, dynamically allocated
+ list, effectively trading execution speed (in terms of a sequential
+ scan of the notifier list) for memory savings. The implementation is
+ completely hidden from the callbacks and can be easily changed.
+
+ Until prototypes for these functions are made available in
+ include/linux/clk.h, drivers should pass function pointers to
+ clk_notifier_register() and clk_notifier_unregister() via their
+ platform_data struct.
+
+ This patch is a collaboration between Tero Kristo
+ <tero.kristo at nokia.com> and Paul Walmsley <paul at pwsan.com> and several
+ others. Hiroshi Doyu <Hiroshi.DOYU at nokia.com> tracked down and fixed a
+ bug where blocking_notifier_chain_*() were called while interrupts
+ were disabled. Nishanth Menon <nm at ti.com> found and fixed a bug in
+ the clk_notifier_unregister() path, where a list_del() was missing.
+ And thanks to Jouni Hogander <jouni.hogander at nokia.com> for comments
+ and review during the evolution of these patches.
+
+ Signed-off-by: Paul Walmsley <paul at pwsan.com>
+ Signed-off-by: Tero Kristo <tero.kristo at nokia.com>
+
+5. PM: export missing symbols
+
+ Patch-Mainline: never as this is a temporary hack
+
+ Needed by the PVR driver.
+
+ This patch is combined version of the following patches
+
+ 1. PM: export clk_notifier_{register/unregister}
+ 2. PM: export omap_pm_set_min_bus_tput
+
+ Signed-off-by: Imre Deak <imre.deak at nokia.com>
+ Signed-off-by: Roger Quadros <roger.quadros at nokia.com>
---
arch/arm/plat-omap/clock.c | 208 +++++++++++++++++++++++++++++++
arch/arm/plat-omap/include/plat/clock.h | 63 +++++++++-
@@ -38,10 +116,10 @@
include/linux/usb/otg.h | 11 ++
7 files changed, 339 insertions(+), 2 deletions(-)
-Index: linux-2.6.34/arch/arm/plat-omap/clock.c
-===================================================================
---- linux-2.6.34.orig/arch/arm/plat-omap/clock.c
-+++ linux-2.6.34/arch/arm/plat-omap/clock.c
+diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
+index 7190cbd..f17e433 100644
+--- a/arch/arm/plat-omap/clock.c
++++ b/arch/arm/plat-omap/clock.c
@@ -21,6 +21,7 @@
#include <linux/cpufreq.h>
#include <linux/debugfs.h>
@@ -129,7 +207,7 @@
/*
* Standard clock functions defined in include/linux/clk.h
-@@ -115,10 +188,16 @@ int clk_set_rate(struct clk *clk, unsign
+@@ -115,10 +188,16 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
{
unsigned long flags;
int ret = -EINVAL;
@@ -146,7 +224,7 @@
spin_lock_irqsave(&clockfw_lock, flags);
if (arch_clock->clk_set_rate)
ret = arch_clock->clk_set_rate(clk, rate);
-@@ -129,6 +208,12 @@ int clk_set_rate(struct clk *clk, unsign
+@@ -129,6 +208,12 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
}
spin_unlock_irqrestore(&clockfw_lock, flags);
@@ -159,7 +237,7 @@
return ret;
}
EXPORT_SYMBOL(clk_set_rate);
-@@ -137,10 +222,16 @@ int clk_set_parent(struct clk *clk, stru
+@@ -137,10 +222,16 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
{
unsigned long flags;
int ret = -EINVAL;
@@ -176,7 +254,7 @@
spin_lock_irqsave(&clockfw_lock, flags);
if (clk->usecount == 0) {
if (arch_clock->clk_set_parent)
-@@ -154,6 +245,12 @@ int clk_set_parent(struct clk *clk, stru
+@@ -154,6 +245,12 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
ret = -EBUSY;
spin_unlock_irqrestore(&clockfw_lock, flags);
@@ -189,7 +267,7 @@
return ret;
}
EXPORT_SYMBOL(clk_set_parent);
-@@ -384,9 +481,120 @@ void clk_exit_cpufreq_table(struct cpufr
+@@ -384,9 +481,120 @@ void clk_exit_cpufreq_table(struct cpufreq_frequency_table **table)
}
#endif
@@ -310,10 +388,10 @@
#ifdef CONFIG_OMAP_RESET_CLOCKS
/*
-Index: linux-2.6.34/arch/arm/plat-omap/include/plat/clock.h
-===================================================================
---- linux-2.6.34.orig/arch/arm/plat-omap/include/plat/clock.h
-+++ linux-2.6.34/arch/arm/plat-omap/include/plat/clock.h
+diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h
+index dfc472c..2f584c8 100644
+--- a/arch/arm/plat-omap/include/plat/clock.h
++++ b/arch/arm/plat-omap/include/plat/clock.h
@@ -15,6 +15,8 @@
#include <linux/list.h>
(124 more lines skipped)
++++++ linux-2.6-SGX-PVR-driver-for-N900.patch (new)
--- linux-2.6-SGX-PVR-driver-for-N900.patch
+++ linux-2.6-SGX-PVR-driver-for-N900.patch
+From 63e4a840772ffd345209792ff8e742218111d2c8 Mon Sep 17 00:00:00 2001
+From: Roger Quadros <roger.quadros at nokia.com>
+Date: Tue, 6 Apr 2010 16:35:41 +0300
+Subject: [PATCH 03/11] SGX PVR driver for N900
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch is combination of following patches:
+
+1. gpu: pvr: Add PVR GPU driver
+
+Patch-Mainline: not sure
+Add the SGX PVR driver.
+
+Signed-off-by: Imre Deak <imre.deak at nokia.com>
+Signed-off-by: Felipe Balbi <felipe.balbi at nokia.com>
+Signed-off-by: Topi Pohjolainen <topi.pohjolainen at nokia.com>
+Signed-off-by: Ville Syrjälä <ville.syrjala at nokia.com>
+Signed-off-by: Mark Underwood <mark.underwood at imgtec.com>
+Signed-off-by: Phil Carmody <ext-phil.2.carmody at nokia.com>
+Signed-off-by: Tomi Valkeinen <tomi.valkeinen at nokia.com>
+Signed-off-by: Sami Kyöstilä <sami.kyostila at nokia.com>
+Signed-off-by: Mark Riding <mark.riding at imgtec.com>
+Signed-off-by: Janusz Sobczak <janusz.sobczak at imgtec.com>
+Signed-off-by: Roger Quadros <roger.quadros at nokia.com>
+
+2. gpu: pvr: compilation fixes for kernel > 2.6.33
+
+Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
+---
+ drivers/gpu/Makefile | 2 +-
+ drivers/gpu/pvr/COPYING | 351 +++
+ drivers/gpu/pvr/Kconfig | 46 +
+ drivers/gpu/pvr/Makefile | 43 +
+ drivers/gpu/pvr/README | 27 +
+ drivers/gpu/pvr/bridged_pvr_bridge.c | 3341 +++++++++++++++++++++++++
+ drivers/gpu/pvr/bridged_pvr_bridge.h | 157 ++
+ drivers/gpu/pvr/bridged_sgx_bridge.c | 1813 ++++++++++++++
+ drivers/gpu/pvr/bridged_sgx_bridge.h | 167 ++
+ drivers/gpu/pvr/bridged_support.c | 77 +
+ drivers/gpu/pvr/bridged_support.h | 35 +
+ drivers/gpu/pvr/buffer_manager.c | 1486 +++++++++++
+ drivers/gpu/pvr/buffer_manager.h | 169 ++
+ drivers/gpu/pvr/bufferclass_example.c | 266 ++
+ drivers/gpu/pvr/bufferclass_example.h | 104 +
+ drivers/gpu/pvr/bufferclass_example_linux.c | 202 ++
+ drivers/gpu/pvr/bufferclass_example_linux.h | 46 +
+ drivers/gpu/pvr/bufferclass_example_private.c | 194 ++
+ drivers/gpu/pvr/bufferclass_example_private.h | 33 +
+ drivers/gpu/pvr/dbgdrvif.h | 318 +++
+ drivers/gpu/pvr/device.h | 186 ++
+ drivers/gpu/pvr/deviceclass.c | 1522 +++++++++++
+ drivers/gpu/pvr/devicemem.c | 1150 +++++++++
+ drivers/gpu/pvr/env_data.h | 57 +
+ drivers/gpu/pvr/env_perproc.h | 51 +
+ drivers/gpu/pvr/event.c | 270 ++
+ drivers/gpu/pvr/event.h | 35 +
+ drivers/gpu/pvr/handle.c | 1443 +++++++++++
+ drivers/gpu/pvr/handle.h | 150 ++
+ drivers/gpu/pvr/hash.c | 382 +++
+ drivers/gpu/pvr/hash.h | 51 +
+ drivers/gpu/pvr/img_defs.h | 46 +
+ drivers/gpu/pvr/img_types.h | 69 +
+ drivers/gpu/pvr/ioctldef.h | 93 +
+ drivers/gpu/pvr/kernelbuffer.h | 55 +
+ drivers/gpu/pvr/kerneldisplay.h | 104 +
+ drivers/gpu/pvr/lock.h | 31 +
+ drivers/gpu/pvr/mem.c | 130 +
+ drivers/gpu/pvr/mm.c | 1501 +++++++++++
+ drivers/gpu/pvr/mm.h | 267 ++
+ drivers/gpu/pvr/mmap.c | 922 +++++++
+ drivers/gpu/pvr/mmap.h | 74 +
+ drivers/gpu/pvr/mmu.c | 1442 +++++++++++
+ drivers/gpu/pvr/mmu.h | 85 +
+ drivers/gpu/pvr/module.c | 304 +++
+ drivers/gpu/pvr/mutex.h | 36 +
+ drivers/gpu/pvr/mutils.h | 37 +
+ drivers/gpu/pvr/ocpdefs.h | 294 +++
+ drivers/gpu/pvr/oemfuncs.h | 41 +
+ drivers/gpu/pvr/omaplfb.h | 140 +
+ drivers/gpu/pvr/omaplfb_displayclass.c | 852 +++++++
+ drivers/gpu/pvr/omaplfb_linux.c | 168 ++
+ drivers/gpu/pvr/osfunc.c | 1585 ++++++++++++
+ drivers/gpu/pvr/osfunc.h | 232 ++
+ drivers/gpu/pvr/osperproc.c | 84 +
+ drivers/gpu/pvr/osperproc.h | 36 +
+ drivers/gpu/pvr/pb.c | 419 ++++
+ drivers/gpu/pvr/pdump.c | 1271 ++++++++++
+ drivers/gpu/pvr/pdump_common.c | 237 ++
+ drivers/gpu/pvr/pdump_km.h | 268 ++
+ drivers/gpu/pvr/pdumpdefs.h | 92 +
+ drivers/gpu/pvr/perproc.c | 266 ++
+ drivers/gpu/pvr/perproc.h | 79 +
+ drivers/gpu/pvr/power.c | 628 +++++
+ drivers/gpu/pvr/power.h | 104 +
+ drivers/gpu/pvr/private_data.h | 35 +
+ drivers/gpu/pvr/proc.c | 421 ++++
+ drivers/gpu/pvr/proc.h | 54 +
+ drivers/gpu/pvr/pvr_bridge.h | 1107 ++++++++
+ drivers/gpu/pvr/pvr_bridge_k.c | 191 ++
+ drivers/gpu/pvr/pvr_bridge_km.h | 190 ++
+ drivers/gpu/pvr/pvr_debug.c | 353 +++
+ drivers/gpu/pvr/pvr_debug.h | 110 +
+ drivers/gpu/pvr/pvrconfig.h | 36 +
+ drivers/gpu/pvr/pvrmmap.h | 36 +
+ drivers/gpu/pvr/pvrmodule.h | 31 +
+ drivers/gpu/pvr/pvrsrv.c | 906 +++++++
+ drivers/gpu/pvr/pvrversion.h | 37 +
+ drivers/gpu/pvr/queue.c | 828 ++++++
+ drivers/gpu/pvr/queue.h | 81 +
+ drivers/gpu/pvr/ra.c | 1163 +++++++++
+ drivers/gpu/pvr/ra.h | 107 +
+ drivers/gpu/pvr/resman.c | 540 ++++
+ drivers/gpu/pvr/resman.h | 92 +
+ drivers/gpu/pvr/services.h | 237 ++
+ drivers/gpu/pvr/services_headers.h | 42 +
+ drivers/gpu/pvr/servicesext.h | 435 ++++
+ drivers/gpu/pvr/servicesint.h | 173 ++
+ drivers/gpu/pvr/sgx530defs.h | 471 ++++
+ drivers/gpu/pvr/sgx_bridge.h | 388 +++
+ drivers/gpu/pvr/sgx_bridge_km.h | 109 +
+ drivers/gpu/pvr/sgx_options.h | 178 ++
+ drivers/gpu/pvr/sgxapi_km.h | 237 ++
+ drivers/gpu/pvr/sgxconfig.h | 75 +
+ drivers/gpu/pvr/sgxcoretypes.h | 41 +
+ drivers/gpu/pvr/sgxdefs.h | 38 +
+ drivers/gpu/pvr/sgxerrata.h | 34 +
+ drivers/gpu/pvr/sgxfeaturedefs.h | 40 +
+ drivers/gpu/pvr/sgxinfo.h | 338 +++
+ drivers/gpu/pvr/sgxinfokm.h | 262 ++
+ drivers/gpu/pvr/sgxinit.c | 1622 ++++++++++++
+ drivers/gpu/pvr/sgxkick.c | 504 ++++
+ drivers/gpu/pvr/sgxmmu.h | 57 +
+ drivers/gpu/pvr/sgxpower.c | 398 +++
+ drivers/gpu/pvr/sgxreset.c | 223 ++
+ drivers/gpu/pvr/sgxscript.h | 65 +
+ drivers/gpu/pvr/sgxtransfer.c | 290 +++
+ drivers/gpu/pvr/sgxutils.c | 750 ++++++
+ drivers/gpu/pvr/sgxutils.h | 77 +
+ drivers/gpu/pvr/srvkm.h | 50 +
+ drivers/gpu/pvr/syscommon.h | 179 ++
+ drivers/gpu/pvr/sysconfig.c | 818 ++++++
+ drivers/gpu/pvr/sysconfig.h | 53 +
+ drivers/gpu/pvr/sysinfo.h | 94 +
+ drivers/gpu/pvr/syslocal.h | 98 +
+ drivers/gpu/pvr/sysutils.c | 719 ++++++
+ drivers/gpu/pvr/tools/Makefile | 29 +
+ drivers/gpu/pvr/tools/dbgdriv.c | 1652 ++++++++++++
+ drivers/gpu/pvr/tools/dbgdriv.h | 183 ++
+ drivers/gpu/pvr/tools/hostfunc.c | 267 ++
+ drivers/gpu/pvr/tools/hostfunc.h | 58 +
+ drivers/gpu/pvr/tools/hotkey.c | 101 +
+ drivers/gpu/pvr/tools/hotkey.h | 60 +
+ drivers/gpu/pvr/tools/ioctl.c | 399 +++
+ drivers/gpu/pvr/tools/ioctl.h | 81 +
+ drivers/gpu/pvr/tools/linuxsrv.h | 47 +
+ drivers/gpu/pvr/tools/main.c | 197 ++
+ drivers/video/Kconfig | 2 +
+ include/video/sgx-util.h | 64 +
+ 129 files changed, 44718 insertions(+), 1 deletions(-)
+ create mode 100644 drivers/gpu/pvr/COPYING
+ create mode 100644 drivers/gpu/pvr/Kconfig
+ create mode 100644 drivers/gpu/pvr/Makefile
+ create mode 100644 drivers/gpu/pvr/README
+ create mode 100644 drivers/gpu/pvr/bridged_pvr_bridge.c
+ create mode 100644 drivers/gpu/pvr/bridged_pvr_bridge.h
+ create mode 100644 drivers/gpu/pvr/bridged_sgx_bridge.c
+ create mode 100644 drivers/gpu/pvr/bridged_sgx_bridge.h
+ create mode 100644 drivers/gpu/pvr/bridged_support.c
+ create mode 100644 drivers/gpu/pvr/bridged_support.h
+ create mode 100644 drivers/gpu/pvr/buffer_manager.c
+ create mode 100644 drivers/gpu/pvr/buffer_manager.h
+ create mode 100644 drivers/gpu/pvr/bufferclass_example.c
+ create mode 100644 drivers/gpu/pvr/bufferclass_example.h
+ create mode 100644 drivers/gpu/pvr/bufferclass_example_linux.c
+ create mode 100644 drivers/gpu/pvr/bufferclass_example_linux.h
+ create mode 100644 drivers/gpu/pvr/bufferclass_example_private.c
+ create mode 100644 drivers/gpu/pvr/bufferclass_example_private.h
+ create mode 100644 drivers/gpu/pvr/dbgdrvif.h
+ create mode 100644 drivers/gpu/pvr/device.h
+ create mode 100644 drivers/gpu/pvr/deviceclass.c
+ create mode 100644 drivers/gpu/pvr/devicemem.c
+ create mode 100644 drivers/gpu/pvr/env_data.h
+ create mode 100644 drivers/gpu/pvr/env_perproc.h
+ create mode 100644 drivers/gpu/pvr/event.c
+ create mode 100644 drivers/gpu/pvr/event.h
+ create mode 100644 drivers/gpu/pvr/handle.c
+ create mode 100644 drivers/gpu/pvr/handle.h
+ create mode 100644 drivers/gpu/pvr/hash.c
+ create mode 100644 drivers/gpu/pvr/hash.h
+ create mode 100644 drivers/gpu/pvr/img_defs.h
+ create mode 100644 drivers/gpu/pvr/img_types.h
+ create mode 100644 drivers/gpu/pvr/ioctldef.h
+ create mode 100644 drivers/gpu/pvr/kernelbuffer.h
+ create mode 100644 drivers/gpu/pvr/kerneldisplay.h
+ create mode 100644 drivers/gpu/pvr/lock.h
+ create mode 100644 drivers/gpu/pvr/mem.c
(45591 more lines skipped)
++++++ linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
--- linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
+++ linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
@@ -1,7 +1,7 @@
-From 921a23bfff4449240b3a789e2f950865c4ed85d1 Mon Sep 17 00:00:00 2001
+From d8e8a44e5c44c88f9b0b8b542f86c9cce1e8dccc Mon Sep 17 00:00:00 2001
From: Mikko Ylinen <mikko.k.ylinen at nokia.com>
Date: Fri, 9 Apr 2010 12:20:52 +0300
-Subject: [PATCH] mfd: twl4030: Driver for twl4030 madc module
+Subject: [PATCH 05/11] mfd: twl4030: Driver for twl4030 madc module
This ADC allows monitoring of analog signals such as battery levels,
temperatures, etc.
@@ -9,19 +9,22 @@
Several people have contributed to this driver on the linux-omap list.
Signed-off-by: Amit Kucheria <amit.kucheria at verdurent.com>
+Signed-off-by: Tuukka Tikkanen <tuukka.tikkanen at nokia.com>
Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
---
- drivers/mfd/Kconfig | 21 +
- drivers/mfd/Makefile | 3
- drivers/mfd/twl4030-madc.c | 549 +++++++++++++++++++++++++++++++++++++++
- include/linux/i2c/twl4030-madc.h | 126 ++++++++
- 4 files changed, 698 insertions(+), 1 deletion(-)
+ drivers/mfd/Kconfig | 21 ++
+ drivers/mfd/Makefile | 3 +-
+ drivers/mfd/twl4030-madc.c | 549 ++++++++++++++++++++++++++++++++++++++
+ include/linux/i2c/twl4030-madc.h | 126 +++++++++
+ 4 files changed, 698 insertions(+), 1 deletions(-)
create mode 100644 drivers/mfd/twl4030-madc.c
create mode 100644 include/linux/i2c/twl4030-madc.h
+diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
+index 9da0e50..10ca037 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
-@@ -188,6 +188,27 @@
+@@ -188,6 +188,27 @@ config MFD_TC35892
additional drivers must be enabled in order to use the
functionality of the device.
@@ -49,9 +52,11 @@
config MFD_TMIO
bool
default n
+diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
+index fb503e7..570592f 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
-@@ -34,8 +34,9 @@
+@@ -34,8 +34,9 @@ obj-$(CONFIG_TPS6507X) += tps6507x.o
obj-$(CONFIG_MENELAUS) += menelaus.o
obj-$(CONFIG_TWL4030_CORE) += twl-core.o twl4030-irq.o twl6030-irq.o
@@ -62,6 +67,9 @@
obj-$(CONFIG_MFD_MC13783) += mc13783-core.o
+diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c
+new file mode 100644
+index 0000000..657ce87
--- /dev/null
+++ b/drivers/mfd/twl4030-madc.c
@@ -0,0 +1,549 @@
@@ -614,6 +622,9 @@
+MODULE_DESCRIPTION("twl4030 ADC driver");
+MODULE_LICENSE("GPL");
+
+diff --git a/include/linux/i2c/twl4030-madc.h b/include/linux/i2c/twl4030-madc.h
+new file mode 100644
+index 0000000..24523b5
--- /dev/null
+++ b/include/linux/i2c/twl4030-madc.h
@@ -0,0 +1,126 @@
@@ -743,3 +754,6 @@
+int twl4030_madc_conversion(struct twl4030_madc_request *conv);
+
+#endif
+--
+1.7.0.4
+
++++++ linux-2.6.35-rc3-ac-20100629.patch -> linux-2.6.35-rc4-ac-20100707.patch
--- linux-2.6.35-rc3-ac-20100629.patch
+++ linux-2.6.35-rc4-ac-20100707.patch
@@ -61,10 +61,10 @@
+ chip data sheet.
+
diff --git a/MAINTAINERS b/MAINTAINERS
-index 6d119c9..1ab1ae6 100644
+index a07a49d..af00529 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5128,6 +5128,19 @@ F: arch/x86/kernel/*sfi*
+@@ -5145,6 +5145,19 @@ F: arch/x86/kernel/*sfi*
F: drivers/sfi/
F: include/linux/sfi*.h
@@ -230,28 +230,6 @@
/* Issue commands to the SCU with or without data */
int intel_scu_ipc_simple_command(int cmd, int sub);
int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen,
-diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
-index 63cb409..9cb2edb 100644
---- a/arch/x86/include/asm/io_apic.h
-+++ b/arch/x86/include/asm/io_apic.h
-@@ -183,7 +183,7 @@ struct mp_ioapic_gsi{
- u32 gsi_end;
- };
- extern struct mp_ioapic_gsi mp_gsi_routing[];
--extern u32 gsi_end;
-+extern u32 gsi_top;
- int mp_find_ioapic(u32 gsi);
- int mp_find_ioapic_pin(int ioapic, u32 gsi);
- void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);
-@@ -197,7 +197,7 @@ static const int timer_through_8259 = 0;
- static inline void ioapic_init_mappings(void) { }
- static inline void ioapic_insert_resources(void) { }
- static inline void probe_nr_irqs_gsi(void) { }
--#define gsi_end (NR_IRQS_LEGACY - 1)
-+#define gsi_top (NR_IRQS_LEGACY)
- static inline int mp_find_ioapic(u32 gsi) { return 0; }
-
- struct io_apic_irq_attr;
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h
index 451d30e..991f4b4 100644
--- a/arch/x86/include/asm/mrst.h
@@ -393,33 +371,6 @@
microcode-y := microcode_core.o
microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o
-diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
-index 60cc405..c05872a 100644
---- a/arch/x86/kernel/acpi/boot.c
-+++ b/arch/x86/kernel/acpi/boot.c
-@@ -118,7 +118,7 @@ static unsigned int gsi_to_irq(unsigned int gsi)
- if (gsi >= NR_IRQS_LEGACY)
- irq = gsi;
- else
-- irq = gsi_end + 1 + gsi;
-+ irq = gsi_top + gsi;
-
- return irq;
- }
-@@ -129,10 +129,10 @@ static u32 irq_to_gsi(int irq)
-
- if (irq < NR_IRQS_LEGACY)
- gsi = isa_irq_to_gsi[irq];
-- else if (irq <= gsi_end)
-+ else if (irq < gsi_top)
- gsi = irq;
-- else if (irq <= (gsi_end + NR_IRQS_LEGACY))
-- gsi = irq - gsi_end;
-+ else if (irq < (gsi_top + NR_IRQS_LEGACY))
-+ gsi = irq - gsi_top;
- else
- gsi = 0xffffffff;
-
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index a353475..8dd7780 100644
--- a/arch/x86/kernel/apb_timer.c
@@ -594,20 +545,9 @@
pr_warning("APIC frequency too slow, disabling apic timer\n");
return -1;
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 33f3563..5592462 100644
+index e41ed24..66353f6 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -89,8 +89,8 @@ int nr_ioapics;
- /* IO APIC gsi routing info */
- struct mp_ioapic_gsi mp_gsi_routing[MAX_IO_APICS];
-
--/* The last gsi number used */
--u32 gsi_end;
-+/* The one past the highest gsi number used */
-+u32 gsi_top;
-
- /* MP IRQ source entries */
- struct mpc_intsrc mp_irqs[MAX_IRQ_SOURCES];
@@ -155,10 +155,8 @@ int __init arch_early_irq_init(void)
int node;
int i;
@@ -620,39 +560,6 @@
cfg = irq_cfgx;
count = ARRAY_SIZE(irq_cfgx);
-@@ -1032,10 +1030,10 @@ static int pin_2_irq(int idx, int apic, int pin)
- } else {
- u32 gsi = mp_gsi_routing[apic].gsi_base + pin;
-
-- if (gsi >= NR_IRQS_LEGACY)
-+ if (gsi >= legacy_pic->nr_legacy_irqs)
- irq = gsi;
- else
-- irq = gsi_end + 1 + gsi;
-+ irq = gsi_top + gsi;
- }
-
- #ifdef CONFIG_X86_32
-@@ -3853,7 +3851,7 @@ void __init probe_nr_irqs_gsi(void)
- {
- int nr;
-
-- nr = gsi_end + 1 + NR_IRQS_LEGACY;
-+ nr = gsi_top + legacy_pic->nr_legacy_irqs;
- if (nr > nr_irqs_gsi)
- nr_irqs_gsi = nr;
-
-@@ -4294,8 +4292,8 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
- */
- nr_ioapic_registers[idx] = entries;
-
-- if (mp_gsi_routing[idx].gsi_end > gsi_end)
-- gsi_end = mp_gsi_routing[idx].gsi_end;
-+ if (mp_gsi_routing[idx].gsi_end >= gsi_top)
-+ gsi_top = mp_gsi_routing[idx].gsi_end + 1;
-
- printk(KERN_INFO "IOAPIC[%d]: apic_id %d, version %d, address 0x%x, "
- "GSI %d-%d\n", idx, mp_ioapics[idx].apicid,
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 68e4a6f..c4c864a 100644
--- a/arch/x86/kernel/cpu/common.c
@@ -1351,24 +1258,11 @@
buf++;
}
return 0;
-diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
-index 5ae5d24..d86dbf7 100644
---- a/arch/x86/kernel/mpparse.c
-+++ b/arch/x86/kernel/mpparse.c
-@@ -123,7 +123,7 @@ static void __init MP_ioapic_info(struct mpc_ioapic *m)
- printk(KERN_INFO "I/O APIC #%d Version %d at 0x%X.\n",
- m->apicid, m->apicver, m->apicaddr);
-
-- mp_register_ioapic(m->apicid, m->apicaddr, gsi_end + 1);
-+ mp_register_ioapic(m->apicid, m->apicaddr, gsi_top);
- }
-
- static void print_MP_intsrc_info(struct mpc_intsrc *m)
diff --git a/arch/x86/kernel/mrst.c b/arch/x86/kernel/mrst.c
-index e796448..5fd5f9c 100644
+index e796448..7dbe3b0 100644
--- a/arch/x86/kernel/mrst.c
+++ b/arch/x86/kernel/mrst.c
-@@ -12,6 +12,18 @@
+@@ -12,6 +12,19 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sfi.h>
@@ -1381,13 +1275,14 @@
+#include <linux/i2c.h>
+#include <linux/sfi.h>
+#include <linux/i2c/pca953x.h>
++#include <linux/lis3lv02d.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
+#include <linux/platform_device.h>
#include <linux/irq.h>
#include <linux/module.h>
-@@ -23,16 +35,67 @@
+@@ -23,16 +36,67 @@
#include <asm/mrst.h>
#include <asm/io.h>
#include <asm/i8259.h>
@@ -1455,7 +1350,7 @@
static inline void assign_to_mp_irq(struct mpc_intsrc *m,
struct mpc_intsrc *mp_irq)
{
-@@ -167,25 +230,49 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table)
+@@ -167,25 +231,49 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table)
return 0;
}
@@ -1520,7 +1415,7 @@
if (fast_calibrate)
return fast_calibrate;
-@@ -196,25 +283,76 @@ static unsigned long __init mrst_calibrate_tsc(void)
+@@ -196,25 +284,76 @@ static unsigned long __init mrst_calibrate_tsc(void)
void __init mrst_time_init(void)
{
(6171 more lines skipped)
++++++ linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch (new)
--- linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
+++ linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
+From ae7c5b5bcde720340330336825b57aa5a88ca618 Mon Sep 17 00:00:00 2001
+From: Jarkko Nikula <jhnikula at gmail.com>
+Date: Wed, 5 May 2010 13:57:00 +0300
+Subject: [PATCH 08/11] FM TX, headphone, TV-out and basic jack detection support for N900
+
+This patch is combination of following patches:
+
+1. omap: rx51: Add platform_data for tlv320aic3x with reset gpio number
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+2. omap: rx51: Use REGULATOR_SUPPLY macro when initializing regulator consumers
+
+There is REGULATOR_SUPPLY macro available for initializing the struct
+regulator_consumer_supply so use it where applicable (all other supplies
+than vdds_sdi) as it improves the readability.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+Acked-by: Eduardo Valentin <eduardo.valentin at nokia.com>
+
+3. omap: rx51: Add supply and data for the tpa6130a2 headphone amplifier
+
+With these and upcoming change to tpa6130a2 driver it's possible to add
+support for the TPA6130A2 headphone amplifier.
+
+[jhnikula at gmail.com: Include statement adjusted for nokia-n900-kernel.git]
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+4. ASoC: RX-51: Add Jack Function kcontrol
+
+Nokia RX-51/N900 has multifunction 4-pole audio-video jack that can be used
+as headphone, headset or audio-video connector. This patch implements the
+control 'Jack Function' which is used to select the desired function.
+At the moment only TV-out without audio is supported.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+5. ASoC: RX-51: Add basic jack detection
+
+This patch adds GPIO jack detection to Nokia N900/RX-51. At the moment only
+SND_JACK_VIDEOOUT type is reported. More types could be reported after
+getting more audio features supported and necessary drivers integrated for
+implementing automated accessory detection.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+6. ASoC: RX-51: Add stereo audio output to AV jack
+
+The TPA6130A2 headphone amplifier is used in Nokia N900/RX-51 to drive the
+audio output pins in 4-pole multifunction audio-video jack. This patch
+implements audio output functionality, extends the control 'Jack Function'
+and limits the TPA6130A2 output level.
+
+Limiting is done because the TPA6130A2 can output very high audio levels to
+headphones. A value for the maximum volume is found from the Maemo 2.6.28
+kernel sources.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+7. V4L/DVB: radio-si4713: Release i2c adapter in driver cleanup paths
+
+Call to i2c_put_adapter was missing in radio_si4713_pdriver_probe and
+radio_si4713_pdriver_remove.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+Cc: Eduardo Valentin <eduardo.valentin at nokia.com>
+
+8. V4L/DVB: radio-si4713: Add regulator framework support
+
+Convert the driver to use regulator framework instead of set_power callback.
+This with gpio_reset platform data provide cleaner way to manage chip VIO,
+VDD and reset signal inside the driver.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+Cc: Eduardo Valentin <eduardo.valentin at nokia.com>
+
+9. omap: rx51: Set regulator V28 always on
+
+It seems that the battery cover sensor in Nokia N900 is powered from the
+V28 domain. Now if this regulator is disabled it causes that the gpio 160
+reads only zero which effectively causes uSD removal detection.
+
+Currently the bootloader enabled V28 is kept on but this may change in the
+future according to comment in
+drivers/regulator/core.c: regulator_has_full_constraints.
+
+Also if there are any consumers on the V28 domain doing regulator_enable
+regulator_disable cycle the V28 will be disabled after that.
+
+Prepare for these by defining the V28 as always_on regulator.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+Cc: Adrian Hunter <adrian.hunter at nokia.com>
+
+10. omap: rx51: Add initialization and platform data for Si4713 FM transmitter
+
+This patch adds supplies, gpio and platform data for the the Si4713 FM
+transmitter.
+
+[jhnikula at gmail.com: Two minor line adjustment for nokia-n900-kernel.git]
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+
+11. ASoC: RX-51: Add support for FM transmitter
+
+Nokia N900/RX-51 has Si4713 FM transmitter which shares the same codec
+line-out output than the TPA6130A2 amplifier. Add route to transmitter
+and kcontrol 'FMTX Function' which used to indicate to DAPM when the route
+to FM transmitter should be active.
+
+Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
+---
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 108 +++++++++++++++------
+ drivers/media/radio/radio-si4713.c | 30 +++++-
+ drivers/media/radio/si4713-i2c.c | 48 ++++++++--
+ drivers/media/radio/si4713-i2c.h | 3 +-
+ include/media/si4713.h | 3 +-
+ sound/soc/omap/Kconfig | 1 +
+ sound/soc/omap/rx51.c | 132 +++++++++++++++++++++++++-
+ 7 files changed, 276 insertions(+), 49 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
+index 8989119..0aab1a0 100644
+--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
++++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
+@@ -25,6 +25,8 @@
+ #include <linux/gpio_keys.h>
+ #include <linux/mmc/host.h>
+ #include <linux/bluetooth/hci_h4p.h>
++#include <media/radio-si4713.h>
++#include <media/si4713.h>
+
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+@@ -39,6 +41,9 @@
+ #include <../drivers/staging/iio/light/tsl2563.h>
+ #include <linux/lis3lv02d.h>
+
++#include <sound/tlv320aic3x.h>
++#include <sound/tpa6130a2-plat.h>
++
+ #include "mux.h"
+ #include "hsmmc.h"
+
+@@ -47,6 +52,8 @@
+
+ #define RX51_WL1251_POWER_GPIO 87
+ #define RX51_WL1251_IRQ_GPIO 42
++#define RX51_FMTX_RESET_GPIO 163
++#define RX51_FMTX_IRQ 53
+
+ #define RX51_TSC2005_RESET_GPIO 104
+ #define RX51_TSC2005_IRQ_GPIO 100
+@@ -394,48 +401,31 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
+ {} /* Terminator */
+ };
+
+-static struct regulator_consumer_supply rx51_vmmc1_supply = {
+- .supply = "vmmc",
+- .dev_name = "mmci-omap-hs.0",
+-};
++static struct regulator_consumer_supply rx51_vmmc1_supply =
++ REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0");
+
+-static struct regulator_consumer_supply rx51_vaux3_supply = {
+- .supply = "vmmc",
+- .dev_name = "mmci-omap-hs.1",
+-};
++static struct regulator_consumer_supply rx51_vaux3_supply =
++ REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1");
+
+-static struct regulator_consumer_supply rx51_vsim_supply = {
+- .supply = "vmmc_aux",
+- .dev_name = "mmci-omap-hs.1",
+-};
++static struct regulator_consumer_supply rx51_vsim_supply =
++ REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.1");
+
+ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
+ /* tlv320aic3x analog supplies */
+- {
+- .supply = "AVDD",
+- .dev_name = "2-0018",
+- },
+- {
+- .supply = "DRVDD",
+- .dev_name = "2-0018",
+- },
++ REGULATOR_SUPPLY("AVDD", "2-0018"),
++ REGULATOR_SUPPLY("DRVDD", "2-0018"),
++ /* tpa6130a2 */
++ REGULATOR_SUPPLY("Vdd", "2-0060"),
+ /* Keep vmmc as last item. It is not iterated for newer boards */
+- {
+- .supply = "vmmc",
+- .dev_name = "mmci-omap-hs.1",
+- },
(612 more lines skipped)
++++++ linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch (new)
--- linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
+++ linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
+From a0fe4bb1863c93dd365dab70e07f62f1eb024a76 Mon Sep 17 00:00:00 2001
+From: Lauri Leukkunen <lauri.leukkunen at nokia.com>
+Date: Fri, 12 Mar 2010 16:54:33 +0000
+Subject: [PATCH 02/11] Introduce and enable tsc2005 driver
+
+This patch is combination of following patches:
+
+1. input: touchscreen: introduce tsc2005 driver
+
+Patch-mainline: 2.6.35?
+Discussions: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg26748.html
+
+Introduce a driver for the Texas Instruments TSC2005 touchscreen
+controller (http://focus.ti.com/docs/prod/folders/print/tsc2005.html).
+
+The patch is based on a driver by Lauri Leukkunen, with modifications
+by David Brownell, Phil Carmody, Imre Deak, Hiroshi DOYU, Ari Kauppi,
+Tony Lindgren, Jarkko Nikula, Eero Nurkkala and Roman Tereshonkov.
+
+Signed-off-by: Lauri Leukkunen <lauri.leukkunen at nokia.com>
+[aaro.koskinen at nokia.com: patch description, rebasing & cleanup]
+Signed-off-by: Aaro Koskinen <aaro.koskinen at nokia.com>
+Cc: David Brownell <dbrownell at users.sourceforge.net>
+Cc: Phil Carmody <ext-phil.2.carmody at nokia.com>
+Cc: Imre Deak <imre.deak at nokia.com>
+Cc: Hiroshi DOYU <Hiroshi.DOYU at nokia.com>
+Cc: Ari Kauppi <Ext-Ari.Kauppi at nokia.com>
+Cc: Tony Lindgren <tony at atomide.com>
+Cc: Jarkko Nikula <jhnikula at gmail.com>
+Cc: Eero Nurkkala <ext-eero.nurkkala at nokia.com>
+Cc: Roman Tereshonkov <roman.tereshonkov at nokia.com>
+
+2. omap: rx-51: enable tsc2005
+
+Patch-mainline: 2.6.35
+Discussions: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg26749.html
+
+Enable TSC2005 touchscreen driver on the RX-51 board.
+
+Signed-off-by: Aaro Koskinen <aaro.koskinen at nokia.com>
+---
+ arch/arm/configs/rx51_defconfig | 1 +
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 46 ++-
+ drivers/input/touchscreen/Kconfig | 11 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/tsc2005.c | 678 ++++++++++++++++++++++++++
+ include/linux/spi/tsc2005.h | 41 ++
+ 6 files changed, 776 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/input/touchscreen/tsc2005.c
+ create mode 100644 include/linux/spi/tsc2005.h
+
+diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig
+index 56d4928..e400003 100644
+--- a/arch/arm/configs/rx51_defconfig
++++ b/arch/arm/configs/rx51_defconfig
+@@ -802,6 +802,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
+ # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+ # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+ # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
++CONFIG_TOUCHSCREEN_TSC2005=m
+ # CONFIG_TOUCHSCREEN_TSC2007 is not set
+ CONFIG_INPUT_MISC=y
+ # CONFIG_INPUT_ATI_REMOTE is not set
+diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
+index abdf321..f4b1c1c 100644
+--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
++++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
+@@ -14,6 +14,7 @@
+ #include <linux/input.h>
+ #include <linux/input/matrix_keypad.h>
+ #include <linux/spi/spi.h>
++#include <linux/spi/tsc2005.h>
+ #include <linux/spi/wl12xx.h>
+ #include <linux/i2c.h>
+ #include <linux/i2c/twl.h>
+@@ -42,6 +43,9 @@
+ #define RX51_WL1251_POWER_GPIO 87
+ #define RX51_WL1251_IRQ_GPIO 42
+
++#define RX51_TSC2005_RESET_GPIO 104
++#define RX51_TSC2005_IRQ_GPIO 100
++
+ /* list all spi devices here */
+ enum {
+ RX51_SPI_WL1251,
+@@ -50,6 +54,7 @@ enum {
+ };
+
+ static struct wl12xx_platform_data wl1251_pdata;
++static struct tsc2005_platform_data tsc2005_pdata;
+
+ static struct omap2_mcspi_device_config wl1251_mcspi_config = {
+ .turbo_mode = 0,
+@@ -87,10 +92,10 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
+ .modalias = "tsc2005",
+ .bus_num = 1,
+ .chip_select = 0,
+- /* .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),*/
++ .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),
+ .max_speed_hz = 6000000,
+ .controller_data = &tsc2005_mcspi_config,
+- /* .platform_data = &tsc2005_config,*/
++ .platform_data = &tsc2005_pdata,
+ },
+ };
+
+@@ -799,6 +804,42 @@ static inline void board_onenand_init(void)
+
+ #endif
+
++static struct tsc2005_platform_data tsc2005_pdata = {
++ .ts_pressure_max = 2048,
++ .ts_pressure_fudge = 2,
++ .ts_x_max = 4096,
++ .ts_x_fudge = 4,
++ .ts_y_max = 4096,
++ .ts_y_fudge = 7,
++ .ts_x_plate_ohm = 280,
++ .esd_timeout_ms = 8000,
++};
++
++static void rx51_tsc2005_set_reset(bool enable)
++{
++ gpio_set_value(RX51_TSC2005_RESET_GPIO, enable);
++}
++
++static void __init rx51_init_tsc2005(void)
++{
++ int r;
++
++ r = gpio_request(RX51_TSC2005_IRQ_GPIO, "tsc2005 IRQ");
++ if (r >= 0)
++ gpio_direction_input(RX51_TSC2005_IRQ_GPIO);
++ else
++ printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 IRQ");
++
++ r = gpio_request(RX51_TSC2005_RESET_GPIO, "tsc2005 reset");
++ if (r >= 0) {
++ gpio_direction_output(RX51_TSC2005_RESET_GPIO, 1);
++ tsc2005_pdata.set_reset = rx51_tsc2005_set_reset;
++ } else {
++ printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 reset");
++ tsc2005_pdata.esd_timeout_ms = 0;
++ }
++}
++
+ #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+
+ static struct omap_smc91x_platform_data board_smc91x_data = {
+@@ -883,6 +924,7 @@ void __init rx51_peripherals_init(void)
+ board_smc91x_init();
+ rx51_add_gpio_keys();
+ rx51_init_wl1251();
++ rx51_init_tsc2005();
+ spi_register_board_info(rx51_peripherals_spi_board_info,
+ ARRAY_SIZE(rx51_peripherals_spi_board_info));
+ omap2_hsmmc_init(mmc);
+diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
+index 3b9d5e2..9de7ea8 100644
+--- a/drivers/input/touchscreen/Kconfig
++++ b/drivers/input/touchscreen/Kconfig
+@@ -561,6 +561,17 @@ config TOUCHSCREEN_TOUCHIT213
+ To compile this driver as a module, choose M here: the
+ module will be called touchit213.
+
++config TOUCHSCREEN_TSC2005
++ tristate "TSC2005 based touchscreens"
++ depends on SPI_MASTER
++ help
++ Say Y here if you have a TSC2005 based touchscreen.
++
++ If unsure, say N.
++
++ To compile this driver as a module, choose M here: the
++ module will be called tsc2005.
++
+ config TOUCHSCREEN_TSC2007
+ tristate "TSC2007 based touchscreens"
+ depends on I2C
+diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
+index 497964a..317a746 100644
+--- a/drivers/input/touchscreen/Makefile
++++ b/drivers/input/touchscreen/Makefile
+@@ -34,6 +34,7 @@ obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o
++obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o
+ obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o
+ obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o
+diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
+new file mode 100644
+index 0000000..27ee361
+--- /dev/null
++++ b/drivers/input/touchscreen/tsc2005.c
+@@ -0,0 +1,678 @@
++/*
(727 more lines skipped)
++++++ linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch (new)
--- linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+++ linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+From 7ac65416a444cf52af9e16b2ace3f26765f9c7a1 Mon Sep 17 00:00:00 2001
+From: Ameya Palande <ameya.palande at nokia.com>
+Date: Thu, 17 Jun 2010 18:18:42 +0300
+Subject: [PATCH 07/11] omap: rx51: Platform support for lis3lv02d accelerometer
+
+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 bec0d39..8989119 100644
+--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
++++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
+@@ -37,6 +37,7 @@
+ #include <plat/serial.h>
+
+ #include <../drivers/staging/iio/light/tsl2563.h>
++#include <linux/lis3lv02d.h>
+
+ #include "mux.h"
+ #include "hsmmc.h"
+@@ -54,6 +55,9 @@
+ #define RX51_HCI_H4P_HOSTWU_GPIO 101
+ #define RX51_HCI_H4P_BTWU_GPIO 37
+
++#define LIS302_IRQ1_GPIO 181
++#define LIS302_IRQ2_GPIO 180 /* Not yet in use */
++
+ /* list all spi devices here */
+ enum {
+ RX51_SPI_WL1251,
+@@ -64,6 +68,77 @@ enum {
+ static struct wl12xx_platform_data wl1251_pdata;
+ static struct tsc2005_platform_data tsc2005_pdata;
+
++#if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE)
++static int lis302_setup(void)
++{
++ int err;
++ int irq1 = LIS302_IRQ1_GPIO;
++ int irq2 = LIS302_IRQ2_GPIO;
++
++ /* gpio for interrupt pin 1 */
++ err = gpio_request(irq1, "lis3lv02dl_irq1");
++ if (err) {
++ printk(KERN_ERR "lis3lv02dl: gpio request failed\n");
++ goto out;
++ }
++
++ /* gpio for interrupt pin 2 */
++ err = gpio_request(irq2, "lis3lv02dl_irq2");
++ if (err) {
++ gpio_free(irq1);
++ printk(KERN_ERR "lis3lv02dl: gpio request failed\n");
++ goto out;
++ }
++
++ gpio_direction_input(irq1);
++ gpio_direction_input(irq2);
++
++out:
++ return err;
++}
++
++static int lis302_release(void)
++{
++ gpio_free(LIS302_IRQ1_GPIO);
++ gpio_free(LIS302_IRQ2_GPIO);
++
++ return 0;
++}
++
++static struct lis3lv02d_platform_data rx51_lis3lv02d_data = {
++ .click_flags = LIS3_CLICK_SINGLE_X | LIS3_CLICK_SINGLE_Y |
++ LIS3_CLICK_SINGLE_Z,
++ /* Limits are 0.5g * value */
++ .click_thresh_x = 8,
++ .click_thresh_y = 8,
++ .click_thresh_z = 10,
++ /* Click must be longer than time limit */
++ .click_time_limit = 9,
++ /* Kind of debounce filter */
++ .click_latency = 50,
++
++ /* Limits for all axis. millig-value / 18 to get HW values */
++ .wakeup_flags = LIS3_WAKEUP_X_HI | LIS3_WAKEUP_Y_HI,
++ .wakeup_thresh = 800 / 18,
++ .wakeup_flags2 = LIS3_WAKEUP_Z_HI ,
++ .wakeup_thresh2 = 900 / 18,
++
++ .hipass_ctrl = LIS3_HIPASS1_DISABLE | LIS3_HIPASS2_DISABLE,
++
++ /* Interrupt line 2 for click detection, line 1 for thresholds */
++ .irq_cfg = LIS3_IRQ2_CLICK | LIS3_IRQ1_FF_WU_12,
++
++ .axis_x = LIS3_DEV_X,
++ .axis_y = LIS3_INV_DEV_Y,
++ .axis_z = LIS3_INV_DEV_Z,
++ .setup_resources = lis302_setup,
++ .release_resources = lis302_release,
++ .st_min_limits = {-32, 3, 3},
++ .st_max_limits = {-3, 32, 32},
++ .irq2 = OMAP_GPIO_IRQ(LIS302_IRQ2_GPIO),
++};
++#endif
++
+ #if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)
+ static struct tsl2563_platform_data rx51_tsl2563_platform_data = {
+ .cover_comp_gain = 16,
+@@ -747,6 +822,16 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
+ #endif
+ };
+
++static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_3[] = {
++#if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE)
++ {
++ I2C_BOARD_INFO("lis3lv02d", 0x1d),
++ .platform_data = &rx51_lis3lv02d_data,
++ .irq = OMAP_GPIO_IRQ(LIS302_IRQ1_GPIO),
++ },
++#endif
++};
++
+ static int __init rx51_i2c_init(void)
+ {
+ if ((system_rev >= SYSTEM_REV_S_USES_VAUX3 && system_rev < 0x100) ||
+@@ -762,7 +847,8 @@ static int __init rx51_i2c_init(void)
+ ARRAY_SIZE(rx51_peripherals_i2c_board_info_1));
+ omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2,
+ ARRAY_SIZE(rx51_peripherals_i2c_board_info_2));
+- omap_register_i2c_bus(3, 400, NULL, 0);
++ omap_register_i2c_bus(3, 400, rx51_peripherals_i2c_board_info_3,
++ ARRAY_SIZE(rx51_peripherals_i2c_board_info_3));
+ return 0;
+ }
+
+--
+1.7.0.4
+
++++++ linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch (new)
--- linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
+++ linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
+From f0bff13906a6332549403dcdd5cccf952e4265ec Mon Sep 17 00:00:00 2001
+From: Ameya Palande <ameya.palande at nokia.com>
+Date: Tue, 8 Jun 2010 14:08:55 +0300
+Subject: [PATCH 06/11] omap: rx51: Platform support for tsl2563 ALS
+
+Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
+---
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
+index e8d8ff5..bec0d39 100644
+--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
++++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
+@@ -36,6 +36,8 @@
+ #include <plat/gpmc-smc91x.h>
+ #include <plat/serial.h>
+
++#include <../drivers/staging/iio/light/tsl2563.h>
++
+ #include "mux.h"
+ #include "hsmmc.h"
+
+@@ -62,6 +64,12 @@ enum {
+ static struct wl12xx_platform_data wl1251_pdata;
+ static struct tsc2005_platform_data tsc2005_pdata;
+
++#if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)
++static struct tsl2563_platform_data rx51_tsl2563_platform_data = {
++ .cover_comp_gain = 16,
++};
++#endif
++
+ static struct omap2_mcspi_device_config wl1251_mcspi_config = {
+ .turbo_mode = 0,
+ .single_channel = 1,
+@@ -731,6 +739,12 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
+ {
+ I2C_BOARD_INFO("tlv320aic3x", 0x18),
+ },
++#if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)
++ {
++ I2C_BOARD_INFO("tsl2563", 0x29),
++ .platform_data = &rx51_tsl2563_platform_data,
++ },
++#endif
+ };
+
+ static int __init rx51_i2c_init(void)
+--
+1.7.0.4
+
++++++ linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch (new)
--- linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
+++ linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
+From da33fbfe1cf4cbab1bbca7c33b4f150c73aa9340 Mon Sep 17 00:00:00 2001
+From: Ameya Palande <ameya.palande at nokia.com>
+Date: Mon, 5 Jul 2010 17:06:14 +0300
+Subject: [PATCH 10/11] wl1251: Use MODULE_ALIAS macro at correct postion for SPI bus
+
+Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
+---
+ drivers/net/wireless/wl12xx/wl1251_main.c | 1 -
+ drivers/net/wireless/wl12xx/wl1251_spi.c | 1 +
+ drivers/net/wireless/wl12xx/wl1271_spi.c | 1 +
+ 3 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
+index 00b2428..35fdf88 100644
+--- a/drivers/net/wireless/wl12xx/wl1251_main.c
++++ b/drivers/net/wireless/wl12xx/wl1251_main.c
+@@ -1419,5 +1419,4 @@ EXPORT_SYMBOL_GPL(wl1251_free_hw);
+ MODULE_DESCRIPTION("TI wl1251 Wireles LAN Driver Core");
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Kalle Valo <kalle.valo at nokia.com>");
+-MODULE_ALIAS("spi:wl1251");
+ MODULE_FIRMWARE(WL1251_FW_NAME);
+diff --git a/drivers/net/wireless/wl12xx/wl1251_spi.c b/drivers/net/wireless/wl12xx/wl1251_spi.c
+index e814742..27fdfaa 100644
+--- a/drivers/net/wireless/wl12xx/wl1251_spi.c
++++ b/drivers/net/wireless/wl12xx/wl1251_spi.c
+@@ -345,3 +345,4 @@ module_exit(wl1251_spi_exit);
+
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Kalle Valo <kalle.valo at nokia.com>");
++MODULE_ALIAS("spi:wl1251");
+diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c
+index 5189b81..96d25fb 100644
+--- a/drivers/net/wireless/wl12xx/wl1271_spi.c
++++ b/drivers/net/wireless/wl12xx/wl1271_spi.c
+@@ -461,3 +461,4 @@ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Luciano Coelho <luciano.coelho at nokia.com>");
+ MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen at nokia.com>");
+ MODULE_FIRMWARE(WL1271_FW_NAME);
++MODULE_ALIAS("spi:wl1271");
+--
+1.7.0.4
+
++++++ patch-2.6.35-rc4.bz2 (new)
--- patch-2.6.35-rc4.bz2
+++ patch-2.6.35-rc4.bz2
+diff --git a/.gitignore b/.gitignore
+index a2939fc..8faa6c0 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -28,6 +28,7 @@ modules.builtin
+ *.gz
+ *.bz2
+ *.lzma
++*.lzo
+ *.patch
+ *.gcno
+
+diff --git a/Documentation/.gitignore b/Documentation/.gitignore
+new file mode 100644
+index 0000000..bcd907b
+--- /dev/null
++++ b/Documentation/.gitignore
+@@ -0,0 +1,7 @@
++filesystems/dnotify_test
++laptops/dslm
++timers/hpet_example
++vm/hugepage-mmap
++vm/hugepage-shm
++vm/map_hugetlb
++
+diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
+index 06b982a..dd10b51 100644
+--- a/Documentation/00-INDEX
++++ b/Documentation/00-INDEX
+@@ -250,6 +250,8 @@ numastat.txt
+ - info on how to read Numa policy hit/miss statistics in sysfs.
+ oops-tracing.txt
+ - how to decode those nasty internal kernel error dump messages.
++padata.txt
++ - An introduction to the "padata" parallel execution API
+ parisc/
+ - directory with info on using Linux on PA-RISC architecture.
+ parport.txt
+diff --git a/Documentation/ABI/obsolete/sysfs-bus-usb b/Documentation/ABI/obsolete/sysfs-bus-usb
+new file mode 100644
+index 0000000..bd096d3
+--- /dev/null
++++ b/Documentation/ABI/obsolete/sysfs-bus-usb
+@@ -0,0 +1,31 @@
++What: /sys/bus/usb/devices/.../power/level
++Date: March 2007
++KernelVersion: 2.6.21
++Contact: Alan Stern <stern at rowland.harvard.edu>
++Description:
++ Each USB device directory will contain a file named
++ power/level. This file holds a power-level setting for
++ the device, either "on" or "auto".
++
++ "on" means that the device is not allowed to autosuspend,
++ although normal suspends for system sleep will still
++ be honored. "auto" means the device will autosuspend
++ and autoresume in the usual manner, according to the
++ capabilities of its driver.
++
++ During normal use, devices should be left in the "auto"
++ level. The "on" level is meant for administrative uses.
++ If you want to suspend a device immediately but leave it
++ free to wake up in response to I/O requests, you should
++ write "0" to power/autosuspend.
++
++ Device not capable of proper suspend and resume should be
++ left in the "on" level. Although the USB spec requires
++ devices to support suspend/resume, many of them do not.
++ In fact so many don't that by default, the USB core
++ initializes all non-hub devices in the "on" level. Some
++ drivers may change this setting when they are bound.
++
++ This file is deprecated and will be removed after 2010.
++ Use the power/control file instead; it does exactly the
++ same thing.
+diff --git a/Documentation/ABI/obsolete/sysfs-class-rfkill b/Documentation/ABI/obsolete/sysfs-class-rfkill
+new file mode 100644
+index 0000000..4201d5b
+--- /dev/null
++++ b/Documentation/ABI/obsolete/sysfs-class-rfkill
+@@ -0,0 +1,29 @@
++rfkill - radio frequency (RF) connector kill switch support
++
++For details to this subsystem look at Documentation/rfkill.txt.
++
++What: /sys/class/rfkill/rfkill[0-9]+/state
++Date: 09-Jul-2007
++KernelVersion v2.6.22
++Contact: linux-wireless at vger.kernel.org
++Description: Current state of the transmitter.
++ This file is deprecated and sheduled to be removed in 2014,
++ because its not possible to express the 'soft and hard block'
++ state of the rfkill driver.
++Values: A numeric value.
++ 0: RFKILL_STATE_SOFT_BLOCKED
++ transmitter is turned off by software
++ 1: RFKILL_STATE_UNBLOCKED
++ transmitter is (potentially) active
++ 2: RFKILL_STATE_HARD_BLOCKED
++ transmitter is forced off by something outside of
++ the driver's control.
++
++What: /sys/class/rfkill/rfkill[0-9]+/claim
++Date: 09-Jul-2007
++KernelVersion v2.6.22
++Contact: linux-wireless at vger.kernel.org
++Description: This file is deprecated because there no longer is a way to
++ claim just control over a single rfkill instance.
++ This file is scheduled to be removed in 2012.
++Values: 0: Kernel handles events
+diff --git a/Documentation/ABI/stable/sysfs-class-rfkill b/Documentation/ABI/stable/sysfs-class-rfkill
+new file mode 100644
+index 0000000..097f522
+--- /dev/null
++++ b/Documentation/ABI/stable/sysfs-class-rfkill
+@@ -0,0 +1,67 @@
++rfkill - radio frequency (RF) connector kill switch support
++
++For details to this subsystem look at Documentation/rfkill.txt.
++
++For the deprecated /sys/class/rfkill/*/state and
++/sys/class/rfkill/*/claim knobs of this interface look in
++Documentation/ABI/obsolete/sysfs-class-rfkill.
++
++What: /sys/class/rfkill
++Date: 09-Jul-2007
++KernelVersion: v2.6.22
++Contact: linux-wireless at vger.kernel.org,
++Description: The rfkill class subsystem folder.
++ Each registered rfkill driver is represented by an rfkillX
++ subfolder (X being an integer > 0).
++
++
++What: /sys/class/rfkill/rfkill[0-9]+/name
++Date: 09-Jul-2007
++KernelVersion v2.6.22
++Contact: linux-wireless at vger.kernel.org
++Description: Name assigned by driver to this key (interface or driver name).
++Values: arbitrary string.
++
++
++What: /sys/class/rfkill/rfkill[0-9]+/type
++Date: 09-Jul-2007
++KernelVersion v2.6.22
++Contact: linux-wireless at vger.kernel.org
++Description: Driver type string ("wlan", "bluetooth", etc).
++Values: See include/linux/rfkill.h.
++
++
++What: /sys/class/rfkill/rfkill[0-9]+/persistent
++Date: 09-Jul-2007
++KernelVersion v2.6.22
++Contact: linux-wireless at vger.kernel.org
++Description: Whether the soft blocked state is initialised from non-volatile
++ storage at startup.
++Values: A numeric value.
++ 0: false
++ 1: true
++
++
++What: /sys/class/rfkill/rfkill[0-9]+/hard
++Date: 12-March-2010
++KernelVersion v2.6.34
++Contact: linux-wireless at vger.kernel.org
++Description: Current hardblock state. This file is read only.
++Values: A numeric value.
++ 0: inactive
++ The transmitter is (potentially) active.
++ 1: active
++ The transmitter is forced off by something outside of
++ the driver's control.
++
++
++What: /sys/class/rfkill/rfkill[0-9]+/soft
++Date: 12-March-2010
++KernelVersion v2.6.34
++Contact: linux-wireless at vger.kernel.org
++Description: Current softblock state. This file is read and write.
++Values: A numeric value.
++ 0: inactive
++ The transmitter is (potentially) active.
++ 1: active
++ The transmitter is turned off by software.
+diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
+index bcebb9e..294aa86 100644
+--- a/Documentation/ABI/testing/sysfs-bus-usb
++++ b/Documentation/ABI/testing/sysfs-bus-usb
+@@ -14,34 +14,6 @@ Description:
+ The autosuspend delay for newly-created devices is set to
+ the value of the usbcore.autosuspend module parameter.
+
+-What: /sys/bus/usb/devices/.../power/level
+-Date: March 2007
+-KernelVersion: 2.6.21
+-Contact: Alan Stern <stern at rowland.harvard.edu>
+-Description:
+- Each USB device directory will contain a file named
+- power/level. This file holds a power-level setting for
(1364317 more lines skipped)
++++++ series
--- series
+++ series
@@ -51,7 +51,7 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-linux-2.6.35-rc3-ac-20100629.patch
+linux-2.6.35-rc4-ac-20100707.patch
#
# End of the Moorsetown architecture patches
@@ -67,22 +67,26 @@
# Section maintainer: Ameya Palande <ameya.palande at nokia.com>
#
+# Hacks
+linux-2.6-Hacks-for-Nokia-N900.patch
# Touch screen
-linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
+linux-2.6.36-Introduce-and-enable-tsc2005-driver.patch
# GPU
-linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
+linux-2.6-SGX-PVR-driver-for-N900.patch
# Bluetooth
linux-2.6-Bluetooth-Support-for-n900-bluetooth-hardware.patch
-# MADC (Battery Charging)
+# TWL4030 MADC (Battery Charging)
linux-2.6-mfd-twl4030-Driver-for-twl4030-madc-module.patch
# Ambient light sensor
-linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
-# Sound
-linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
-# Hacks
-linux-2.6-Hacks-for-Nokia-N900.patch
+linux-2.6.36-omap-rx51-Platform-support-for-tsl2563-ALS.patch
# Accelerometer
-linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
+linux-2.6.36-omap-rx51-Platform-support-for-lis3lv02d-acceleromet.patch
+# FM TX, headphone, TV-out and basic jack detection
+linux-2.6.36-FM-TX-headphone-TV-out-and-basic-jack-detection-supp.patch
+# Earpiece and headset support
+linux-2.6-Earpiece-and-headset-support-for-N900.patch
+# Fixes
+linux-2.6.36-wl1251-Use-MODULE_ALIAS-macro-at-correct-postion-for.patch
#
# End of the Nokia N900 patches
++++++ deleted files:
--- linux-2.6-gpu-pvr-Add-PVR-GPU-driver.patch
--- linux-2.6-omap-rx51-Add-platform_data-for-tlv320aic3x-with-res.patch
--- linux-2.6.36-input-touchscreen-introduce-and-enable-tsc2005-drive.patch
--- linux-2.6.36-platform-support-for-lis3lv02d-accelerometer.patch
--- linux-2.6.36-tsl2563-ALS-support-for-Nokia-N900.patch
--- patch-2.6.35-rc3.bz2
More information about the MeeGo-commits
mailing list