Re: [PATCH v2 1/8] i2c: i2c-qcom-geni: Provide support for ACPI

Add a match table to allow automatic probing of ACPI device
QCOM0220.  Ignore clock attainment errors.  Set default clock
frequency value.

Signed-off-by: Lee Jones <redacted>
---
 drivers/i2c/busses/i2c-qcom-geni.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
index db075bc0d952..0fa93b448e8d 100644
--- a/drivers/i2c/busses/i2c-qcom-geni.c
+++ b/drivers/i2c/busses/i2c-qcom-geni.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 // Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

+#include <linux/acpi.h>
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/err.h>

@@ -483,6 +484,12 @@ static const struct i2c_algorithm geni_i2c_algo = {
        .functionality  = geni_i2c_func,
 };

+static const struct acpi_device_id geni_i2c_acpi_match[] = {
+       { "QCOM0220"},
+       { },
+};
+MODULE_DEVICE_TABLE(acpi, geni_i2c_acpi_match);
+

 static int geni_i2c_probe(struct platform_device *pdev)
 {
        struct geni_i2c_dev *gi2c;

@@ -502,7 +509,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(gi2c->se.base);

        gi2c->se.clk = devm_clk_get(&pdev->dev, "se");

                ret = PTR_ERR(gi2c->se.clk);
                dev_err(&pdev->dev, "Err getting SE Core clk %d\n", ret);
                return ret;

@@ -510,12 +517,19 @@ static int geni_i2c_probe(struct platform_device *pdev)

        ret = device_property_read_u32(&pdev->dev, "clock-frequency",
                                                        &gi2c->clk_freq_out);
-       if (ret) {
+       if (ret && !ACPI_HANDLE(&pdev->dev)) {
                dev_info(&pdev->dev,
                        "Bus frequency not specified, default to 100kHz.\n");
                gi2c->clk_freq_out = KHZ(100);
        }

+       if (ACPI_HANDLE(&pdev->dev)) {
+               ACPI_COMPANION_SET(&gi2c->adap.dev, ACPI_COMPANION(&pdev->dev));
+
+               /* Using default, same as the !ACPI case above */
+               gi2c->clk_freq_out = KHZ(100);
+       }
+

        gi2c->irq = platform_get_irq(pdev, 0);
        if (gi2c->irq < 0) {
                dev_err(&pdev->dev, "IRQ error for i2c-geni\n");

@@ -660,6 +674,7 @@ static struct platform_driver geni_i2c_driver = {
                .name = "geni_i2c",
                .pm = &geni_i2c_pm_ops,
                .of_match_table = geni_i2c_dt_match,
+               .acpi_match_table = ACPI_PTR(geni_i2c_acpi_match),
        },
 };

--

2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel