Commit f94a57a1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-button', 'acpi-battery', 'acpi-osl', 'acpi-video' and 'acpi-misc' 

* acpi-button:
  ACPI: Add new tiny-power-button driver to directly signal init
  ACPI: button: move HIDs to acpi/button.h

* acpi-battery:
  ACPI / battery: Cleanup Lenovo Ideapad Miix 320 DMI table entry
  ACPI / AC: Cleanup DMI quirk table

* acpi-osl:
  ACPI: OSL: Add missing __acquires/__releases annotations

* acpi-video:
  ACPI: video: remove redundant assignments to variable result

* acpi-misc:
  ACPI: list_for_each_safe() -> list_for_each_entry_safe()
parents 6d582d7e a1b93e89 8c3f6993 2288eba5 966f58df 07761a4c

drivers/acpi/Kconfig

+24 −0
Original line number Diff line number Diff line
@@ -190,6 +190,30 @@ config ACPI_BUTTON 
	  To compile this driver as a module, choose M here:

	  the module will be called button.



config ACPI_TINY_POWER_BUTTON

	tristate "Tiny Power Button Driver"

	depends on !ACPI_BUTTON

	help

	  This driver provides a tiny alternative to the ACPI Button driver.

	  The tiny power button driver only handles the power button. Rather

	  than notifying userspace via the input layer or a netlink event, this

	  driver directly signals the init process to shut down.



	  This driver is particularly suitable for cloud and VM environments,

	  which use a simulated power button to initiate a controlled poweroff,

	  but which may not want to run a separate userspace daemon to process

	  input events.



config ACPI_TINY_POWER_BUTTON_SIGNAL

	int "Tiny Power Button Signal"

	depends on ACPI_TINY_POWER_BUTTON

	default 38

	help

	  Default signal to send to init in response to the power button.



	  Likely values here include 38 (SIGRTMIN+4) to power off, or 2

	  (SIGINT) to simulate Ctrl+Alt+Del.



config ACPI_VIDEO

	tristate "Video"

	depends on X86 && BACKLIGHT_CLASS_DEVICE

drivers/acpi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ obj-$(CONFIG_ACPI_IPMI) += acpi_ipmi.o 


obj-$(CONFIG_ACPI_AC) 		+= ac.o

obj-$(CONFIG_ACPI_BUTTON)	+= button.o

obj-$(CONFIG_ACPI_TINY_POWER_BUTTON)	+= tiny-power-button.o

obj-$(CONFIG_ACPI_FAN)		+= fan.o

obj-$(CONFIG_ACPI_VIDEO)	+= video.o

obj-$(CONFIG_ACPI_TAD)		+= acpi_tad.o

drivers/acpi/ac.c

+13 −12
Original line number Diff line number Diff line
@@ -293,29 +293,30 @@ static int __init ac_do_not_check_pmic_quirk(const struct dmi_system_id *d) 
	return 0;

}



/* Please keep this list alphabetically sorted */

static const struct dmi_system_id ac_dmi_table[]  __initconst = {

	{

	/* Thinkpad e530 */

	.callback = thinkpad_e530_quirk,

		/* ECS EF20EA, AXP288 PMIC but uses separate fuel-gauge */

		.callback = ac_do_not_check_pmic_quirk,

		.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_NAME, "32597CG"),

			DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),

		},

	},

	{

		/* ECS EF20EA */

		/* Lenovo Ideapad Miix 320, AXP288 PMIC, separate fuel-gauge */

		.callback = ac_do_not_check_pmic_quirk,

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "80XF"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo MIIX 320-10ICR"),

		},

	},

	{

		/* Lenovo Ideapad Miix 320 */

		.callback = ac_do_not_check_pmic_quirk,

		/* Lenovo Thinkpad e530, see comment in acpi_ac_notify() */

		.callback = thinkpad_e530_quirk,

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "80XF"),

		  DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "Lenovo MIIX 320-10ICR"),

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "32597CG"),

		},

	},

	{},

drivers/acpi/acpi_video.c

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ acpi_video_init_brightness(struct acpi_video_device *device) 
	int i, max_level = 0;

	unsigned long long level, level_old;

	struct acpi_video_device_brightness *br = NULL;

	int result = -EINVAL;

	int result;



	result = acpi_video_get_levels(device->dev, &br, &max_level);

	if (result)

drivers/acpi/battery.c

+5 −5
Original line number Diff line number Diff line
@@ -1365,19 +1365,19 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = { 
		},

	},

	{

		/* ECS EF20EA */

		/* ECS EF20EA, AXP288 PMIC but uses separate fuel-gauge */

		.callback = battery_do_not_check_pmic_quirk,

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"),

		},

	},

	{

		/* Lenovo Ideapad Miix 320 */

		/* Lenovo Ideapad Miix 320, AXP288 PMIC, separate fuel-gauge */

		.callback = battery_do_not_check_pmic_quirk,

		.matches = {

		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "80XF"),

		  DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "Lenovo MIIX 320-10ICR"),

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "80XF"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo MIIX 320-10ICR"),

		},

	},

	{},