From patchwork Wed Mar 2 15:32:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 63397 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2449145lbc; Wed, 2 Mar 2016 07:36:30 -0800 (PST) X-Received: by 10.66.145.68 with SMTP id ss4mr39419988pab.79.1456932989295; Wed, 02 Mar 2016 07:36:29 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w12si58913606pfa.177.2016.03.02.07.36.28; Wed, 02 Mar 2016 07:36:29 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755491AbcCBPgY (ORCPT + 30 others); Wed, 2 Mar 2016 10:36:24 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37616 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754877AbcCBPeW (ORCPT ); Wed, 2 Mar 2016 10:34:22 -0500 Received: by mail-wm0-f52.google.com with SMTP id p65so83147350wmp.0 for ; Wed, 02 Mar 2016 07:34:22 -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=f2FQ15y/ed7e0bQuKtn+o8FZsJ/DuNHyC16cfu2wMz4=; b=Ug/zUsnp/ZeMuhroLu1HygpoTb+0fICMo7XhBK8auf1gnnoEXIH09X+V6/mVBdDfsr oqmG9EflpnTShxwHXmWA9qyJ29fIB3YlQzKtIij9oeFXzByYB1klhvTyTpb4MP4awvpu JmBlUKWi+68zra8YnUASYhJtDWwF9hAZoRN6E= 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=f2FQ15y/ed7e0bQuKtn+o8FZsJ/DuNHyC16cfu2wMz4=; b=bpiw74ASBLRfSRZAq9URPC+ObG/ep7n45oCiJI8EIhc9aaWdZPOE+NA1ktWPdvmf50 VkI6VBM9faXIK32GXXUx3sc5wFc5MvyJLzuv2d1988uzmC/OuDipiSSlf787kx5ZKyu2 nat6FVLr6WonS8tomswiZ3iaBYgo4tucOa0fH4VALiOuo9Hb7YvKrC2DdfYNDXu1MO8/ 2GLyFMatxCXl+4KnVZWAa7k+UW8aga12Wtx4cpmbug+B8pMoV9eudvDvMWuBft3M8fHp uFmfbDxEEWHO82BcqH2WrtG48pljaVhuptc4ip9aC2iKR1QAihGUe6OAo8CIv1852nWg W3wg== X-Gm-Message-State: AD7BkJKGcBpMGkr26S0CjKWoTA04/F8yaCu8sCehShBufD1TwKkKiaSeT3uAqg9yQahC53o2 X-Received: by 10.28.48.137 with SMTP id w131mr527090wmw.73.1456932861264; Wed, 02 Mar 2016 07:34:21 -0800 (PST) Received: from localhost.localdomain (host81-154-142-245.range81-154.btcentralplus.com. [81.154.142.245]) by smtp.gmail.com with ESMTPSA id da6sm26941407wjb.24.2016.03.02.07.34.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Mar 2016 07:34:20 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, ajitpal.singh@st.com, Lee Jones Subject: [RESEND 07/11] pwm: sti: Initialise PWM Capture channel data Date: Wed, 2 Mar 2016 15:32:05 +0000 Message-Id: <1456932729-9667-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456932729-9667-1-git-send-email-lee.jones@linaro.org> References: <1456932729-9667-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Each PWM Capture channel is allocated a structure to hold its own state. During a capture the channel may be partaking in one of 3 phases. Initial (rising) phase change, a subsequent (falling) phase change indicating end of the duty-cycle phase and finally a final (rising) phase change indicating the end of the period. The timer value snapshot each event is held in a variable of the same name, and the phase number (0, 1, 2) is contained in the index variable. Other channel specific information, such as GPIO pin, the IRQ wait queue and locking is also contained in the structure. This patch initialises this structure for each of the available channels. Signed-off-by: Lee Jones --- drivers/pwm/pwm-sti.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) -- 1.9.1 diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index 9e6b1c8..fca692a 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -11,15 +11,19 @@ */ #include +#include #include #include #include #include +#include #include #include #include +#include #include #include +#include #define PWM_OUT_VAL(x) (0x00 + (4 * (x))) /* Channel's Duty Cycle register */ #define PWM_CPT_VAL(x) (0x10 + (4 * (x))) /* Capture value */ @@ -64,9 +68,18 @@ enum sti_cpt_edge { CPT_EDGE_BOTH, }; +struct sti_cpt_data { + u32 snapshot[3]; + int index; + int gpio; + struct mutex lock; + wait_queue_head_t wait; +}; + struct sti_pwm_compat_data { const struct reg_field *reg_fields; - unsigned int num_chan; + unsigned int pwm_num_chan; + unsigned int cpt_num_chan; unsigned int max_pwm_cnt; unsigned int max_prescale; }; @@ -77,6 +90,7 @@ struct sti_pwm_chip { struct clk *cpt_clk; struct regmap *regmap; struct sti_pwm_compat_data *cdata; + struct sti_cpt_data *cpt_data[STI_MAX_CPT_CHANS]; struct regmap_field *prescale_low; struct regmap_field *prescale_high; struct regmap_field *pwm_out_en; @@ -307,10 +321,15 @@ static int sti_pwm_probe_dt(struct sti_pwm_chip *pc) struct device_node *np = dev->of_node; struct sti_pwm_compat_data *cdata = pc->cdata; u32 num_chan; + int ret; - of_property_read_u32(np, "st,pwm-num-chan", &num_chan); - if (num_chan) - cdata->num_chan = num_chan; + ret = of_property_read_u32(np, "st,pwm-num-chan", &num_chan); + if (!ret) + cdata->pwm_num_chan = num_chan; + + ret = of_property_read_u32(np, "st,capture-num-chan", &num_chan); + if (!ret) + cdata->cpt_num_chan = num_chan; reg_fields = cdata->reg_fields; @@ -347,9 +366,11 @@ static const struct regmap_config sti_pwm_regmap_config = { static int sti_pwm_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; struct sti_pwm_compat_data *cdata; struct sti_pwm_chip *pc; struct resource *res; + unsigned int chan; int ret; pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL); @@ -378,7 +399,8 @@ static int sti_pwm_probe(struct platform_device *pdev) cdata->reg_fields = &sti_pwm_regfields[0]; cdata->max_prescale = 0xff; cdata->max_pwm_cnt = 255; - cdata->num_chan = 1; + cdata->pwm_num_chan = 1; + cdata->cpt_num_chan = 0; pc->cdata = cdata; pc->dev = dev; @@ -389,6 +411,19 @@ static int sti_pwm_probe(struct platform_device *pdev) if (ret) return ret; + for (chan = 0; chan < cdata->cpt_num_chan; chan++) { + struct sti_cpt_data *data; + + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + init_waitqueue_head(&data->wait); + mutex_init(&data->lock); + data->gpio = of_get_named_gpio(np, "capture-gpios", chan); + pc->cpt_data[chan] = data; + } + pc->pwm_clk = of_clk_get_by_name(dev->of_node, "pwm"); if (IS_ERR(pc->pwm_clk)) { dev_err(dev, "failed to get PWM clock\n"); @@ -416,7 +451,7 @@ static int sti_pwm_probe(struct platform_device *pdev) pc->chip.dev = dev; pc->chip.ops = &sti_pwm_ops; pc->chip.base = -1; - pc->chip.npwm = pc->cdata->num_chan; + pc->chip.npwm = pc->cdata->pwm_num_chan; pc->chip.can_sleep = true; ret = pwmchip_add(&pc->chip); @@ -436,7 +471,7 @@ static int sti_pwm_remove(struct platform_device *pdev) struct sti_pwm_chip *pc = platform_get_drvdata(pdev); unsigned int i; - for (i = 0; i < pc->cdata->num_chan; i++) + for (i = 0; i < pc->cdata->pwm_num_chan; i++) pwm_disable(&pc->chip.pwms[i]); clk_unprepare(pc->pwm_clk);