[PATCH v12 8/9] LPC, ACPI: Add the HISI LPC ACPI support

[John Garry]

Based on the previous patches, this patch supports the LPC host on
Hip06/Hip07 for ACPI FW.

Signed-off-by: John Garry <john.ga...@huawei.com>
Signed-off-by: Zhichang Yuan <yuanzhich...@hisilicon.com>
Signed-off-by: Gabriele Paoloni <gabriele.paol...@huawei.com>
Tested-by: Dann Frazier <dann.fraz...@canonical.com>
---
 drivers/acpi/arm64/acpi_indirectio.c | 11 ++++++++++-
 drivers/bus/hisi_lpc.c               | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/arm64/acpi_indirectio.c 
b/drivers/acpi/arm64/acpi_indirectio.c
index 2649f57..6403f84 100644
--- a/drivers/acpi/arm64/acpi_indirectio.c
+++ b/drivers/acpi/arm64/acpi_indirectio.c
@@ -142,7 +142,7 @@ int acpi_indirectio_set_logicio_res(struct device *child,
        return ret;
 }
 
-int
+static int
 acpi_indirectio_pre_setup(struct acpi_device *adev,
                          struct acpi_indirectio_host_data *pdata)
 {
@@ -239,8 +239,17 @@ int acpi_indirectio_set_logicio_res(struct device *child,
        return ret;
 }
 
+const struct acpi_indirectio_device_desc hisi_lpc_host_desc = {
+       .pdata = {
+               .io_size = PIO_INDIRECT_SIZE,
+               .io_start = 0,
+       },
+       .pre_setup = acpi_indirectio_pre_setup,
+};
+
 /* All the host devices which apply indirect-IO can be listed here. */
 static const struct acpi_device_id acpi_indirect_host_id[] = {
+       {"HISI0191", INDIRECT_IO_INFO(hisi_lpc_host_desc)},
        {""},
 };
 
diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c
index 4ce089a..9cabb84 100644
--- a/drivers/bus/hisi_lpc.c
+++ b/drivers/bus/hisi_lpc.c
@@ -457,7 +457,13 @@ static int hisilpc_probe(struct platform_device *pdev)
        }
 
        /* register the LPC host PIO resources */
-       {
+       if (has_acpi_companion(dev)) {
+               lpcdev->io_host = find_io_range_by_fwnode(dev->fwnode);
+               if (!lpcdev->io_host) {
+                       dev_err(dev, "range not registered!\n");
+                       return -EFAULT;
+               }
+       } else {
                struct logic_pio_hwaddr *range;
 
                range = devm_kzalloc(dev, sizeof(*range), GFP_KERNEL);
@@ -515,10 +521,19 @@ static int hisilpc_probe(struct platform_device *pdev)
        {},
 };
 
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id hisilpc_acpi_match[] = {
+       {"HISI0191", },
+       {},
+};
+
+#endif
+
 static struct platform_driver hisilpc_driver = {
        .driver = {
                .name           = "hisi_lpc",
                .of_match_table = hisilpc_of_match,
+               .acpi_match_table = ACPI_PTR(hisilpc_acpi_match),
        },
        .probe = hisilpc_probe,
 };
-- 
1.9.1