From: Lee Jones <lee.jones@linaro.org>
To: alokc@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,
ard.biesheuvel@linaro.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
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH v3 5/8] soc: qcom: geni: Add support for ACPI
Date: Mon, 10 Jun 2019 09:42:10 +0100 [thread overview]
Message-ID: <20190610084213.1052-5-lee.jones@linaro.org> (raw)
In-Reply-To: <20190610084213.1052-1-lee.jones@linaro.org>
When booting with ACPI as the active set of configuration tables,
all; clocks, regulators, pin functions ect are expected to be at
their ideal values/levels/rates, thus the associated frameworks
are unavailable. Ensure calls to these APIs are shielded when
ACPI is enabled.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/soc/qcom/qcom-geni-se.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c
index 6b8ef01472e9..d5cf953b4337 100644
--- a/drivers/soc/qcom/qcom-geni-se.c
+++ b/drivers/soc/qcom/qcom-geni-se.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/slab.h>
#include <linux/dma-mapping.h>
@@ -450,6 +451,9 @@ int geni_se_resources_off(struct geni_se *se)
{
int ret;
+ if (has_acpi_companion(se->dev))
+ return 0;
+
ret = pinctrl_pm_select_sleep_state(se->dev);
if (ret)
return ret;
@@ -487,6 +491,9 @@ int geni_se_resources_on(struct geni_se *se)
{
int ret;
+ if (has_acpi_companion(se->dev))
+ return 0;
+
ret = geni_se_clks_on(se);
if (ret)
return ret;
@@ -724,12 +731,14 @@ static int geni_se_probe(struct platform_device *pdev)
if (IS_ERR(wrapper->base))
return PTR_ERR(wrapper->base);
- wrapper->ahb_clks[0].id = "m-ahb";
- wrapper->ahb_clks[1].id = "s-ahb";
- ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks);
- if (ret) {
- dev_err(dev, "Err getting AHB clks %d\n", ret);
- return ret;
+ if (!has_acpi_companion(&pdev->dev)) {
+ wrapper->ahb_clks[0].id = "m-ahb";
+ wrapper->ahb_clks[1].id = "s-ahb";
+ ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks);
+ if (ret) {
+ dev_err(dev, "Err getting AHB clks %d\n", ret);
+ return ret;
+ }
}
dev_set_drvdata(dev, wrapper);
--
2.17.1
next prev parent reply other threads:[~2019-06-10 8:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 8:42 [PATCH v3 1/8] i2c: i2c-qcom-geni: Provide support for ACPI Lee Jones
2019-06-10 8:42 ` [PATCH v3 2/8] i2c: i2c-qcom-geni: Signify successful driver probe Lee Jones
2019-06-11 19:40 ` Bjorn Andersson
2019-06-10 8:42 ` [PATCH v3 3/8] pinctrl: msm: Add ability for drivers to supply a reserved GPIO list Lee Jones
2019-06-12 7:25 ` Linus Walleij
2019-06-10 8:42 ` [PATCH v3 4/8] pinctrl: qcom: sdm845: Provide ACPI support Lee Jones
2019-06-10 8:46 ` Ard Biesheuvel
2019-06-10 8:55 ` Lee Jones
2019-06-10 9:03 ` Ard Biesheuvel
2019-06-10 9:22 ` Lee Jones
2019-06-10 10:20 ` Ard Biesheuvel
2019-06-11 18:39 ` Bjorn Andersson
2019-06-12 7:18 ` Linus Walleij
2019-06-11 18:40 ` Bjorn Andersson
2019-06-10 8:42 ` Lee Jones [this message]
2019-06-10 8:47 ` [PATCH v3 5/8] soc: qcom: geni: Add support for ACPI Ard Biesheuvel
2019-06-10 8:42 ` [PATCH v3 6/8] usb: dwc3: qcom: Add support for booting with ACPI Lee Jones
2019-06-10 8:42 ` [PATCH v3 7/8] usb: dwc3: qcom: Start USB in 'host mode' on the SDM845 Lee Jones
2019-06-11 22:33 ` Bjorn Andersson
2019-06-12 5:57 ` Lee Jones
2019-06-10 8:42 ` [PATCH v3 8/8] usb: dwc3: qcom: Improve error handling Lee Jones
2019-06-10 8:44 ` [PATCH v3 1/8] i2c: i2c-qcom-geni: Provide support for ACPI Ard Biesheuvel
2019-06-12 10:34 ` Wolfram Sang
2019-06-12 10:40 ` Lee Jones
2019-06-12 10:44 ` Wolfram Sang
2019-06-13 8:52 ` Lee Jones
2019-06-13 8:52 ` Lee Jones
2019-06-13 9:19 ` Wolfram Sang
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=20190610084213.1052-5-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=alokc@codeaurora.org \
--cc=andy.gross@linaro.org \
--cc=ard.biesheuvel@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=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).