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

Commit 9319bc1c authored Nov 04, 2014 by Linus Torvalds

Merge tag 'platform-drivers-x86-v3.18-2' of...

Merge tag 'platform-drivers-x86-v3.18-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform drievr updates from Darren Hart:
 "A short list of patches applying quirks and new DMI matches.  These
  pass my basic build tests and have spent 4 days in linux-next"

* tag 'platform-drivers-x86-v3.18-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  quirk for Lenovo Yoga 3: no rfkill switch
  acer-wmi: Add acpi_backlight=video quirk for the Acer KAV80
  samsung-laptop: Add broken-acpi-video quirk for NC210/NC110
  asus-nb-wmi: Add wapf4 quirk for the X550VB
  toshiba_acpi: Add Toshiba TECRA A50-A to the alt keymap dmi list

parents 8a97577a 725c7f61

drivers/platform/x86/acer-wmi.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -579,6 +579,17 @@ static const struct dmi_system_id video_vendor_dmi_table[] __initconst = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5741"),
		},
		},
		{
		/*
		* Note no video_set_backlight_video_vendor, we must use the
		* acer interface, as there is no native backlight interface.
		*/
		.ident = "Acer KAV80",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
		DMI_MATCH(DMI_PRODUCT_NAME, "KAV80"),
		},
		},
		{}
		};

drivers/platform/x86/asus-nb-wmi.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,15 @@ static const struct dmi_system_id asus_quirks[] = {
		},
		.driver_data = &quirk_asus_wapf4,
		},
		{
		.callback = dmi_matched,
		.ident = "ASUSTeK COMPUTER INC. X550VB",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
		DMI_MATCH(DMI_PRODUCT_NAME, "X550VB"),
		},
		.driver_data = &quirk_asus_wapf4,
		},
		{
		.callback = dmi_matched,
		.ident = "ASUSTeK COMPUTER INC. X55A",

drivers/platform/x86/ideapad-laptop.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -837,6 +837,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
		DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),
		},
		},
		{
		.ident = "Lenovo Yoga 3 Pro 1370",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3 Pro-1370"),
		},
		},
		{}
		};

drivers/platform/x86/samsung-laptop.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1559,6 +1559,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
		},
		.driver_data = &samsung_broken_acpi_video,
		},
		{
		.callback = samsung_dmi_matched,
		.ident = "NC210",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
		DMI_MATCH(DMI_PRODUCT_NAME, "NC210/NC110"),
		DMI_MATCH(DMI_BOARD_NAME, "NC210/NC110"),
		},
		.driver_data = &samsung_broken_acpi_video,
		},
		{
		.callback = samsung_dmi_matched,
		.ident = "730U3E/740U3E",

drivers/platform/x86/toshiba_acpi.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,12 @@ static const struct dmi_system_id toshiba_alt_keymap_dmi[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Qosmio X75-A"),
		},
		},
		{
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
		DMI_MATCH(DMI_PRODUCT_NAME, "TECRA A50-A"),
		},
		},
		{}
		};