Skip to content

Commit f32309c

Browse files
committed
Merge branches 'acpi-video', 'acpi-misc' and 'acpi-docs'
Merge ACPI backlight driver changes, miscellaneous ACPI-related changes and ACPI-related documentation updates for 6.3-rc1: - Fix Lenovo Ideapad Z570 DMI match in the ACPI backlight driver (Hans de Goede). - Silence missing prototype warnings in some places in the ACPI-related code (Ammar Faizi). - Make kobj_type structures used in the ACPI code constant (Thomas Weißschuh). - Correct spelling in firmware-guide/ACPI (Randy Dunlap). - Clarify the meaning of Explicit and Implicit in the _DSD GPIO properties documentation (Andy Shevchenko). * acpi-video: ACPI: video: Fix Lenovo Ideapad Z570 DMI match * acpi-misc: ACPI: make kobj_type structures constant ACPI: Silence missing prototype warnings * acpi-docs: Documentation: firmware-guide: gpio-properties: Clarify Explicit and Implicit Documentation: firmware-guide/ACPI: correct spelling
4 parents b7ab6b9 + 2d11eae + a527b01 + 3082d7e commit f32309c

File tree

9 files changed

+32
-17
lines changed

9 files changed

+32
-17
lines changed

Documentation/firmware-guide/acpi/acpi-lid.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ state upon the last _LID evaluation. There won't be difference when the
3434
_LID control method is evaluated during the runtime, the problem is its
3535
initial returning value. When the AML tables implement this control method
3636
with cached value, the initial returning value is likely not reliable.
37-
There are platforms always retun "closed" as initial lid state.
37+
There are platforms always return "closed" as initial lid state.
3838

3939
Restrictions of the lid state change notifications
4040
==================================================

Documentation/firmware-guide/acpi/gpio-properties.rst

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,30 @@ state of the output pin which driver should use during its initialization.
6767
Linux tries to use common sense here and derives the state from the bias
6868
and polarity settings. The table below shows the expectations:
6969

70-
========= ============= ==============
71-
Pull Bias Polarity Requested...
72-
========= ============= ==============
73-
Implicit x AS IS (assumed firmware configured for us)
74-
Explicit x (no _DSD) as Pull Bias (Up == High, Down == Low),
75-
assuming non-active (Polarity = !Pull Bias)
76-
Down Low as low, assuming active
77-
Down High as low, assuming non-active
78-
Up Low as high, assuming non-active
79-
Up High as high, assuming active
80-
========= ============= ==============
70+
+-------------+-------------+-----------------------------------------------+
71+
| Pull Bias | Polarity | Requested... |
72+
+=============+=============+===============================================+
73+
| Implicit |
74+
+-------------+-------------+-----------------------------------------------+
75+
| **Default** | x | AS IS (assumed firmware configured it for us) |
76+
+-------------+-------------+-----------------------------------------------+
77+
| Explicit |
78+
+-------------+-------------+-----------------------------------------------+
79+
| **None** | x | AS IS (assumed firmware configured it for us) |
80+
| | | with no Pull Bias |
81+
+-------------+-------------+-----------------------------------------------+
82+
| **Up** | x (no _DSD) | |
83+
| +-------------+ as high, assuming non-active |
84+
| | Low | |
85+
| +-------------+-----------------------------------------------+
86+
| | High | as high, assuming active |
87+
+-------------+-------------+-----------------------------------------------+
88+
| **Down** | x (no _DSD) | |
89+
| +-------------+ as low, assuming non-active |
90+
| | High | |
91+
| +-------------+-----------------------------------------------+
92+
| | Low | as low, assuming active |
93+
+-------------+-------------+-----------------------------------------------+
8194

8295
That said, for our above example the both GPIOs, since the bias setting
8396
is explicit and _DSD is present, will be treated as active with a high

Documentation/firmware-guide/acpi/namespace.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Description Table). The XSDT always points to the FADT (Fixed ACPI
3131
Description Table) using its first entry, the data within the FADT
3232
includes various fixed-length entries that describe fixed ACPI features
3333
of the hardware. The FADT contains a pointer to the DSDT
34-
(Differentiated System Descripition Table). The XSDT also contains
34+
(Differentiated System Description Table). The XSDT also contains
3535
entries pointing to possibly multiple SSDTs (Secondary System
3636
Description Table).
3737

drivers/acpi/acpi_lpit.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/acpi.h>
1111
#include <asm/msr.h>
1212
#include <asm/tsc.h>
13+
#include "internal.h"
1314

1415
struct lpit_residency_info {
1516
struct acpi_generic_address gaddr;

drivers/acpi/cppc_acpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ static struct attribute *cppc_attrs[] = {
193193
};
194194
ATTRIBUTE_GROUPS(cppc);
195195

196-
static struct kobj_type cppc_ktype = {
196+
static const struct kobj_type cppc_ktype = {
197197
.sysfs_ops = &kobj_sysfs_ops,
198198
.default_groups = cppc_groups,
199199
};

drivers/acpi/device_sysfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static void acpi_data_node_release(struct kobject *kobj)
7878
complete(&dn->kobj_done);
7979
}
8080

81-
static struct kobj_type acpi_data_node_ktype = {
81+
static const struct kobj_type acpi_data_node_ktype = {
8282
.sysfs_ops = &acpi_data_node_sysfs_ops,
8383
.default_groups = acpi_data_node_default_groups,
8484
.release = acpi_data_node_release,

drivers/acpi/ioapic.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <linux/acpi.h>
2525
#include <linux/pci.h>
2626
#include <acpi/acpi.h>
27+
#include "internal.h"
2728

2829
struct acpi_pci_ioapic {
2930
acpi_handle root_handle;

drivers/acpi/sysfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ static struct attribute *hotplug_profile_attrs[] = {
953953
};
954954
ATTRIBUTE_GROUPS(hotplug_profile);
955955

956-
static struct kobj_type acpi_hotplug_profile_ktype = {
956+
static const struct kobj_type acpi_hotplug_profile_ktype = {
957957
.sysfs_ops = &kobj_sysfs_ops,
958958
.default_groups = hotplug_profile_groups,
959959
};

drivers/acpi/video_detect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
434434
/* Lenovo Ideapad Z570 */
435435
.matches = {
436436
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
437-
DMI_MATCH(DMI_PRODUCT_NAME, "102434U"),
437+
DMI_MATCH(DMI_PRODUCT_VERSION, "Ideapad Z570"),
438438
},
439439
},
440440
{

0 commit comments

Comments
 (0)