Merge branches 'acpi-tables', 'acpi-pmic', 'acpi-dptf' and 'acpi-soc' (acd448f3) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-platform-dptf

+16 −0

Original line number	Diff line number	Diff line
		@@ -92,3 +92,19 @@ Contact: linux-acpi@vger.kernel.org
		Description:
		(RO) The battery discharge current capability obtained from battery fuel gauge in
		milli Amps.

		What: /sys/bus/platform/devices/INTC1045:00/pch_fivr_switch_frequency/freq_mhz_low_clock
		Date: November, 2020
		KernelVersion: v5.10
		Contact: linux-acpi@vger.kernel.org
		Description:
		(RW) The PCH FIVR (Fully Integrated Voltage Regulator) switching frequency in MHz,
		when FIVR clock is 19.2MHz or 24MHz.

		What: /sys/bus/platform/devices/INTC1045:00/pch_fivr_switch_frequency/freq_mhz_high_clock
		Date: November, 2020
		KernelVersion: v5.10
		Contact: linux-acpi@vger.kernel.org
		Description:
		(RW) The PCH FIVR (Fully Integrated Voltage Regulator) switching frequency in MHz,
		when FIVR clock is 38.4MHz.

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -405,7 +405,7 @@ F: drivers/platform/x86/i2c-multi-instantiate.c
		ACPI PMIC DRIVERS
		M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
		M: Len Brown <lenb@kernel.org>
		R: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
		R: Andy Shevchenko <andy@kernel.org>
		R: Mika Westerberg <mika.westerberg@linux.intel.com>
		L: linux-acpi@vger.kernel.org
		S: Supported
		@@ -8939,7 +8939,7 @@ F: drivers/gpio/gpio-*cove.c
		F: drivers/gpio/gpio-msic.c

		INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
		R: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
		M: Andy Shevchenko <andy@kernel.org>
		S: Maintained
		F: drivers/mfd/intel_msic.c
		F: drivers/mfd/intel_soc_pmic*

drivers/acpi/Kconfig

+1 −64

Original line number	Diff line number	Diff line
		@@ -504,55 +504,6 @@ config ACPI_EXTLOG
		config ACPI_ADXL
		bool

		menuconfig PMIC_OPREGION
		bool "PMIC (Power Management Integrated Circuit) operation region support"
		help
		Select this option to enable support for ACPI operation
		region of the PMIC chip. The operation region can be used
		to control power rails and sensor reading/writing on the
		PMIC chip.

		if PMIC_OPREGION
		config BYTCRC_PMIC_OPREGION
		bool "ACPI operation region support for Bay Trail Crystal Cove PMIC"
		depends on INTEL_SOC_PMIC
		help
		This config adds ACPI operation region support for the Bay Trail
		version of the Crystal Cove PMIC.

		config CHTCRC_PMIC_OPREGION
		bool "ACPI operation region support for Cherry Trail Crystal Cove PMIC"
		depends on INTEL_SOC_PMIC
		help
		This config adds ACPI operation region support for the Cherry Trail
		version of the Crystal Cove PMIC.

		config XPOWER_PMIC_OPREGION
		bool "ACPI operation region support for XPower AXP288 PMIC"
		depends on MFD_AXP20X_I2C && IOSF_MBI=y
		help
		This config adds ACPI operation region support for XPower AXP288 PMIC.

		config BXT_WC_PMIC_OPREGION
		bool "ACPI operation region support for BXT WhiskeyCove PMIC"
		depends on INTEL_SOC_PMIC_BXTWC
		help
		This config adds ACPI operation region support for BXT WhiskeyCove PMIC.

		config CHT_WC_PMIC_OPREGION
		bool "ACPI operation region support for CHT Whiskey Cove PMIC"
		depends on INTEL_SOC_PMIC_CHTWC
		help
		This config adds ACPI operation region support for CHT Whiskey Cove PMIC.

		config CHT_DC_TI_PMIC_OPREGION
		bool "ACPI operation region support for Dollar Cove TI PMIC"
		depends on INTEL_SOC_PMIC_CHTDC_TI
		help
		This config adds ACPI operation region support for Dollar Cove TI PMIC.

		endif

		config ACPI_CONFIGFS
		tristate "ACPI configfs support"
		select CONFIGFS_FS
		@@ -568,21 +519,7 @@ config ACPI_PPTT
		bool
		endif

		config TPS68470_PMIC_OPREGION
		bool "ACPI operation region support for TPS68470 PMIC"
		depends on MFD_TPS68470
		help
		This config adds ACPI operation region support for TI TPS68470 PMIC.
		TPS68470 device is an advanced power management unit that powers
		a Compact Camera Module (CCM), generates clocks for image sensors,
		drives a dual LED for flash and incorporates two LED drivers for
		general purpose indicators.
		This driver enables ACPI operation region support control voltage
		regulators and clocks.

		This option is a bool as it provides an ACPI operation
		region, which must be available before any of the devices
		using this, are probed.
		source "drivers/acpi/pmic/Kconfig"

		endif # ACPI

