Ubuntu has been carrying the attached patch since 2.6.28. Shouldn't it
be upstream?
rtg
--
Tim Gardner tim.gardner@xxxxxxxxxxxxx
>From eefc0ee441bced58ed07234008f5d82203ea2669 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@xxxxxxxxxxxxx>
Date: Tue, 21 Apr 2009 11:09:10 -0600
Subject: [PATCH] UBUNTU: Sony laptop: Some Sony Vaia laptops do not enable wwan power by default.
Bug: https://bugs.launchpad.net/bugs/364678
Added quirk to enable wwan power based on DMI information already present in the module.
It appears that Vaio's do not enable power to wwan from a cold boot.
Signed-off-by: Tim Gardner <tim.gardner@xxxxxxxxxxxxx>
---
drivers/platform/x86/sony-laptop.c | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index f200677..b185b6b 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1450,6 +1450,10 @@ struct sonypi_eventtypes {
struct sonypi_event *events;
};
+struct sony_pic_quirk_entry {
+ u8 set_wwan_power;
+};
+
struct sony_pic_dev {
struct acpi_device *acpi_dev;
struct sony_pic_irq *cur_irq;
@@ -1460,6 +1464,7 @@ struct sony_pic_dev {
struct sonypi_eventtypes *event_types;
int (*handle_irq)(const u8, const u8);
int model;
+ struct sony_pic_quirk_entry *quirks;
u16 evport_offset;
u8 camera_power;
u8 bluetooth_power;
@@ -2891,6 +2896,12 @@ static int sony_pic_add(struct acpi_device *device)
if (result)
goto err_remove_pf;
+ if (spic_dev.quirks && spic_dev.quirks->set_wwan_power) {
+ /*
+ * Power isn't enabled by default.
+ */
+ __sony_pic_set_wwanpower(1);
+ }
return 0;
err_remove_pf:
@@ -2961,6 +2972,16 @@ static struct acpi_driver sony_pic_driver = {
},
};
+static struct sony_pic_quirk_entry sony_pic_vaio_vgn = {
+ .set_wwan_power = 1,
+};
+
+static int dmi_matched(const struct dmi_system_id *dmi)
+{
+ spic_dev.quirks = dmi->driver_data;
+ return 0;
+}
+
static struct dmi_system_id __initdata sonypi_dmi_table[] = {
{
.ident = "Sony Vaio",
@@ -2975,6 +2996,8 @@ static struct dmi_system_id __initdata sonypi_dmi_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
DMI_MATCH(DMI_PRODUCT_NAME, "VGN-"),
},
+ .callback = dmi_matched,
+ .driver_data = &sony_pic_vaio_vgn,
},
{ }
};
--
1.7.0.4
