lkml.org 
[lkml]   [2012]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 12/38] acer-wmi: support Lenovo ideapad S205 wifi switch
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------
    From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com>

    commit 15b956a0b5651bbb1217ec374fdd67291dabb2af upstream.

    The AMW0 function in acer-wmi works on Lenovo ideapad S205 for control
    the wifi hardware state. We also found there have a 0x78 EC register
    exposes the state of wifi hardware switch on the machine.

    So, add this patch to support Lenovo ideapad S205 wifi hardware switch
    in acer-wmi driver.

    Reference: bko#37892
    https://bugzilla.kernel.org/show_bug.cgi?id=37892

    Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>
    Cc: Matthew Garrett <mjg@redhat.com>
    Cc: Dmitry Torokhov <dtor@mail.ru>
    Cc: Corentin Chary <corentincj@iksaif.net>
    Cc: Thomas Renninger <trenn@suse.de>
    Tested-by: Florian Heyer <heyho@flanto.de>
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/platform/x86/acer-wmi.c | 28 ++++++++++++++++++++++++++--
    1 file changed, 26 insertions(+), 2 deletions(-)
    --- a/drivers/platform/x86/acer-wmi.c
    +++ b/drivers/platform/x86/acer-wmi.c
    @@ -304,6 +304,10 @@ static struct quirk_entry quirk_fujitsu_
    .wireless = 2,
    };

    +static struct quirk_entry quirk_lenovo_ideapad_s205 = {
    + .wireless = 3,
    +};
    +
    /* The Aspire One has a dummy ACPI-WMI interface - disable it */
    static struct dmi_system_id __devinitdata acer_blacklist[] = {
    {
    @@ -450,6 +454,15 @@ static struct dmi_system_id acer_quirks[
    },
    .driver_data = &quirk_medion_md_98300,
    },
    + {
    + .callback = dmi_matched,
    + .ident = "Lenovo Ideapad S205",
    + .matches = {
    + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    + DMI_MATCH(DMI_PRODUCT_NAME, "10382LG"),
    + },
    + .driver_data = &quirk_lenovo_ideapad_s205,
    + },
    {}
    };

    @@ -542,6 +555,12 @@ struct wmi_interface *iface)
    return AE_ERROR;
    *value = result & 0x1;
    return AE_OK;
    + case 3:
    + err = ec_read(0x78, &result);
    + if (err)
    + return AE_ERROR;
    + *value = result & 0x1;
    + return AE_OK;
    default:
    err = ec_read(0xA, &result);
    if (err)
    @@ -1266,8 +1285,13 @@ static void acer_rfkill_update(struct wo
    acpi_status status;

    status = get_u32(&state, ACER_CAP_WIRELESS);
    - if (ACPI_SUCCESS(status))
    - rfkill_set_sw_state(wireless_rfkill, !state);
    + if (ACPI_SUCCESS(status)) {
    + if (quirks->wireless == 3) {
    + rfkill_set_hw_state(wireless_rfkill, !state);
    + } else {
    + rfkill_set_sw_state(wireless_rfkill, !state);
    + }
    + }

    if (has_cap(ACER_CAP_BLUETOOTH)) {
    status = get_u32(&state, ACER_CAP_BLUETOOTH);



    \
     
     \ /
      Last update: 2012-03-17 00:41    [from the cache]
    ©2003-2014 Jasper Spaans. Advertise on this site