Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

soc: qcom: geni: Add support for ACPI

Browse Source 
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>
This commit is contained in:
Lee Jones 2019-06-17 13:51:02 +01:00 committed by Andy Gross
parent 2498f8c1c6
commit e1068c32c1
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/soc/qcom/qcom-geni-se.c
View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. // Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
#include <linux/acpi.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
@ -450,6 +451,9 @@ int geni_se_resources_off(struct geni_se *se)
{ {
int ret; int ret;
if (has_acpi_companion(se->dev))
return 0;
ret = pinctrl_pm_select_sleep_state(se->dev); ret = pinctrl_pm_select_sleep_state(se->dev);
if (ret) if (ret)
return ret; return ret;
@ -487,6 +491,9 @@ int geni_se_resources_on(struct geni_se *se)
{ {
int ret; int ret;
if (has_acpi_companion(se->dev))
return 0;
ret = geni_se_clks_on(se); ret = geni_se_clks_on(se);
if (ret) if (ret)
return ret; return ret;
@ -724,12 +731,14 @@ static int geni_se_probe(struct platform_device *pdev)
if (IS_ERR(wrapper->base)) if (IS_ERR(wrapper->base))
return PTR_ERR(wrapper->base); return PTR_ERR(wrapper->base);
wrapper->ahb_clks[0].id = "m-ahb"; if (!has_acpi_companion(&pdev->dev)) {
wrapper->ahb_clks[1].id = "s-ahb"; wrapper->ahb_clks[0].id = "m-ahb";
ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks); wrapper->ahb_clks[1].id = "s-ahb";
if (ret) { ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks);
dev_err(dev, "Err getting AHB clks %d\n", ret); if (ret) {
return ret; dev_err(dev, "Err getting AHB clks %d\n", ret);
return ret;
}
} }
dev_set_drvdata(dev, wrapper); dev_set_drvdata(dev, wrapper);