Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15b956a0 authored by Lee, Chun-Yi's avatar Lee, Chun-Yi Committed by Matthew Garrett
Browse files

acer-wmi: support Lenovo ideapad S205 wifi switch 

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: default avatarFlorian Heyer <heyho@flanto.de>
Signed-off-by: default avatarLee, Chun-Yi <jlee@suse.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 2c3422d9

drivers/platform/x86/acer-wmi.c

+26 −2
Original line number Original line Diff line number Diff line
@@ -305,6 +305,10 @@ static struct quirk_entry quirk_fujitsu_amilo_li_1718 = { 
	.wireless = 2,

	.wireless = 2,

};

};





static struct quirk_entry quirk_lenovo_ideapad_s205 = {

	.wireless = 3,

};



/* The Aspire One has a dummy ACPI-WMI interface - disable it */

/* The Aspire One has a dummy ACPI-WMI interface - disable it */

static struct dmi_system_id __devinitdata acer_blacklist[] = {

static struct dmi_system_id __devinitdata acer_blacklist[] = {

	{

	{
@@ -451,6 +455,15 @@ static struct dmi_system_id acer_quirks[] = { 
		},

		},

		.driver_data = &quirk_medion_md_98300,

		.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,

	},

	{}

	{}

};

};
@@ -543,6 +556,12 @@ struct wmi_interface *iface) 
				return AE_ERROR;

				return AE_ERROR;

			*value = result & 0x1;

			*value = result & 0x1;

			return AE_OK;

			return AE_OK;

		case 3:

			err = ec_read(0x78, &result);

			if (err)

				return AE_ERROR;

			*value = result & 0x1;

			return AE_OK;

		default:

		default:

			err = ec_read(0xA, &result);

			err = ec_read(0xA, &result);

			if (err)

			if (err)
@@ -1267,8 +1286,13 @@ static void acer_rfkill_update(struct work_struct *ignored) 
	acpi_status status;

	acpi_status status;





	status = get_u32(&state, ACER_CAP_WIRELESS);

	status = get_u32(&state, ACER_CAP_WIRELESS);

	if (ACPI_SUCCESS(status))

	if (ACPI_SUCCESS(status)) {

		if (quirks->wireless == 3) {

			rfkill_set_hw_state(wireless_rfkill, !state);

		} else {

			rfkill_set_sw_state(wireless_rfkill, !state);

			rfkill_set_sw_state(wireless_rfkill, !state);

		}

	}





	if (has_cap(ACER_CAP_BLUETOOTH)) {

	if (has_cap(ACER_CAP_BLUETOOTH)) {

		status = get_u32(&state, ACER_CAP_BLUETOOTH);

		status = get_u32(&state, ACER_CAP_BLUETOOTH);