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

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
parents b7ab6b91 2d11eae4 a527b011 3082d7ef

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ state upon the last _LID evaluation. There won't be difference when the 
_LID control method is evaluated during the runtime, the problem is its

initial returning value. When the AML tables implement this control method

with cached value, the initial returning value is likely not reliable.

There are platforms always retun "closed" as initial lid state.

There are platforms always return "closed" as initial lid state.



Restrictions of the lid state change notifications

==================================================

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

+24 −11
Original line number Diff line number Diff line
@@ -67,17 +67,30 @@ state of the output pin which driver should use during its initialization. 
Linux tries to use common sense here and derives the state from the bias

and polarity settings. The table below shows the expectations:



=========  =============  ==============

Pull Bias     Polarity     Requested...

=========  =============  ==============

Implicit     x            AS IS (assumed firmware configured for us)

Explicit     x (no _DSD)  as Pull Bias (Up == High, Down == Low),

                          assuming non-active (Polarity = !Pull Bias)

Down         Low          as low, assuming active

Down         High         as low, assuming non-active

Up           Low          as high, assuming non-active

Up           High         as high, assuming active

=========  =============  ==============

+-------------+-------------+-----------------------------------------------+

| Pull Bias   | Polarity    | Requested...                                  |

+=============+=============+===============================================+

| Implicit                                                                  |

+-------------+-------------+-----------------------------------------------+

| **Default** | x           | AS IS (assumed firmware configured it for us) |

+-------------+-------------+-----------------------------------------------+

| Explicit                                                                  |

+-------------+-------------+-----------------------------------------------+

| **None**    | x           | AS IS (assumed firmware configured it for us) |

|             |             | with no Pull Bias                             |

+-------------+-------------+-----------------------------------------------+

| **Up**      | x (no _DSD) |                                               |

|             +-------------+ as high, assuming non-active                  |

|             | Low         |                                               |

|             +-------------+-----------------------------------------------+

|             | High        | as high, assuming active                      |

+-------------+-------------+-----------------------------------------------+

| **Down**    | x (no _DSD) |                                               |

|             +-------------+ as low, assuming non-active                   |

|             | High        |                                               |

|             +-------------+-----------------------------------------------+

|             | Low         | as low, assuming active                       |

+-------------+-------------+-----------------------------------------------+



That said, for our above example the both GPIOs, since the bias setting

is explicit and _DSD is present, will be treated as active with a high

Documentation/firmware-guide/acpi/namespace.rst

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Description Table). The XSDT always points to the FADT (Fixed ACPI 
Description Table) using its first entry, the data within the FADT

includes various fixed-length entries that describe fixed ACPI features

of the hardware.  The FADT contains a pointer to the DSDT

(Differentiated System Descripition Table).  The XSDT also contains

(Differentiated System Description Table).  The XSDT also contains

entries pointing to possibly multiple SSDTs (Secondary System

Description Table).

drivers/acpi/acpi_lpit.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/acpi.h>

#include <asm/msr.h>

#include <asm/tsc.h>

#include "internal.h"



struct lpit_residency_info {

	struct acpi_generic_address gaddr;

drivers/acpi/cppc_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static struct attribute *cppc_attrs[] = { 
};

ATTRIBUTE_GROUPS(cppc);



static struct kobj_type cppc_ktype = {

static const struct kobj_type cppc_ktype = {

	.sysfs_ops = &kobj_sysfs_ops,

	.default_groups = cppc_groups,

};