Skip to content

Commit e573d27

Browse files
committed
Merge branches 'acpi-tools', 'acpi-docs' and 'pnp'
Merge an ACPI pfrut utility update, an ACPI documentation update and a PNP update for 6.10: - Fix a typo in the ACPI documentation regarding the layout of sysfs subdirectory representing the ACPI namespace (John Watts). - Make the ACPI pfrut utility print the update_cap field during capability query (Chen Yu). - Add HAS_IOPORT dependencies to PNP (Niklas Schnelle). * acpi-tools: ACPI: tools: pfrut: Print the update_cap field during capability query * acpi-docs: Documentation: firmware-guide: ACPI: Fix namespace typo * pnp: PNP: add HAS_IOPORT dependencies
4 parents d9f87a7 + d7bd0ae + e97d05b + 59c9450 commit e573d27

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Documentation/firmware-guide/acpi/namespace.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ACPI Device Tree - Representation of ACPI Namespace
1515
Abstract
1616
========
1717
The Linux ACPI subsystem converts ACPI namespace objects into a Linux
18-
device tree under the /sys/devices/LNXSYSTEM:00 and updates it upon
18+
device tree under the /sys/devices/LNXSYSTM:00 and updates it upon
1919
receiving ACPI hotplug notification events. For each device object
2020
in this hierarchy there is a corresponding symbolic link in the
2121
/sys/bus/acpi/devices.
@@ -326,7 +326,7 @@ example ACPI namespace illustrated in Figure 2 with the addition of
326326
fixed PWR_BUTTON/SLP_BUTTON devices is shown below::
327327

328328
+--------------+---+-----------------+
329-
| LNXSYSTEM:00 | \ | acpi:LNXSYSTEM: |
329+
| LNXSYSTM:00 | \ | acpi:LNXSYSTM: |
330330
+--------------+---+-----------------+
331331
|
332332
| +-------------+-----+----------------+

drivers/pnp/isapnp/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
config ISAPNP
66
bool "ISA Plug and Play support"
7-
depends on ISA || COMPILE_TEST
7+
depends on ISA || (HAS_IOPORT && COMPILE_TEST)
88
help
99
Say Y here if you would like support for ISA Plug and Play devices.
1010
Some information is in <file:Documentation/userspace-api/isapnp.rst>.

tools/power/acpi/tools/pfrut/pfrut.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ void print_cap(struct pfru_update_cap_info *cap)
174174
exit(1);
175175
}
176176

177+
printf("update capability:%d\n", cap->update_cap);
178+
177179
uuid_unparse(cap->code_type, uuid);
178180
printf("code injection image type:%s\n", uuid);
179181
printf("fw_version:%d\n", cap->fw_version);

0 commit comments

Comments
 (0)