From patchwork Fri Apr 22 10:18:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 613500 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qrs773VZSz9sCj for ; Fri, 22 Apr 2016 20:19:47 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=CHorazSx; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750806AbcDVKTe (ORCPT ); Fri, 22 Apr 2016 06:19:34 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:38275 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752536AbcDVKS3 (ORCPT ); Fri, 22 Apr 2016 06:18:29 -0400 Received: by mail-wm0-f50.google.com with SMTP id u206so19369898wme.1 for ; Fri, 22 Apr 2016 03:18:28 -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; bh=O8UEVZjJv3roxIJlB8TUVTZXlLwJoUH1NhYpqKB+X2Q=; b=CHorazSxUblCvODfYavXRehegZ/oLj07NkDrvl0xLTPnSX3+db3ZzatjPmQa5mEkdh CnzVsIwMJHnmj8RYm6vAe2LzugD6Qx6gWSCOAc49wIqS695liCqLq2RzZVOD5M4djgO3 maB+CkUMkAw7x3cniIgjXpKBEVrPUr2H/dnUY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=O8UEVZjJv3roxIJlB8TUVTZXlLwJoUH1NhYpqKB+X2Q=; b=VrG6VvhRKYtm5XYgGY33T8JNISETh+WJycYtlC8S98rMjGNZB9o9rxKuGc448rh7yo 4AUDuIZJpjxyunIpgzcS35MMWyXlf0Q6sb2+S6UZJ0qFTeIcccFQoDbOVrDEcuGbn9/l fXCHh0niwiZYoGQELyhZLmGBixY+OZCQfZrZKyyDcLYoAFVnTz7tD8UL7aIIVXaaETPS TionvShLWfHn71FpBWQxbyd25Q6P9SrQCgvYHURVXj5f9Tygaih8BcyqZrNrpTOokL2/ hIUtBbONNN/R/ftRKSBrNB52AvJ82NL57la4/KqW0LafRuWMHwjU3oOyQbG43U15Qk01 aUmQ== X-Gm-Message-State: AOPr4FUS5fluy7uu+aNTubkNMId4hBpCBVTQs3qb486997MLF8YordqFUZ9BPV3Ddrynmc/3 X-Received: by 10.194.192.106 with SMTP id hf10mr18962743wjc.134.1461320307473; Fri, 22 Apr 2016 03:18:27 -0700 (PDT) Received: from dell.localdomain (host81-129-172-5.range81-129.btcentralplus.com. [81.129.172.5]) by smtp.gmail.com with ESMTPSA id a1sm7316345wje.43.2016.04.22.03.18.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2016 03:18:26 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, linux-pwm@vger.kernel.org, thierry.reding@gmail.com, ajitpal.singh@st.com, Lee Jones Subject: [[PATCH v2] 07/11] pwm: sti: Supply PWM Capture clock handling Date: Fri, 22 Apr 2016 11:18:11 +0100 Message-Id: <1461320295-20414-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1461320295-20414-1-git-send-email-lee.jones@linaro.org> References: <1461320295-20414-1-git-send-email-lee.jones@linaro.org> Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org ST's PWM IP is supplied by 2 different clocks. One for PWM Output and the other for Capture. This patch provides clock handling for the latter. Signed-off-by: Lee Jones --- drivers/pwm/pwm-sti.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index 2f61e1e..78979d0 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -74,6 +74,7 @@ struct sti_pwm_compat_data { struct sti_pwm_chip { struct device *dev; struct clk *pwm_clk; + struct clk *cpt_clk; struct regmap *regmap; struct sti_pwm_compat_data *cdata; struct regmap_field *prescale_low; @@ -183,6 +184,10 @@ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, if (ret) return ret; + ret = clk_enable(pc->cpt_clk); + if (ret) + return ret; + if (!period_same) { ret = sti_pwm_get_prescale(pc, period_ns, &prescale); if (ret) @@ -227,6 +232,7 @@ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, clk_dis: clk_disable(pc->pwm_clk); + clk_disable(pc->cpt_clk); return ret; } @@ -246,6 +252,10 @@ static int sti_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) if (ret) goto out; + ret = clk_enable(pc->cpt_clk); + if (ret) + goto out; + ret = regmap_field_write(pc->pwm_out_en, 1); if (ret) { dev_err(dev, "failed to enable PWM device:%d\n", @@ -271,6 +281,7 @@ static void sti_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) regmap_field_write(pc->pwm_out_en, 0); clk_disable(pc->pwm_clk); + clk_disable(pc->cpt_clk); mutex_unlock(&pc->sti_pwm_lock); } @@ -390,6 +401,18 @@ static int sti_pwm_probe(struct platform_device *pdev) return ret; } + pc->cpt_clk = of_clk_get_by_name(dev->of_node, "capture"); + if (IS_ERR(pc->cpt_clk)) { + dev_err(dev, "failed to get PWM capture clock\n"); + return PTR_ERR(pc->cpt_clk); + } + + ret = clk_prepare(pc->cpt_clk); + if (ret) { + dev_err(dev, "failed to prepare clock\n"); + return ret; + } + pc->chip.dev = dev; pc->chip.ops = &sti_pwm_ops; pc->chip.base = -1; @@ -399,6 +422,7 @@ static int sti_pwm_probe(struct platform_device *pdev) ret = pwmchip_add(&pc->chip); if (ret < 0) { clk_unprepare(pc->pwm_clk); + clk_unprepare(pc->cpt_clk); return ret; } @@ -416,6 +440,7 @@ static int sti_pwm_remove(struct platform_device *pdev) pwm_disable(&pc->chip.pwms[i]); clk_unprepare(pc->pwm_clk); + clk_unprepare(pc->cpt_clk); return pwmchip_remove(&pc->chip); }