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

Merge branches 'acpi-scan', 'acpi-misc', 'acpi-button' and 'acpi-dptf' 

* acpi-scan:
  ACPI: scan: Fix acpi_dma_configure_id() kerneldoc name

* acpi-misc:
  ACPI: GED: fix -Wformat
  ACPI: Fix whitespace inconsistencies

* acpi-button:
  ACPI: button: Add DMI quirk for Medion Akoya E2228T

* acpi-dptf:
  ACPI: DPTF: Support Alder Lake
parents 8d936bb1 c1e97359 9debfb81 7daaa063 38748bcb

drivers/acpi/button.c

+12 −1
Original line number Diff line number Diff line
@@ -89,7 +89,18 @@ static const struct dmi_system_id dmi_lid_quirks[] = { 
		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),

			DMI_MATCH(DMI_PRODUCT_NAME, "E2215T MD60198"),

			DMI_MATCH(DMI_PRODUCT_NAME, "E2215T"),

		},

		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,

	},

	{

		/*

		 * Medion Akoya E2228T, notification of the LID device only

		 * happens on close, not on open and _LID always returns closed.

		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),

			DMI_MATCH(DMI_PRODUCT_NAME, "E2228T"),

		},

		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,

	},

drivers/acpi/dptf/dptf_pch_fivr.c

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ static int pch_fivr_remove(struct platform_device *pdev) 


static const struct acpi_device_id pch_fivr_device_ids[] = {

	{"INTC1045", 0},

	{"INTC1049", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);

drivers/acpi/dptf/dptf_power.c

+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ static const struct acpi_device_id int3407_device_ids[] = { 
	{"INT3532", 0},

	{"INTC1047", 0},

	{"INTC1050", 0},

	{"INTC1060", 0},

	{"INTC1061", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, int3407_device_ids);

drivers/acpi/dptf/int340x_thermal.c

+6 −0
Original line number Diff line number Diff line
@@ -25,10 +25,16 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = { 
	{"INT340A"},

	{"INT340B"},

	{"INTC1040"},

	{"INTC1041"},

	{"INTC1043"},

	{"INTC1044"},

	{"INTC1045"},

	{"INTC1046"},

	{"INTC1047"},

	{"INTC1048"},

	{"INTC1049"},

	{"INTC1060"},

	{"INTC1061"},

	{""},

};

drivers/acpi/evged.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares, 


	switch (gsi) {

	case 0 ... 255:

		sprintf(ev_name, "_%c%02hhX",

		sprintf(ev_name, "_%c%02X",

			trigger == ACPI_EDGE_SENSITIVE ? 'E' : 'L', gsi);



		if (ACPI_SUCCESS(acpi_get_handle(handle, ev_name, &evt_handle)))