From patchwork Fri Apr 22 10:18:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 8908951 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 32688BF29F for ; Fri, 22 Apr 2016 10:22:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 33A8020221 for ; Fri, 22 Apr 2016 10:21:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3A3E8201EF for ; Fri, 22 Apr 2016 10:21:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1atYCK-0003B2-3a; Fri, 22 Apr 2016 10:20:28 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1atYAk-00008w-69 for linux-arm-kernel@lists.infradead.org; Fri, 22 Apr 2016 10:18:51 +0000 Received: by mail-wm0-x22c.google.com with SMTP id n3so19454174wmn.0 for ; Fri, 22 Apr 2016 03:18:29 -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=g2EJKHobfFrkvWDBsEW+9GtOzhwF/N5PG//K3J8KiqI=; b=GUjmtczj3QZsqwD3/9yCOZHbhIkQzWijRpdSegh40dmI7FXjdLmf2Abwu53vePS8sG UsGuUU4COctudAo8JAsBN1AL7mvO84Rl/lRWgnkqB3p5leyC8yV5suqmCBBjwzfLPHy3 7l67Dw4qKG0xJw2MzhtuqC6dr9WW9CLlqecaI= 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=g2EJKHobfFrkvWDBsEW+9GtOzhwF/N5PG//K3J8KiqI=; b=CxCs1naFvBURgQg1falziL9KXi4uV14C3ksa8/E/L4pFCOc+OVKg3KLNFsgXAt+9N1 rfDq2kQo/PW8Ag7a7lyrS9YCA4eI6xdvgOQXHCg4bb78kZxaRYptaRrtPOfSF1IXc882 Gm4+4lDHTG6N4eMCRfRh+Hyd8SddMq0GBJCpiAGq8Dn//UgJ2MVX73OZccTZSR7oU5rB 34y3IGKH7UoHrMR8DQX+CTzjoPmXJYq0lbtoFnbGJdjf/932+HPamRNLxgEbQTUXvKAM eY4PL3+qW5MD0UnRil0lcvK2CZg4BgYef/VM9VaFC29N7Y4fbYyi9gFHOLu7bSR/PSjJ FaiA== X-Gm-Message-State: AOPr4FWaO/6HIND4pLiGxharqSDf441b8QdR15e5dbQmUfjXBb++U8ZnvspqKXQ/OtGB7sM8 X-Received: by 10.28.31.6 with SMTP id f6mr2795195wmf.69.1461320308410; Fri, 22 Apr 2016 03:18:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2016 03:18:27 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [[PATCH v2] 08/11] pwm: sti: Initialise PWM Capture device data Date: Fri, 22 Apr 2016 11:18:12 +0100 Message-Id: <1461320295-20414-9-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160422_031850_443623_D21AAB3C X-CRM114-Status: GOOD ( 18.50 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, kernel@stlinux.com, ajitpal.singh@st.com, thierry.reding@gmail.com, Lee Jones , maxime.coquelin@st.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Each PWM Capture device is allocated a structure to hold its own state. During a capture the device 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 device 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 devices. Signed-off-by: Lee Jones --- drivers/pwm/pwm-sti.c | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index 78979d0..9d597bb 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include @@ -18,8 +19,10 @@ #include #include #include +#include #include #include +#include #define PWM_OUT_VAL(x) (0x00 + (4 * (x))) /* Device's Duty Cycle register */ #define PWM_CPT_VAL(x) (0x10 + (4 * (x))) /* Capture value */ @@ -64,9 +67,17 @@ enum sti_cpt_edge { CPT_EDGE_BOTH, }; +struct sti_cpt_ddata { + u32 snapshot[3]; + int index; + struct mutex lock; + wait_queue_head_t wait; +}; + struct sti_pwm_compat_data { const struct reg_field *reg_fields; - unsigned int num_devs; + unsigned int pwm_num_devs; + unsigned int cpt_num_devs; unsigned int max_pwm_cnt; unsigned int max_prescale; }; @@ -307,10 +318,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_devs; + int ret; - of_property_read_u32(np, "st,pwm-num-devs", &num_devs); - if (num_devs) - cdata->num_devs = num_devs; + ret = of_property_read_u32(np, "st,pwm-num-devs", &num_devs); + if (!ret) + cdata->pwm_num_devs = num_devs; + + ret = of_property_read_u32(np, "st,capture-num-devs", &num_devs); + if (!ret) + cdata->cpt_num_devs = num_devs; reg_fields = cdata->reg_fields; @@ -350,6 +366,7 @@ static int sti_pwm_probe(struct platform_device *pdev) struct sti_pwm_compat_data *cdata; struct sti_pwm_chip *pc; struct resource *res; + unsigned int devnum; int ret; pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL); @@ -378,7 +395,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_devs = 1; + cdata->pwm_num_devs = 1; + cdata->cpt_num_devs = 0; pc->cdata = cdata; pc->dev = dev; @@ -416,7 +434,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_devs; + pc->chip.npwm = pc->cdata->pwm_num_devs; pc->chip.can_sleep = true; ret = pwmchip_add(&pc->chip); @@ -426,6 +444,19 @@ static int sti_pwm_probe(struct platform_device *pdev) return ret; } + for (devnum = 0; devnum < cdata->cpt_num_devs; devnum++) { + struct sti_cpt_ddata *ddata; + + ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL); + if (!ddata) + return -ENOMEM; + + init_waitqueue_head(&ddata->wait); + mutex_init(&ddata->lock); + + pwm_set_chip_data(&pc->chip.pwms[devnum], ddata); + } + platform_set_drvdata(pdev, pc); return 0; @@ -436,7 +467,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_devs; i++) + for (i = 0; i < pc->cdata->pwm_num_devs; i++) pwm_disable(&pc->chip.pwms[i]); clk_unprepare(pc->pwm_clk);