drivers/acpi/Makefile

+1 −9

Original line number	Diff line number	Diff line
		@@ -107,17 +107,9 @@ obj-$(CONFIG_ACPI_APEI) += apei/

		obj-$(CONFIG_ACPI_EXTLOG) += acpi_extlog.o

		obj-$(CONFIG_PMIC_OPREGION) += pmic/intel_pmic.o
		obj-$(CONFIG_BYTCRC_PMIC_OPREGION) += pmic/intel_pmic_bytcrc.o
		obj-$(CONFIG_CHTCRC_PMIC_OPREGION) += pmic/intel_pmic_chtcrc.o
		obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o
		obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o
		obj-$(CONFIG_CHT_WC_PMIC_OPREGION) += pmic/intel_pmic_chtwc.o
		obj-$(CONFIG_CHT_DC_TI_PMIC_OPREGION) += pmic/intel_pmic_chtdc_ti.o

		obj-$(CONFIG_ACPI_CONFIGFS) += acpi_configfs.o

		obj-$(CONFIG_TPS68470_PMIC_OPREGION) += pmic/tps68470_pmic.o
		obj-y += pmic/

		video-objs += acpi_video.o video_detect.o
		obj-y += dptf/

drivers/acpi/acpi_apd.c

+8 −24

Original line number	Diff line number	Diff line
		@@ -7,39 +7,28 @@
		* Wu, Jeff <Jeff.Wu@amd.com>
		*/

		#include <linux/clk-provider.h>
		#include <linux/platform_data/clk-fch.h>
		#include <linux/platform_device.h>
		#include <linux/pm_domain.h>
		#include <linux/clkdev.h>
		#include <linux/acpi.h>
		#include <linux/clkdev.h>
		#include <linux/clk-provider.h>
		#include <linux/err.h>
		#include <linux/io.h>
		#include <linux/pm.h>
		#include <linux/platform_data/clk-fch.h>
		#include <linux/platform_device.h>

		#include "internal.h"

		ACPI_MODULE_NAME("acpi_apd");
		struct apd_private_data;

		/**
		* ACPI_APD_SYSFS : add device attributes in sysfs
		* ACPI_APD_PM : attach power domain to device
		*/
		#define ACPI_APD_SYSFS BIT(0)
		#define ACPI_APD_PM BIT(1)

		/**
		* struct apd_device_desc - a descriptor for apd device
		* @flags: device flags like %ACPI_APD_SYSFS, %ACPI_APD_PM
		* @fixed_clk_rate: fixed rate input clock source for acpi device;
		* 0 means no fixed rate input clock source
		* @properties: build-in properties of the device such as UART
		* @setup: a hook routine to set device resource during create platform device
		*
		* Device description defined as acpi_device_id.driver_data
		*/
		struct apd_device_desc {
		unsigned int flags;
		unsigned int fixed_clk_rate;
		struct property_entry *properties;
		int (setup)(struct apd_private_data pdata);
		@@ -71,7 +60,6 @@ static int acpi_apd_setup(struct apd_private_data *pdata)
		}

		#ifdef CONFIG_X86_AMD_PLATFORM_DEVICE

		static int misc_check_res(struct acpi_resource ares, void data)
		{
		struct resource res;
		@@ -142,7 +130,7 @@ static const struct apd_device_desc cz_uart_desc = {
		static const struct apd_device_desc fch_misc_desc = {
		.setup = fch_misc_setup,
		};
		#endif
		#endif /* CONFIG_X86_AMD_PLATFORM_DEVICE */

		#ifdef CONFIG_ARM64
		static const struct apd_device_desc xgene_i2c_desc = {
		@@ -184,13 +172,9 @@ static const struct apd_device_desc hip08_spi_desc = {
		.setup = acpi_apd_setup,
		.fixed_clk_rate = 250000000,
		};
		#endif
		#endif /* CONFIG_ARM64 */

		#else

		#define APD_ADDR(desc) (0UL)

		#endif /* CONFIG_X86_AMD_PLATFORM_DEVICE */
		#endif

		/**
		* Create platform device during acpi scan attach handle.

Admin message