[meego-commits] 23460: Changes to MeeGo:1.2:oss/kernel-adaptation-oaktrail
Peter Zhu
no_reply at build.meego.com
Mon Aug 1 12:03:52 UTC 2011
Hi,
I have made the following changes to kernel-adaptation-oaktrail in project MeeGo:1.2:oss. Please review and accept ASAP.
Thank You,
Peter Zhu
[This message was auto-generated]
---
Request #23460:
submit: MeeGo:1.2:oss:Testing/kernel-adaptation-oaktrail(r4) -> MeeGo:1.2:oss/kernel-adaptation-oaktrail
Message:
Move to MeeGo:1.2:oss
State: new 2011-08-01T05:03:45 peter
Comment: None
changes files:
--------------
--- kernel.changes
+++ kernel.changes
@@ -0,0 +1,7 @@
+* Tue Jul 28 2011 - Austin Zhang <austin.zhang at intel.com> - 2.6.37.6
+- Disable/Enable HW during suspend/resume, BMC#22009.
+
+* Wed Jul 27 2011 - Yin Kangkai <kangkai.yin at intel.com> - 2.6.37.6
+- Drop 2 mmc quirk patches and add another 1 patch to support
+ mmc high speed on ECS S10OT3, fix BMC# 21948.
+
old:
----
linux-2.6.37-mmc-Add-a-quirk-so-that-mmc-don-t-goto-highspeed-mod.patch
linux-2.6.37-oaktrail-apply-SDHCI_QUIRK_NO_HIGHSPEED-quirk.patch
new:
----
linux-2.6.37-enable-l3g4200d-after-resume.patch
linux-2.6.37-mmc-remove-NO_HISPD_BIT-to-support-high-speed-on-S10.patch
spec files:
-----------
--- kernel-adaptation-oaktrail.spec
+++ kernel-adaptation-oaktrail.spec
@@ -278,42 +278,42 @@
#
# MMC/SD work arounds
-Patch303: linux-2.6.37-mmc-Add-a-quirk-so-that-mmc-don-t-goto-highspeed-mod.patch
-Patch304: linux-2.6.37-oaktrail-apply-SDHCI_QUIRK_NO_HIGHSPEED-quirk.patch
-Patch305: linux-2.6.37-sdhci_runtime_pm_fix.patch
-Patch306: linux-2.6.37-disable-keeppower-for-mmc.patch
+Patch303: linux-2.6.37-sdhci_runtime_pm_fix.patch
+Patch304: linux-2.6.37-disable-keeppower-for-mmc.patch
+Patch305: linux-2.6.37-mmc-remove-NO_HISPD_BIT-to-support-high-speed-on-S10.patch
# ACPI EC extra driver for oaktrail
-Patch307: linux-2.6.37-platform-oaktrail-ACPI-EC-Extra-driver-for-Oaktrail.patch
-Patch308: linux-2.6.37-platform-intel_oaktrail-v0.5-pass-platform_data-to-l.patch
-Patch309: linux-2.6.37-platform-oaktrail-dmi-check-to-support-another-oaktr.patch
-Patch310: linux-2.6.37-platform-oaktrail-enable-i2c-accel-device-for-S10OT3.patch
-Patch311: linux-2.6.37-platform-oaktrail-bump-version-and-support-Oak-Trail.patch
-Patch312: linux-2.6.37-platform-oaktrail-merge-ALS-support-for-oaktrail-ECS.patch
-Patch313: linux-2.6.37-platform-oaktrail-add-senosrs-support-for-S10OT3-REV.patch
+Patch306: linux-2.6.37-platform-oaktrail-ACPI-EC-Extra-driver-for-Oaktrail.patch
+Patch307: linux-2.6.37-platform-intel_oaktrail-v0.5-pass-platform_data-to-l.patch
+Patch308: linux-2.6.37-platform-oaktrail-dmi-check-to-support-another-oaktr.patch
+Patch309: linux-2.6.37-platform-oaktrail-enable-i2c-accel-device-for-S10OT3.patch
+Patch310: linux-2.6.37-platform-oaktrail-bump-version-and-support-Oak-Trail.patch
+Patch311: linux-2.6.37-platform-oaktrail-merge-ALS-support-for-oaktrail-ECS.patch
+Patch312: linux-2.6.37-platform-oaktrail-add-senosrs-support-for-S10OT3-REV.patch
# reboot quirk for oaktrail
-Patch314: linux-2.6.37-ARCH_X86-apply-reboot-quirk-for-Intel-Oaktrail.patch
+Patch313: linux-2.6.37-ARCH_X86-apply-reboot-quirk-for-Intel-Oaktrail.patch
# reboot quirk for oaktrail-ECS
-Patch315: linux-2.6.37-oaktrail-ecs-reboot.patch
+Patch314: linux-2.6.37-oaktrail-ecs-reboot.patch
# serial fixes for suspend and resume
-Patch316: linux-2.6.37-1-3-serial-core-reset-the-console-speed-on-resume.patch
-Patch317: linux-2.6.37-2-3-serial-also-set-the-uartclk-value-in-resume-after-go.patch
-Patch318: linux-2.6.37-3-3-serial-change-the-divisor-latch-only-when-prescalar-.patch
+Patch315: linux-2.6.37-1-3-serial-core-reset-the-console-speed-on-resume.patch
+Patch316: linux-2.6.37-2-3-serial-also-set-the-uartclk-value-in-resume-after-go.patch
+Patch317: linux-2.6.37-3-3-serial-change-the-divisor-latch-only-when-prescalar-.patch
# Enabled Sitronix multipoint touch panel
-Patch319: linux-2.6.37-enable-sitronix-MT.patch
+Patch318: linux-2.6.37-enable-sitronix-MT.patch
# ILITEK multi-touch
-Patch320: linux-2.6.37-multi-touch-ILITEK.patch
+Patch319: linux-2.6.37-multi-touch-ILITEK.patch
# I2C sensors
-Patch321: linux-2.6.38-bma023-add-device_id-to-support-bma150.patch
-Patch322: linux-2.6.37-ak8975-Fix-for-oaktrail.patch
-Patch323: linux-2.6.37-lsm303dlh-accelerometer-magnetometer-device-support-.patch
-Patch324: linux-2.6.37-Hwmon-lsm303dlh_a-some-cleanup.patch
-Patch325: linux-2.6.37-Hwmon-lsm303dlh_m-some-cleanup.patch
-Patch326: linux-2.6.37-l3g4200d-gyroscope.patch
+Patch320: linux-2.6.38-bma023-add-device_id-to-support-bma150.patch
+Patch321: linux-2.6.37-ak8975-Fix-for-oaktrail.patch
+Patch322: linux-2.6.37-lsm303dlh-accelerometer-magnetometer-device-support-.patch
+Patch323: linux-2.6.37-Hwmon-lsm303dlh_a-some-cleanup.patch
+Patch324: linux-2.6.37-Hwmon-lsm303dlh_m-some-cleanup.patch
+Patch325: linux-2.6.37-l3g4200d-gyroscope.patch
+Patch326: linux-2.6.37-enable-l3g4200d-after-resume.patch
# I2C master (designware)
Patch327: linux-2.6.37.6-i2c-designware-Do-not-use-legacy-PCI-pwr-mgmt.patch
@@ -623,65 +623,65 @@
#
# MMC/SD work arounds
-# linux-2.6.37-mmc-Add-a-quirk-so-that-mmc-don-t-goto-highspeed-mod.patch
+# linux-2.6.37-sdhci_runtime_pm_fix.patch
%patch303 -p1
-# linux-2.6.37-oaktrail-apply-SDHCI_QUIRK_NO_HIGHSPEED-quirk.patch
+# linux-2.6.37-disable-keeppower-for-mmc.patch
%patch304 -p1
-# linux-2.6.37-sdhci_runtime_pm_fix.patch
+# linux-2.6.37-mmc-remove-NO_HISPD_BIT-to-support-high-speed-on-S10.patch
%patch305 -p1
-# linux-2.6.37-disable-keeppower-for-mmc.patch
-%patch306 -p1
# ACPI EC extra driver for oaktrail
# linux-2.6.37-platform-oaktrail-ACPI-EC-Extra-driver-for-Oaktrail.patch
-%patch307 -p1
+%patch306 -p1
# linux-2.6.37-platform-intel_oaktrail-v0.5-pass-platform_data-to-l.patch
-%patch308 -p1
+%patch307 -p1
# linux-2.6.37-platform-oaktrail-dmi-check-to-support-another-oaktr.patch
-%patch309 -p1
+%patch308 -p1
# linux-2.6.37-platform-oaktrail-enable-i2c-accel-device-for-S10OT3.patch
-%patch310 -p1
+%patch309 -p1
# linux-2.6.37-platform-oaktrail-bump-version-and-support-Oak-Trail.patch
-%patch311 -p1
+%patch310 -p1
# linux-2.6.37-platform-oaktrail-merge-ALS-support-for-oaktrail-ECS.patch
-%patch312 -p1
+%patch311 -p1
# linux-2.6.37-platform-oaktrail-add-senosrs-support-for-S10OT3-REV.patch
-%patch313 -p1
+%patch312 -p1
# reboot quirk for oaktrail
# linux-2.6.37-ARCH_X86-apply-reboot-quirk-for-Intel-Oaktrail.patch
-%patch314 -p1
+%patch313 -p1
# reboot quirk for oaktrail-ECS
# linux-2.6.37-oaktrail-ecs-reboot.patch
-%patch315 -p1
+%patch314 -p1
# serial fixes for suspend and resume
# linux-2.6.37-1-3-serial-core-reset-the-console-speed-on-resume.patch
-%patch316 -p1
+%patch315 -p1
# linux-2.6.37-2-3-serial-also-set-the-uartclk-value-in-resume-after-go.patch
-%patch317 -p1
+%patch316 -p1
# linux-2.6.37-3-3-serial-change-the-divisor-latch-only-when-prescalar-.patch
-%patch318 -p1
+%patch317 -p1
# Enabled Sitronix multipoint touch panel
# linux-2.6.37-enable-sitronix-MT.patch
-%patch319 -p1
+%patch318 -p1
# ILITEK multi-touch
# linux-2.6.37-multi-touch-ILITEK.patch
-%patch320 -p1
+%patch319 -p1
# I2C sensors
# linux-2.6.38-bma023-add-device_id-to-support-bma150.patch
-%patch321 -p1
+%patch320 -p1
# linux-2.6.37-ak8975-Fix-for-oaktrail.patch
-%patch322 -p1
+%patch321 -p1
# linux-2.6.37-lsm303dlh-accelerometer-magnetometer-device-support-.patch
-%patch323 -p1
+%patch322 -p1
# linux-2.6.37-Hwmon-lsm303dlh_a-some-cleanup.patch
-%patch324 -p1
+%patch323 -p1
# linux-2.6.37-Hwmon-lsm303dlh_m-some-cleanup.patch
-%patch325 -p1
+%patch324 -p1
# linux-2.6.37-l3g4200d-gyroscope.patch
+%patch325 -p1
+# linux-2.6.37-enable-l3g4200d-after-resume.patch
%patch326 -p1
# I2C master (designware)
other changes:
--------------
++++++ linux-2.6.37-enable-l3g4200d-after-resume.patch (new)
--- linux-2.6.37-enable-l3g4200d-after-resume.patch
+++ linux-2.6.37-enable-l3g4200d-after-resume.patch
+Disable/Enable HW during suspend/resume, otherwise, once one application
+open this device, and before close it, the system entered into S3, after
+resume, the device will fail to work;
+
+Signed-off-by: Austin Zhang <austin.zhang at intel.com>
+
+---
+ l3g4200d.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff -Naurp linux-2.6.37-orig/drivers/hwmon/l3g4200d.c linux-2.6.37/drivers/hwmon/l3g4200d.c
+--- linux-2.6.37-orig/drivers/hwmon/l3g4200d.c 2011-07-27 17:01:03.966642245 +0800
++++ linux-2.6.37/drivers/hwmon/l3g4200d.c 2011-07-27 17:25:58.650787130 +0800
+@@ -826,6 +826,7 @@ static int l3g4200d_suspend(struct devic
+ pr_info(KERN_INFO "l3g4200d_suspend\n");
+ #endif
+ /* TO DO */
++ l3g4200d_disable(gyro);
+ #endif
+ return 0;
+ }
+@@ -839,6 +840,7 @@ static int l3g4200d_resume(struct device
+ pr_info(KERN_INFO "l3g4200d_resume\n");
+ #endif
+ /* TO DO */
++ l3g4200d_enable(gyro);
+ #endif
+ return 0;
+ }
++++++ linux-2.6.37-mmc-remove-NO_HISPD_BIT-to-support-high-speed-on-S10.patch (new)
--- linux-2.6.37-mmc-remove-NO_HISPD_BIT-to-support-high-speed-on-S10.patch
+++ linux-2.6.37-mmc-remove-NO_HISPD_BIT-to-support-high-speed-on-S10.patch
+From 6e821bae7abb89962bcc34e07794681114c45226 Mon Sep 17 00:00:00 2001
+From: Yin Kangkai <kangkai.yin at linux.intel.com>
+Date: Thu, 28 Jul 2011 12:58:58 +0800
+Subject: [PATCH] mmc: remove NO_HISPD_BIT to support high speed on S10OT3
+
+On ECS S10OT3 platform, we do not need this quirk (NO_HISPD_BIT), otherwise we
+will fail to goto high speed.
+
+Signed-off-by: Yin Kangkai <kangkai.yin at intel.com>
+---
+ drivers/mmc/host/sdhci-pci.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mmc/host/sdhci-pci.c
++++ b/drivers/mmc/host/sdhci-pci.c
+@@ -176,7 +176,7 @@ static int mrst_hc_probe(struct sdhci_pc
+ }
+
+ static const struct sdhci_pci_fixes sdhci_intel_mrst_hc0 = {
+- .quirks = SDHCI_QUIRK_BROKEN_ADMA | SDHCI_QUIRK_NO_HISPD_BIT,
++ .quirks = SDHCI_QUIRK_BROKEN_ADMA,
+ .probe_slot = mrst_hc_probe_slot,
+ };
+
++++++ series
--- series
+++ series
@@ -128,10 +128,9 @@
#
# MMC/SD work arounds
-linux-2.6.37-mmc-Add-a-quirk-so-that-mmc-don-t-goto-highspeed-mod.patch
-linux-2.6.37-oaktrail-apply-SDHCI_QUIRK_NO_HIGHSPEED-quirk.patch
linux-2.6.37-sdhci_runtime_pm_fix.patch
linux-2.6.37-disable-keeppower-for-mmc.patch
+linux-2.6.37-mmc-remove-NO_HISPD_BIT-to-support-high-speed-on-S10.patch
# ACPI EC extra driver for oaktrail
linux-2.6.37-platform-oaktrail-ACPI-EC-Extra-driver-for-Oaktrail.patch
@@ -164,6 +163,7 @@
linux-2.6.37-Hwmon-lsm303dlh_a-some-cleanup.patch
linux-2.6.37-Hwmon-lsm303dlh_m-some-cleanup.patch
linux-2.6.37-l3g4200d-gyroscope.patch
+linux-2.6.37-enable-l3g4200d-after-resume.patch
# I2C master (designware)
linux-2.6.37.6-i2c-designware-Do-not-use-legacy-PCI-pwr-mgmt.patch
++++++ deleted files:
--- linux-2.6.37-mmc-Add-a-quirk-so-that-mmc-don-t-goto-highspeed-mod.patch
--- linux-2.6.37-oaktrail-apply-SDHCI_QUIRK_NO_HIGHSPEED-quirk.patch
More information about the MeeGo-commits
mailing list