From: Lee Jones <lee.jones@linaro.org>
To: alokc@codeaurora.org, agross@kernel.org, david.brown@linaro.org,
wsa+renesas@sang-engineering.com, bjorn.andersson@linaro.org,
balbi@kernel.org, gregkh@linuxfoundation.org,
ard.biesheuvel@linaro.org, jlhugo@gmail.com
Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-gpio@vger.kernel.org, linux-i2c@vger.kernel.org,
Lee Jones <lee.jones@linaro.org>,
linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.or
Subject: [PATCH v4 3/6] soc: qcom: geni: Add support for ACPI
Date: Wed, 12 Jun 2019 15:26:51 +0100 [thread overview]
Message-ID: <20190612142654.9639-4-lee.jones@linaro.org> (raw)
In-Reply-To: <20190612142654.9639-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>
Acked-by: Ard Biesheuvel <ard.biesheuvel@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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-06-12 14:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 14:26 [PATCH v4 0/6] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Lee Jones
2019-06-12 14:26 ` [PATCH v4 1/6] i2c: i2c-qcom-geni: Provide support for ACPI Lee Jones
2019-06-14 21:17 ` Wolfram Sang
2019-06-12 14:26 ` [PATCH v4 2/6] i2c: i2c-qcom-geni: Signify successful driver probe Lee Jones
2019-06-14 21:17 ` Wolfram Sang
2019-06-12 14:26 ` Lee Jones [this message]
2019-06-17 10:14 ` [PATCH v4 3/6] soc: qcom: geni: Add support for ACPI Lee Jones
2019-06-19 5:43 ` Bjorn Andersson
2019-06-12 14:26 ` [PATCH v4 4/6] usb: dwc3: qcom: Add support for booting with ACPI Lee Jones
2019-06-17 10:21 ` Lee Jones
2019-06-17 12:32 ` Felipe Balbi
2019-06-17 12:43 ` Lee Jones
2019-06-17 12:45 ` Felipe Balbi
2019-06-12 14:26 ` [PATCH v4 5/6] usb: dwc3: qcom: Start USB in 'host mode' on the SDM845 Lee Jones
2019-06-12 14:26 ` [PATCH v4 6/6] usb: dwc3: qcom: Improve error handling 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=20190612142654.9639-4-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=agross@kernel.org \
--cc=alokc@codeaurora.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=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.or \
--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).