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

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

Merge branches 'acpi-apei', 'acpi-doc' and 'acpi-soc' 

* acpi-apei:
  ACPI / APEI: Remove needless __ghes_check_estatus() calls

* acpi-doc:
  docs: extcon: convert it to ReST and move to ACPI dir

* acpi-soc:
  ACPI: APD: remove redundant assignment to pointer clk
parents 62fd33d3 371b8689 5d8cbf71 b244883c

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*
@@ -4872,7 +4872,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/
@@ -6042,7 +6042,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/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,

drivers/acpi/apei/ghes.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static int __ghes_peek_estatus(struct ghes *ghes, 
		return -ENOENT;

	}



	return __ghes_check_estatus(ghes, estatus);

	return 0;

}



static int __ghes_read_estatus(struct acpi_hest_generic_status *estatus,