From patchwork Fri Jun 5 12:40:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 49573 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 587112157C for ; Fri, 5 Jun 2015 12:41:13 +0000 (UTC) Received: by laar3 with SMTP id r3sf4161687laa.3 for ; Fri, 05 Jun 2015 05:41:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=3I/IrfWRPT3WF9a/bzAMU6c1cSbXe8y3c/dxIoU82bI=; b=eGV4PvnmO6KmmKu9THaeU/D7iKWR1nwyT5mPW6wMnrXoHc7LUckVpVfmn1HJxLoJeQ 0pNsPZZqpK4a35alW6NINbAfB60FEYvVVz2MTbe7UShLa4C0dCO8dchmhrIa/Av+NZOJ qnra9DDs/dgH6DMpAVH65U+TCg7WfzcP5V2XJCqXgw93UZrnGOk7GC7SFT1IHljzKApu FMpoYpk6oQd9TNrVIJdj0IVLvZTfzKw9eTaA55Br7de0kAt1qYF9GnqOPh0ui/HcXnc9 Wa2Jdk/QZQFq8F0SQYwgi2BfRw77W8ws2qXnIhm/BoqaB+OgFmpihr4x2Hbv4HxpNJDh pspA== X-Gm-Message-State: ALoCoQll8/3qX9S5Dh+2Z7wfR3nutypCLw9XcR4raDld0NfC2MKLSchIqs3zOLsxFwtw8Rot59kj X-Received: by 10.152.42.208 with SMTP id q16mr3046888lal.9.1433508072230; Fri, 05 Jun 2015 05:41:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.169 with SMTP id l9ls358729lah.52.gmail; Fri, 05 Jun 2015 05:41:12 -0700 (PDT) X-Received: by 10.152.45.66 with SMTP id k2mr3108160lam.111.1433508072024; Fri, 05 Jun 2015 05:41:12 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id zo2si4716918lbb.103.2015.06.05.05.41.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jun 2015 05:41:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbtu8 with SMTP id tu8so29210105lbb.2 for ; Fri, 05 Jun 2015 05:41:11 -0700 (PDT) X-Received: by 10.112.222.133 with SMTP id qm5mr3219173lbc.86.1433508071733; Fri, 05 Jun 2015 05:41:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1401868lbb; Fri, 5 Jun 2015 05:41:10 -0700 (PDT) X-Received: by 10.68.250.194 with SMTP id ze2mr5909327pbc.24.1433508070004; Fri, 05 Jun 2015 05:41:10 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rf8si10754344pdb.180.2015.06.05.05.41.09; Fri, 05 Jun 2015 05:41:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754635AbbFEMk6 (ORCPT + 28 others); Fri, 5 Jun 2015 08:40:58 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:38236 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754538AbbFEMks (ORCPT ); Fri, 5 Jun 2015 08:40:48 -0400 Received: by wibdq8 with SMTP id dq8so17681618wib.1 for ; Fri, 05 Jun 2015 05:40:47 -0700 (PDT) X-Received: by 10.194.192.166 with SMTP id hh6mr5986891wjc.127.1433508047655; Fri, 05 Jun 2015 05:40:47 -0700 (PDT) Received: from mms.wifi.mm-sol.com ([37.157.136.206]) by mx.google.com with ESMTPSA id l6sm3250172wib.18.2015.06.05.05.40.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jun 2015 05:40:47 -0700 (PDT) From: Georgi Djakov To: sboyd@codeaurora.org Cc: mturquette@linaro.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v2 3/5] clk: qcom: Add support for RCGs with shared branches Date: Fri, 5 Jun 2015 15:40:34 +0300 Message-Id: <1433508036-28644-4-git-send-email-georgi.djakov@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1433508036-28644-1-git-send-email-georgi.djakov@linaro.org> References: <1433508036-28644-1-git-send-email-georgi.djakov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: georgi.djakov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Some root clock generators may have child branches that are controlled by different CPUs. These RCGs require special operations. Signed-off-by: Georgi Djakov --- drivers/clk/qcom/clk-rcg.h | 1 + drivers/clk/qcom/clk-rcg2.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h index 706a55b34b81..c233a8f5e910 100644 --- a/drivers/clk/qcom/clk-rcg.h +++ b/drivers/clk/qcom/clk-rcg.h @@ -170,6 +170,7 @@ struct clk_rcg2 { extern const struct clk_ops clk_rcg2_ops; extern const struct clk_ops clk_rcg2_ro_ops; +extern const struct clk_ops clk_rcg2_shared_ops; extern const struct clk_ops clk_edp_pixel_ops; extern const struct clk_ops clk_byte_ops; extern const struct clk_ops clk_pixel_ops; diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c index cb17fd4b193f..60563adad21d 100644 --- a/drivers/clk/qcom/clk-rcg2.c +++ b/drivers/clk/qcom/clk-rcg2.c @@ -47,6 +47,8 @@ #define N_REG 0xc #define D_REG 0x10 +#define XO_FREQ 19200000 + static int clk_rcg2_is_enabled(struct clk_hw *hw) { struct clk_rcg2 *rcg = to_clk_rcg2(hw); @@ -308,6 +310,68 @@ const struct clk_ops clk_rcg2_ro_ops = { }; EXPORT_SYMBOL_GPL(clk_rcg2_ro_ops); +static int clk_rcg2_shared_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct clk_rcg2 *rcg = to_clk_rcg2(hw); + const char *name = __clk_get_name(hw->clk); + int ret, count; + unsigned int cmd = CMD_ROOT_EN; + + /* force enable RCG */ + ret = regmap_update_bits(rcg->clkr.regmap, rcg->cmd_rcgr + CMD_REG, + cmd, cmd); + if (ret) + return ret; + + /* wait for RCG to turn ON */ + for (count = 500; count > 0; count--) { + ret = clk_rcg2_is_enabled(hw); + if (ret) + break; + udelay(1); + } + if (!count) + pr_err("%s: RCG did not turn on\n", name); + + /* set clock rate */ + ret = __clk_rcg2_set_rate(hw, rate); + if (ret) + return ret; + + /* clear force enable RCG */ + ret = regmap_update_bits(rcg->clkr.regmap, rcg->cmd_rcgr + CMD_REG, + cmd, ~cmd); + if (ret) + return ret; + + return 0; +} + +static int clk_rcg2_shared_enable(struct clk_hw *hw) +{ + unsigned long rate = __clk_get_rate(hw->clk); + + return clk_rcg2_shared_set_rate(hw, rate, 0); +} + +static void clk_rcg2_shared_disable(struct clk_hw *hw) +{ + /* switch to XO, which is always-on */ + clk_rcg2_shared_set_rate(hw, XO_FREQ, 0); +} + +const struct clk_ops clk_rcg2_shared_ops = { + .enable = clk_rcg2_shared_enable, + .disable = clk_rcg2_shared_disable, + .get_parent = clk_rcg2_get_parent, + .is_enabled = clk_rcg2_is_enabled, + .recalc_rate = clk_rcg2_recalc_rate, + .determine_rate = clk_rcg2_determine_rate, + .set_rate = clk_rcg2_shared_set_rate, +}; +EXPORT_SYMBOL_GPL(clk_rcg2_shared_ops); + struct frac_entry { int num; int den;