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

Merge branches 'acpi-drivers', 'acpi-misc' and 'acpi-tools' 

* acpi-drivers:
  ACPI / DPTF: move int340x_thermal.c to the DPTF folder
  ACPI / DPTF: Add DPTF power participant driver

* acpi-misc:
  ACPI / lpat: make it explicitly non-modular
  ACPI / dock: make dock explicitly non-modular

* acpi-tools:
  tools/acpi: use CROSS_COMPILE to define prefix
parents 273b5a48 c11dd70f c49b43ce a3bcf2d4

drivers/acpi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -482,6 +482,7 @@ config ACPI_NFIT_DEBUG 
	  issue.



source "drivers/acpi/apei/Kconfig"

source "drivers/acpi/dptf/Kconfig"



config ACPI_EXTLOG

	tristate "Extended Error Log support"

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ acpi-y += acpi_lpss.o acpi_apd.o 
acpi-y				+= acpi_platform.o

acpi-y				+= acpi_pnp.o

acpi-$(CONFIG_ARM_AMBA)	+= acpi_amba.o

acpi-y				+= int340x_thermal.o

acpi-y				+= power.o

acpi-y				+= event.o

acpi-$(CONFIG_ACPI_REDUCED_HARDWARE_ONLY) += evged.o
@@ -104,3 +103,4 @@ obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o 
obj-$(CONFIG_ACPI_CONFIGFS)	+= acpi_configfs.o



video-objs			+= acpi_video.o video_detect.o

obj-y				+= dptf/

drivers/acpi/acpi_lpat.c

+1 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * GNU General Public License for more details.

 */



#include <linux/module.h>

#include <linux/export.h>

#include <linux/acpi.h>

#include <acpi/acpi_lpat.h>
@@ -157,5 +157,3 @@ void acpi_lpat_free_conversion_table(struct acpi_lpat_conversion_table 
	}

}

EXPORT_SYMBOL_GPL(acpi_lpat_free_conversion_table);
 


MODULE_LICENSE("GPL");

drivers/acpi/dock.c

+1 −6
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/slab.h>

#include <linux/init.h>

#include <linux/types.h>
@@ -33,12 +33,7 @@ 


#include "internal.h"



#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"



ACPI_MODULE_NAME("dock");

MODULE_AUTHOR("Kristen Carlson Accardi");

MODULE_DESCRIPTION(ACPI_DOCK_DRIVER_DESCRIPTION);

MODULE_LICENSE("GPL");



static bool immediate_undock = 1;

module_param(immediate_undock, bool, 0644);

drivers/acpi/dptf/Kconfig

0 → 100644
+15 −0
Original line number Diff line number Diff line 
config DPTF_POWER

	tristate "DPTF Platform Power Participant"

	depends on X86

	help

	  This driver adds support for Dynamic Platform and Thermal Framework

	  (DPTF) Platform Power Participant device (INT3407) support.

	  This participant is responsible for exposing platform telemetry:

		max_platform_power

		platform_power_source

		adapter_rating

		battery_steady_power

		charger_type



	  To compile this driver as a module, choose M here:

	  the module will be called dptf_power.

CRA Git | Maintained and supported by SUSTech CRA and CCSE