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

Commit 472db19f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of... 

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
  platform/x86: move rfkill for Dell Mini 1012 to compal-laptop
  thinkpad-acpi: Add KEY_CAMERA (Fn-F6) for Lenovo keyboards
  thinkpad-acpi: add support for model-specific keymaps
  thinkpad-acpi: lock down size of hotkey keymap
  thinkpad-acpi: untangle ACPI/vendor backlight selection
  thinkpad-acpi: find ACPI video device by synthetic HID
  intel_ips: potential null dereference
  drivers/platform/x86: Adjust confusing if indentation
  x86: intel_ips: do not use PCI resources before pci_enable_device()
parents 351f13d7 c3f755e3

Documentation/laptops/thinkpad-acpi.txt

+4 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,10 @@ ThinkPad-specific interface. The driver will disable its native 
backlight brightness control interface if it detects that the standard

ACPI interface is available in the ThinkPad.



If you want to use the thinkpad-acpi backlight brightness control

instead of the generic ACPI video backlight brightness control for some

reason, you should use the acpi_backlight=vendor kernel parameter.



The brightness_enable module parameter can be used to control whether

the LCD brightness control feature will be enabled when available.

brightness_enable=0 forces it to be disabled.  brightness_enable=1

drivers/platform/x86/asus_acpi.c

+4 −2
Original line number Diff line number Diff line
@@ -938,10 +938,11 @@ static int set_brightness(int value) 
	/* SPLV laptop */

	if (hotk->methods->brightness_set) {

		if (!write_acpi_int(hotk->handle, hotk->methods->brightness_set,

				    value, NULL))

				    value, NULL)) {

			printk(KERN_WARNING

			       "Asus ACPI: Error changing brightness\n");

			ret = -EIO;

		}

		goto out;

	}
@@ -953,11 +954,12 @@ static int set_brightness(int value) 
					      hotk->methods->brightness_down,

					      NULL, NULL);

		(value > 0) ? value-- : value++;

		if (ACPI_FAILURE(status))

		if (ACPI_FAILURE(status)) {

			printk(KERN_WARNING

			       "Asus ACPI: Error changing brightness\n");

			ret = -EIO;

		}

	}

out:

	return ret;

}

drivers/platform/x86/compal-laptop.c

+9 −0
Original line number Diff line number Diff line
@@ -840,6 +840,14 @@ static struct dmi_system_id __initdata compal_dmi_table[] = { 
		},

		.callback = dmi_check_cb

	},

	{

		.ident = "Dell Mini 1012",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),

		},

		.callback = dmi_check_cb

	},

	{

		.ident = "Dell Inspiron 11z",

		.matches = {
@@ -1092,5 +1100,6 @@ MODULE_ALIAS("dmi:*:rnJHL90:rvrREFERENCE:*"); 
MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron910:*");

MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1010:*");

MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1011:*");

MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1012:*");

MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1110:*");

MODULE_ALIAS("dmi:*:svnDellInc.:pnInspiron1210:*");

drivers/platform/x86/dell-laptop.c

+7 −0
Original line number Diff line number Diff line
@@ -121,6 +121,13 @@ static struct dmi_system_id __devinitdata dell_blacklist[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1011"),

		},

	},

	{

		.ident = "Dell Mini 1012",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1012"),

		},

	},

	{

		.ident = "Dell Inspiron 11z",

		.matches = {

drivers/platform/x86/intel_ips.c

+9 −6
Original line number Diff line number Diff line
@@ -1342,8 +1342,10 @@ static struct ips_mcp_limits *ips_detect_cpu(struct ips_driver *ips) 
		limits = &ips_lv_limits;

	else if (strstr(boot_cpu_data.x86_model_id, "CPU       U"))

		limits = &ips_ulv_limits;

	else

	else {

		dev_info(&ips->dev->dev, "No CPUID match found.\n");

		goto out;

	}



	rdmsrl(TURBO_POWER_CURRENT_LIMIT, turbo_power);

	tdp = turbo_power & TURBO_TDP_MASK;
@@ -1432,6 +1434,12 @@ static int ips_probe(struct pci_dev *dev, const struct pci_device_id *id) 


	spin_lock_init(&ips->turbo_status_lock);



	ret = pci_enable_device(dev);

	if (ret) {

		dev_err(&dev->dev, "can't enable PCI device, aborting\n");

		goto error_free;

	}



	if (!pci_resource_start(dev, 0)) {

		dev_err(&dev->dev, "TBAR not assigned, aborting\n");

		ret = -ENXIO;
@@ -1444,11 +1452,6 @@ static int ips_probe(struct pci_dev *dev, const struct pci_device_id *id) 
		goto error_free;

	}



	ret = pci_enable_device(dev);

	if (ret) {

		dev_err(&dev->dev, "can't enable PCI device, aborting\n");

		goto error_free;

	}



	ips->regmap = ioremap(pci_resource_start(dev, 0),

			      pci_resource_len(dev, 0));