From patchwork Fri Sep 11 13:09:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 249726 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ecf:0:0:0:0 with SMTP id i15csp1713780ilk; Fri, 11 Sep 2020 07:34:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxB4SvoRt70h9fsWH+/1tRjNKzeUnX4PsS2+CyU0An2YDIT67lnREls+XL6ky0Xv7FwsNsH X-Received: by 2002:aa7:d6c4:: with SMTP id x4mr2277491edr.98.1599834889210; Fri, 11 Sep 2020 07:34:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599834889; cv=none; d=google.com; s=arc-20160816; b=0QEjkN6w90FKq1rvVART7Lechyn5Xiy36ufYW+bX5kib+bMPsGpd3xZKAEbGUn1Zfz rgsxEIk+uW6TOASxnl3+Ym6BIYIt1pGO11f8ZJ+NkUJuKIwZME1duKbKx7ueD6W3gGAO HAHzKyBtGa5qZZ061vXkZpVGKozjxTnDgmvDfKSdpw14h/aJNzpOJeAqf1wKO9jPcLLO ewBD85IqJvATZaEsqAvDtiM/jQ3dpqT2i+1AHGprkbsigsUlBeQc3uz4gnKdOg9kWWrM lTiOfvgRbzMRqpyuDmdxjJNqwUlXKcfYznfhXTHZc564kKqSoLOxh7A7YW5Rrg5V7C4f hAuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=m5KMHGWQDG6Uv1g+cxbh6QspEu1IYdXsFgHaa0ci9nE=; b=klDFPnjHWdVy1SpR/hzwYBf3UfhCGIWcswkBaBrMUolcOwAdOQ3nxR3DDPg2oKT1SV RYuos2j2groqIXKT3J9yiziLzVkxx5qyFepG8JkIrnlwvaE92whj6iBsr0ZP9UsS3yYU 8Adlt3fFMXBgp3OeyHx05MCY4uOyd4WD9egyHTPtXbHEXZMZoi43/E6gsFoic/EuVO/i c9DMgogLeu4Rp4ES/0wCH310TYHN/xGUvVqavgQ37aIY60pnxLOMq00TkWTnpmTrN/E1 FS4dDkJRPv4teqm/Gfgf7kVIub8bDd3txfo9nK9qqOjFYpWy7INCoY3Wxdss3HjXz1Ih uHkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aPdnl4La; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b10si1477455edq.484.2020.09.11.07.34.48; Fri, 11 Sep 2020 07:34:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aPdnl4La; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726211AbgIKOel (ORCPT + 15 others); Fri, 11 Sep 2020 10:34:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726083AbgIKNLy (ORCPT ); Fri, 11 Sep 2020 09:11:54 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C3E5C06179F for ; Fri, 11 Sep 2020 06:10:01 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id q8so5792690lfb.6 for ; Fri, 11 Sep 2020 06:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m5KMHGWQDG6Uv1g+cxbh6QspEu1IYdXsFgHaa0ci9nE=; b=aPdnl4LauZp8bormR5gQukpv+hJDKXUphmNidSWY9kfPjQkdMB4mWSA7HZWaX0lI+k g1y2eJ7zY+nlIYJp+KV3M3GI1IAznKCWvMs1ohovMk29bNXBoGD+hOYR3F98lB+dfWLn PCg4l7iDWyhIuLywPcjtDu1K74k0TExDFdxQWi1AeeBwx4y6SoOMXe5oMELIh8w/bRsZ eIML7ydS/78stgJQhQhZum05rooi0I+HjveNUSw8J9HFl6JEMF9QXP3s/CduAnxNoJi8 MSGiV1EAnn6GpQfpPmsX1FPD/nLzwdHDisMmo2igRbnh7EZwGg7z6KHGvYBFQ5vH8Xkm Lg7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m5KMHGWQDG6Uv1g+cxbh6QspEu1IYdXsFgHaa0ci9nE=; b=Psp5GaCxnwzSniiqozOCW3dMwTi4n8RMPOp+8jHf0vobzbLMzmhqom9RQpGywgDdiv VXBa4T4p+C8vB2kN8A7nUzQWsbMoscEjYNOQTXxa+LiX9ltaZRLct8As8Q/CMYdi8zOT qmzOM1CywjsyysPZAKUCOHgK9AQ7wD/SYgopUVQjSjcy6R+ejLfmp0qKZ19DjCLHIESW jfTW+FM264TGyvXZZ0b+gwueHIRPt9UVNX/ITXnHvPVsTRLFlfUjrl0OFTZ4xmuZ1yuy yzv6X4oM4JI0NN7YFUWNKbmE64apB7wOAvOwF2dyHuO+7PjyIZtSVVCkgHB7w+7QuupO Qx4g== X-Gm-Message-State: AOAM531GEXuXi7zl/9bxCM4DjdlAQC9QjDOByl/kiLjGUkhbGBvVZe7+ ZEuJSm51mg3vzX5fKzKwv4uQSg== X-Received: by 2002:a19:834a:: with SMTP id f71mr780700lfd.59.1599829799561; Fri, 11 Sep 2020 06:09:59 -0700 (PDT) Received: from eriador.lan ([188.162.64.141]) by smtp.gmail.com with ESMTPSA id 10sm429500lfq.64.2020.09.11.06.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 06:09:59 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Rob Herring , Jonathan Marek , Stephen Boyd , Michael Turquette Cc: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam , devicetree@vger.kernel.org Subject: [RFC 2/4] clk: qcom: gdsc: enable external switchable power domain Date: Fri, 11 Sep 2020 16:09:48 +0300 Message-Id: <20200911130950.578483-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200911130950.578483-1-dmitry.baryshkov@linaro.org> References: <20200911130950.578483-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Some GDSCs (SM8250's MDSS_GDSC for example) need switchable power domain to be on to be able to access hardware registers. Use dev_pm/opp to enable corresponding power domain. Signed-off-by: Dmitry Baryshkov --- drivers/clk/qcom/gdsc.c | 56 ++++++++++++++++++++++++++++++++++++++--- drivers/clk/qcom/gdsc.h | 5 ++++ 2 files changed, 57 insertions(+), 4 deletions(-) -- 2.28.0 diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index bfc4ac02f9ea..a522e062a79a 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -110,13 +111,31 @@ static int gdsc_poll_status(struct gdsc *sc, enum gdsc_status status) return -ETIMEDOUT; } +int gdsc_toggle_on(struct gdsc *sc) +{ + if (sc->rsupply) + return regulator_enable(sc->rsupply); + if (sc->pd_dev) + return dev_pm_genpd_set_performance_state(sc->pd_dev, sc->pd_opp); + return 0; +} + +int gdsc_toggle_off(struct gdsc *sc) +{ + if (sc->pd_dev) + return dev_pm_genpd_set_performance_state(sc->pd_dev, 0); + if (sc->rsupply) + return regulator_disable(sc->rsupply); + return 0; +} + static int gdsc_toggle_logic(struct gdsc *sc, enum gdsc_status status) { int ret; u32 val = (status == GDSC_ON) ? 0 : SW_COLLAPSE_MASK; - if (status == GDSC_ON && sc->rsupply) { - ret = regulator_enable(sc->rsupply); + if (status == GDSC_ON) { + ret = gdsc_toggle_on(sc); if (ret < 0) return ret; } @@ -153,8 +172,8 @@ static int gdsc_toggle_logic(struct gdsc *sc, enum gdsc_status status) ret = gdsc_poll_status(sc, status); WARN(ret, "%s status stuck at 'o%s'", sc->pd.name, status ? "ff" : "n"); - if (!ret && status == GDSC_OFF && sc->rsupply) { - ret = regulator_disable(sc->rsupply); + if (!ret && status == GDSC_OFF) { + ret = gdsc_toggle_off(sc); if (ret < 0) return ret; } @@ -407,6 +426,27 @@ int gdsc_register(struct gdsc_desc *desc, return PTR_ERR(scs[i]->rsupply); } + for (i = 0; i < num; i++) { + if (!scs[i] || !scs[i]->domain) + continue; + + scs[i]->pd_opp = of_get_required_opp_performance_state(dev->of_node, scs[i]->perf_idx); + if (scs[i]->pd_opp < 0) + return scs[i]->pd_opp; + + scs[i]->pd_dev = dev_pm_domain_attach_by_name(dev, scs[i]->domain); + if (IS_ERR(scs[i]->pd_dev)) { + ret = PTR_ERR(scs[i]->pd_dev); + /* Single domain has been already attached, so reuse dev */ + if (ret == -EEXIST) { + scs[i]->pd_dev = dev; + } else { + scs[i]->pd_dev = NULL; + goto pm_detach; + } + } + } + data->num_domains = num; for (i = 0; i < num; i++) { if (!scs[i]) @@ -428,6 +468,12 @@ int gdsc_register(struct gdsc_desc *desc, } return of_genpd_add_provider_onecell(dev->of_node, data); + +pm_detach: + for (i = 0; i < num; i++) + if (scs[i]->pd_dev) + dev_pm_domain_detach(scs[i]->pd_dev, false); + return ret; } void gdsc_unregister(struct gdsc_desc *desc) @@ -443,6 +489,8 @@ void gdsc_unregister(struct gdsc_desc *desc) continue; if (scs[i]->parent) pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd); + if (scs[i]->pd_dev && scs[i]->pd_dev != dev) + dev_pm_domain_detach(scs[i]->pd_dev, true); } of_genpd_del_provider(dev->of_node); } diff --git a/drivers/clk/qcom/gdsc.h b/drivers/clk/qcom/gdsc.h index bd537438c793..d58575f8f25f 100644 --- a/drivers/clk/qcom/gdsc.h +++ b/drivers/clk/qcom/gdsc.h @@ -57,6 +57,11 @@ struct gdsc { const char *supply; struct regulator *rsupply; + + const char *domain; + unsigned int perf_idx; + struct device *pd_dev; + int pd_opp; }; struct gdsc_desc {