From: Lee Jones <lee.jones@linaro.org>
To: alokc@codeaurora.org, kramasub@codeaurora.org,
andy.gross@linaro.org, david.brown@linaro.org,
wsa+renesas@sang-engineering.com, bjorn.andersson@linaro.org,
linus.walleij@linaro.org, balbi@kernel.org,
gregkh@linuxfoundation.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, jlhugo@gmail.com,
linux-i2c@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-gpio@vger.kernel.org, linux-usb@vger.kernel.org,
Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 1/8] i2c: i2c-qcom-geni: Provide support for ACPI
Date: Tue, 4 Jun 2019 11:44:48 +0100 [thread overview]
Message-ID: <20190604104455.8877-1-lee.jones@linaro.org> (raw)
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 <lee.jones@linaro.org>
---
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");
- if (IS_ERR(gi2c->se.clk)) {
+ if (IS_ERR(gi2c->se.clk) && !ACPI_HANDLE(&pdev->dev)) {
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
next reply other threads:[~2019-06-04 10:45 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-04 10:44 Lee Jones [this message]
2019-06-04 10:44 ` [PATCH 2/8] i2c: i2c-qcom-geni: Signify successful driver probe Lee Jones
2019-06-05 6:20 ` Bjorn Andersson
2019-06-05 7:16 ` Lee Jones
2019-06-05 7:22 ` Ard Biesheuvel
2019-06-05 8:23 ` Lee Jones
2019-06-05 7:56 ` Johan Hovold
2019-06-05 8:20 ` Lee Jones
2019-06-05 8:33 ` Johan Hovold
2019-06-05 8:49 ` Lee Jones
2019-06-05 8:55 ` Johan Hovold
2019-06-05 14:18 ` Wolfram Sang
2019-06-05 18:49 ` Lee Jones
2019-06-12 14:54 ` Johan Hovold
2019-06-04 10:44 ` [PATCH 3/8] pinctrl: msm: Add ability for drivers to supply a reserved GPIO list Lee Jones
2019-06-04 10:44 ` [PATCH 4/8] pinctrl: qcom: sdm845: Provide ACPI support Lee Jones
2019-06-05 6:17 ` Bjorn Andersson
2019-06-05 7:31 ` Lee Jones
2019-06-05 19:06 ` Bjorn Andersson
2019-06-05 19:35 ` Lee Jones
2019-06-04 10:44 ` [PATCH 5/8] soc: qcom: geni: Add support for ACPI Lee Jones
2019-06-04 10:44 ` [PATCH 6/8] usb: dwc3: qcom: Add support for booting with ACPI Lee Jones
2019-06-05 6:35 ` Bjorn Andersson
2019-06-05 7:09 ` Lee Jones
2019-06-05 9:55 ` Lee Jones
2019-06-04 10:44 ` [PATCH 7/8] usb: dwc3: qcom: Start USB in 'host mode' on the SDM845 Lee Jones
2019-06-05 7:00 ` Bjorn Andersson
2019-06-05 8:34 ` Lee Jones
2019-06-05 14:07 ` Jeffrey Hugo
2019-06-05 18:50 ` Lee Jones
2019-06-05 19:14 ` Bjorn Andersson
2019-06-05 19:29 ` Lee Jones
2019-06-04 10:44 ` [PATCH 8/8] usb: dwc3: qcom: Improve error handling Lee Jones
2019-06-05 7:03 ` Bjorn Andersson
2019-06-05 11:42 [PATCH 1/8] i2c: i2c-qcom-geni: Provide support for ACPI Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190604104455.8877-1-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=alokc@codeaurora.org \
--cc=andy.gross@linaro.org \
--cc=balbi@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=david.brown@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jlhugo@gmail.com \
--cc=kramasub@codeaurora.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=wsa+renesas@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).