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

diff --git a/Documentation/extcon/intel-int3496.txt b/Documentation/extcon/intel-int3496.txt
deleted file mode 100644 (file)
index 8155dbc..0000000
--- a/Documentation/extcon/intel-int3496.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-Intel Baytrail and Cherrytrail tablets.
-
-This ACPI device describes how the OS can read the id-pin of the devices'
-USB-otg port, as well as how it optionally can enable Vbus output on the
-otg port and how it can optionally control the muxing of the data pins
-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
-         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
-         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

diff --git a/Documentation/firmware-guide/acpi/extcon-intel-int3496.rst b/Documentation/firmware-guide/acpi/extcon-intel-int3496.rst
new file mode 100644 (file)
index 0000000..5137ca8
--- /dev/null
+++ b/Documentation/firmware-guide/acpi/extcon-intel-int3496.rst
@@ -0,0 +1,33 @@
+=====================================================
+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
+Intel Baytrail and Cherrytrail tablets.
+
+This ACPI device describes how the OS can read the id-pin of the devices'
+USB-otg port, as well as how it optionally can enable Vbus output on the
+otg port and how it can optionally control the muxing of the data pins
+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
+         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
+         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
+       ======= =======

diff --git a/Documentation/firmware-guide/acpi/index.rst b/Documentation/firmware-guide/acpi/index.rst
index ae609eec4679c0dc19387677a71c8fb36cf65504..90c90d42d9ad6284dbf0a2126d5025cc31d1c491 100644 (file)
--- a/Documentation/firmware-guide/acpi/index.rst
+++ b/Documentation/firmware-guide/acpi/index.rst
@@ -24,3 +24,4 @@ ACPI Support
    acpi-lid
    lpit
    video_extension
+   extcon-intel-int3496

diff --git a/MAINTAINERS b/MAINTAINERS
index 01a52fc964daeaf54e30cdfe86ba4e23a9e55425..9a6c83282bdf03f67b9db88a0c3da3fa8f51297d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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

diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index ff47317d8ef12f92e67fd0077bfe87cc0550f9c0..7cd0c9ac71ea2c10803a37db5e37550f3571094c 100644 (file)
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -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,

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 993940d582f5075db5fb1f291f612a9f8f0039c7..a66e00fe31fec16774bbb795c50427183c137e27 100644 (file)
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -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,