soc: qcom: geni: Add support for ACPI

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>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <agross@kernel.org>

diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c
index 6b8ef01472e98af95df2053ab60160a5ac2391b0..d5cf953b4337020acad2ee5fd83973640f50fe13 100644 (file)
--- 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);