From 94a0ff3b707985a9bdd074b5e9e66e42c5446915 Mon Sep 17 00:00:00 2001 From: Amit Kucheria Date: Thu, 30 Oct 2008 14:03:39 +0200 Subject: [PATCH] UBUNTU: SAUCE: Update lpia patches from moblin tree Signed-off-by: Amit Kucheria --- .../lpia/patchset/0001-dabney_thermal.patch | 10 +++++++++- .../lpia/patchset/0018-sdio_crown_beach.patch | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch b/debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch index 414f54b..e7b43cc 100644 --- a/debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch +++ b/debian/binary-custom.d/lpia/patchset/0001-dabney_thermal.patch @@ -1562,6 +1562,14 @@ index bd77e81..eab9c42 100644 /* -------------------------------------------------------------------------- Video Management -------------------------------------------------------------------------- */ +@@ -653,6 +703,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) + + if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){ + unsigned long tmp; ++ int result; + static int count = 0; + char *name; + name = kzalloc(MAX_NAME_LEN, GFP_KERNEL); @@ -666,8 +717,25 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) device->backlight->props.max_brightness = max_level; device->backlight->props.brightness = (int)tmp; @@ -1575,7 +1583,7 @@ index bd77e81..eab9c42 100644 + printk(KERN_INFO PREFIX + "%s is registered as cooling_device%d\n", + device->dev->dev.bus_id, device->cdev->id); -+ int result = sysfs_create_link(&device->dev->dev.kobj, ++ result = sysfs_create_link(&device->dev->dev.kobj, + &device->cdev->device.kobj, + "thermal_cooling"); + if (result) diff --git a/debian/binary-custom.d/lpia/patchset/0018-sdio_crown_beach.patch b/debian/binary-custom.d/lpia/patchset/0018-sdio_crown_beach.patch index d4aecd0..f835b93 100644 --- a/debian/binary-custom.d/lpia/patchset/0018-sdio_crown_beach.patch +++ b/debian/binary-custom.d/lpia/patchset/0018-sdio_crown_beach.patch @@ -28,6 +28,23 @@ index d5e51b1..962b8be 100644 } return 0; +diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c +index 87a50f4..ba2a699 100644 +--- a/drivers/mmc/core/sdio.c ++++ b/drivers/mmc/core/sdio.c +@@ -332,6 +332,12 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr) + if (err) + goto remove; + ++ /* add a workaround for Marvell SDIO dev */ ++ if (card->cis.vendor == 0x2df) { ++ if (card->cis.max_dtr >= 25000000) ++ card->cis.max_dtr = 25000000; ++ } ++ + /* + * No support for high-speed yet, so just set + * the card's maximum speed. diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c index 625b92c..f4c62c0 100644 --- a/drivers/mmc/core/sdio_io.c -- 1.5.6.3