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

Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-pci', 'acpi-lpss' and 'acpi-button' 

* acpi-cleanup:
  ACPI: Remove duplicate definitions of PREFIX
  ACPI / tables: Replace printk with pr_*

* acpi-thermal:
  ACPI / thermal: make acpi_thermal_check asynchronous on resume

* acpi-pci:
  ACPI / PCI: Do not call ISA-specific code if ISA is not supported

* acpi-lpss:
  ACPI / LPSS: Add Intel BayTrail ACPI mode PWM

* acpi-button:
  ACPI / button: Add ACPI Button event via netlink routine
parents c730d30c 07070e12 a59ffb20 c1aaae67 e1c74817 0bf6368e

drivers/acpi/acpi_cmos_rtc.c

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 


#include "internal.h"



#define PREFIX "ACPI: "



ACPI_MODULE_NAME("cmos rtc");



static const struct acpi_device_id acpi_cmos_rtc_ids[] = {

drivers/acpi/acpi_lpss.c

+11 −0
Original line number Diff line number Diff line
@@ -102,6 +102,16 @@ static struct lpss_device_desc lpt_sdio_dev_desc = { 
	.ltr_required = true,

};



static struct lpss_shared_clock pwm_clock = {

	.name = "pwm_clk",

	.rate = 25000000,

};



static struct lpss_device_desc byt_pwm_dev_desc = {

	.clk_required = true,

	.shared_clock = &pwm_clock,

};



static struct lpss_shared_clock uart_clock = {

	.name = "uart_clk",

	.rate = 44236800,
@@ -157,6 +167,7 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { 
	{ "INT33C7", },



	/* BayTrail LPSS devices */

	{ "80860F09", (unsigned long)&byt_pwm_dev_desc },

	{ "80860F0A", (unsigned long)&byt_uart_dev_desc },

	{ "80860F0E", (unsigned long)&byt_spi_dev_desc },

	{ "80860F14", (unsigned long)&byt_sdio_dev_desc },

drivers/acpi/button.c

+4 −0
Original line number Diff line number Diff line
@@ -302,6 +302,10 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) 
			input_sync(input);



			pm_wakeup_event(&device->dev, 0);

			acpi_bus_generate_netlink_event(

					device->pnp.device_class,

					dev_name(&device->dev),

					event, ++button->pushed);

		}

		break;

	default:

drivers/acpi/container.c

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 


#include "internal.h"



#define PREFIX "ACPI: "



#define _COMPONENT			ACPI_CONTAINER_COMPONENT

ACPI_MODULE_NAME("container");

drivers/acpi/dock.c

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 


#include "internal.h"



#define PREFIX "ACPI: "



#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"



ACPI_MODULE_NAME("dock");

CRA Git | Maintained and supported by SUSTech CRA and CCSE