From patchwork Wed Feb 10 13:02:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 581404 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 D9FE4140779 for ; Thu, 11 Feb 2016 00:06:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=EdmYdorj; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751471AbcBJNEo (ORCPT ); Wed, 10 Feb 2016 08:04:44 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:37708 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751308AbcBJNEm (ORCPT ); Wed, 10 Feb 2016 08:04:42 -0500 Received: by mail-wm0-f41.google.com with SMTP id g62so25825301wme.0 for ; Wed, 10 Feb 2016 05:04:41 -0800 (PST) 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=dfJ5O1EWMmkk/0IClp3sm1K3vmJ2ewvlctyjJolSDvo=; b=EdmYdorjzcty+PTs9rC8ED3XcNJ8euyLdavlQBZxyUUZIUlrq1HYqX/E8BNmEvmfxD le/rvUWYo/Xnhz7NPMuJ93vju+FeM1+zGuuV2bbE11bi6XnqbzoG46HxQIWurPQGDS2J nSZRVbby1gIE01RTtYAli6rYjZ4YBghR1OKCI= 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=dfJ5O1EWMmkk/0IClp3sm1K3vmJ2ewvlctyjJolSDvo=; b=LPgq68PHQEZrrShI1+SNG68zTsaiWTe/Gyz1bKWhaxsFBt58mqonmvKfPY/nkTjpM2 ktXZOyTe1OATmv/HCQQIRHwRlQVKnt6iMj7Not35lPDE3eynIqWUH0gKhIu/hK0eNJzm tYQ8MD4puzjnA5yg35kym7EvoX5BhLn2p3F/hs2FSBRjBIgiQLUmzM6V+odQxVzoNG3S +aZrrklUN1WNtfknndM3Odzf4v5XOQ4HrmzB/lnEbJjF6XAgTcjBw9RVOrImyDsh08mF l6+3I7NQhJ6z6F3eYz8UjBVjeNQxEpR4lw5/S52TfUBcnfDBexBIJ5Ie03ohZ6G8kz6J ROhA== X-Gm-Message-State: AG10YOQyYMv+edaOPo2LcdJL7kV0u41882xh4zXLFINfxh9kQQha9c3a3FyP8Y7sWnNPswj4 X-Received: by 10.194.52.72 with SMTP id r8mr39175039wjo.148.1455109481079; Wed, 10 Feb 2016 05:04:41 -0800 (PST) Received: from localhost.localdomain (host81-129-170-149.range81-129.btcentralplus.com. [81.129.170.149]) by smtp.gmail.com with ESMTPSA id q75sm22429319wmd.6.2016.02.10.05.04.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Feb 2016 05:04:40 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, ajitpal.singh@st.com Cc: kernel@stlinux.com, maxime.coquelin@st.com, Lee Jones Subject: [PATCH 06/11] pwm: sti: Supply PWM Capture clock handling Date: Wed, 10 Feb 2016 13:02:23 +0000 Message-Id: <1455109348-32767-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455109348-32767-1-git-send-email-lee.jones@linaro.org> References: <1455109348-32767-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 2336bac..9e6b1c8 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); }