Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branches 'acpica', 'acpi-video' and 'device-properties' 

* acpica:
  ACPI: Better describe ACPI_DEBUGGER

* acpi-video:
  MAINTAINERS: ACPI / video: update a file name in drivers/acpi/

* device-properties:
  ACPI / property: fix compile error for acpi_node_get_property_reference() when CONFIG_ACPI=n
parents c09c9dd2 11704194 86f98a3a 64031e3e

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -318,7 +318,7 @@ M: Zhang Rui <rui.zhang@intel.com> 
L:	linux-acpi@vger.kernel.org

L:	linux-acpi@vger.kernel.org

W:	https://01.org/linux-acpi

W:	https://01.org/linux-acpi

S:	Supported

S:	Supported

F:	drivers/acpi/video.c

F:	drivers/acpi/acpi_video.c





ACPI WMI DRIVER

ACPI WMI DRIVER

L:	platform-driver-x86@vger.kernel.org

L:	platform-driver-x86@vger.kernel.org

drivers/acpi/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -58,10 +58,10 @@ config ACPI_CCA_REQUIRED 
	bool

	bool





config ACPI_DEBUGGER

config ACPI_DEBUGGER

	bool "In-kernel debugger (EXPERIMENTAL)"

	bool "AML debugger interface (EXPERIMENTAL)"

	select ACPI_DEBUG

	select ACPI_DEBUG

	help

	help

	  Enable in-kernel debugging facilities: statistics, internal

	  Enable in-kernel debugging of AML facilities: statistics, internal

	  object dump, single step control method execution.

	  object dump, single step control method execution.

	  This is still under development, currently enabling this only

	  This is still under development, currently enabling this only

	  results in the compilation of the ACPICA debugger files.

	  results in the compilation of the ACPICA debugger files.

include/linux/acpi.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -870,8 +870,8 @@ static inline int acpi_dev_get_property(struct acpi_device *adev, 
}

}





static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode,

static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode,

				const char *name, const char *cells_name,

				const char *name, size_t index,

				size_t index, struct acpi_reference_args *args)

				struct acpi_reference_args *args)

{

{

	return -ENXIO;

	return -ENXIO;

}

}