Commit 4b470452 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI updates from Rafael Wysocki:
 "These update the ACPICA code in the kernel to upstream revision
  20190703, fix up the handling of GPEs in ACPICA, allow some more ACPI
  code to be built on ARM64 platforms, allow BGRT to be overridden, fix
  minor issues and clean up assorted pieces of ACPI code.

  Specifics:

   - Update the ACPICA code in the kernel to upstream revision 20190703
     including:
       - Initial/default namespace creation simplification (Bob Moore).
       - Object initialization sequence update (Bob Moore).
       - Removal of legacy module-level (dead) code (Erik Schmauss).
       - Table load object initialization update (Erik Schmauss,
         Nikolaus Voss).

   - Fix GPE enabling issue in ACPICA causing premature wakeups from
     suspend-to-idle to occur (Rafael Wysocki).

   - Allow ACPI AC and battery drivers to be built on non-X86 (Ard
     Biesheuvel).

   - Fix address space handler removal in the ACPI PMIC driver for Intel
     platforms (Andy Shevchenko).

   - Allow BGRT to be overridden via initrd or configfs (Andrea
     Oliveri).

   - Fix object resolution on table loads via configfs (Nikolaus Voss).

   - Clean up assorted pieces of ACPI code and tools (Colin Ian King,
     Liguang Zhang, Masahiro Yamada).

   - Fix documentation build warning, convert the extcon document to
     ReST and add it to the ACPI documentation (Mauro Carvalho Chehab,
     Qian Cai)"

* tag 'acpi-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / APEI: Remove needless __ghes_check_estatus() calls
  ACPICA: Update version to 20190703
  ACPICA: Update table load object initialization
  ACPICA: Update for object initialization sequence
  ACPICA: remove legacy module-level code due to deprecation
  ACPICA: Namespace: simplify creation of the initial/default namespace
  ACPI / PMIC: intel: Drop double removal of address space handler
  ACPI: APD: remove redundant assignment to pointer clk
  docs: extcon: convert it to ReST and move to ACPI dir
  ACPI: Make AC and battery drivers available on !X86
  ACPICA: Clear status of GPEs on first direct enable
  ACPI: configfs: Resolve objects on host-directed table loads
  ACPI: tables: Allow BGRT to be overridden
  ACPI: OSL: Make a W=1 kernel-doc warning go away
  ACPI: tools: Exclude tools/* from .gitignore patterns
parents cf2d213e 64372c0b

Documentation/extcon/intel-int3496.txt→Documentation/firmware-guide/acpi/extcon-intel-int3496.rst

+10 −4
Original line number Diff line number Diff line 
=====================================================

Intel INT3496 ACPI device extcon driver documentation

-----------------------------------------------------

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



The Intel INT3496 ACPI device extcon driver is a driver for ACPI

devices with an acpi-id of INT3496, such as found for example on
@@ -13,15 +14,20 @@ between an USB host and an USB peripheral controller. 
The ACPI devices exposes this functionality by returning an array with up

to 3 gpio descriptors from its ACPI _CRS (Current Resource Settings) call:



Index 0: The input gpio for the id-pin, this is always present and valid

Index 1: The output gpio for enabling Vbus output from the device to the otg

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

Index 0  The input gpio for the id-pin, this is always present and valid

Index 1  The output gpio for enabling Vbus output from the device to the otg

         port, write 1 to enable the Vbus output (this gpio descriptor may

         be absent or invalid)

Index 2: The output gpio for muxing of the data pins between the USB host and

Index 2  The output gpio for muxing of the data pins between the USB host and

         the USB peripheral controller, write 1 to mux to the peripheral

         controller

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



There is a mapping between indices and GPIO connection IDs as follows



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

	id	index 0

	vbus	index 1

	mux	index 2

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

Documentation/firmware-guide/acpi/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -24,3 +24,4 @@ ACPI Support 
   acpi-lid

   lpit

   video_extension

   extcon-intel-int3496

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ F: drivers/pnp/pnpacpi/ 
F:	include/linux/acpi.h

F:	include/linux/fwnode.h

F:	include/acpi/

F:	Documentation/acpi/

F:	Documentation/firmware-guide/acpi/

F:	Documentation/ABI/testing/sysfs-bus-acpi

F:	Documentation/ABI/testing/configfs-acpi

F:	drivers/pci/*acpi*
@@ -4893,7 +4893,7 @@ S: Maintained 
F:	Documentation/

F:	scripts/kernel-doc

X:	Documentation/ABI/

X:	Documentation/acpi/

X:	Documentation/firmware-guide/acpi/

X:	Documentation/devicetree/

X:	Documentation/i2c/

X:	Documentation/media/
@@ -6069,7 +6069,7 @@ S: Maintained 
F:	drivers/extcon/

F:	include/linux/extcon/

F:	include/linux/extcon.h

F:	Documentation/extcon/

F:	Documentation/firmware-guide/acpi/extcon-intel-int3496.rst

F:	Documentation/devicetree/bindings/extcon/



EXYNOS DP DRIVER

drivers/acpi/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ config ACPI_EC_DEBUGFS 


config ACPI_AC

	tristate "AC Adapter"

	depends on X86

	select POWER_SUPPLY

	default y

	help
@@ -168,7 +167,6 @@ config ACPI_AC 


config ACPI_BATTERY

	tristate "Battery"

	depends on X86

	select POWER_SUPPLY

	default y

	help

drivers/acpi/acpi_apd.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct apd_private_data { 
static int acpi_apd_setup(struct apd_private_data *pdata)

{

	const struct apd_device_desc *dev_desc = pdata->dev_desc;

	struct clk *clk = ERR_PTR(-ENODEV);

	struct clk *clk;



	if (dev_desc->fixed_clk_rate) {

		clk = clk_register_fixed_rate(&pdata->adev->dev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE