From patchwork Tue Aug 16 09:34:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9283089 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CBC6B60839 for ; Tue, 16 Aug 2016 09:40:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAB4F284B8 for ; Tue, 16 Aug 2016 09:40:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF2F6284CF; Tue, 16 Aug 2016 09:40:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 35C9A284B8 for ; Tue, 16 Aug 2016 09:40:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZaq2-0005ng-3E; Tue, 16 Aug 2016 09:39:14 +0000 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZan0-0003mf-6H for linux-arm-kernel@lists.infradead.org; Tue, 16 Aug 2016 09:36:08 +0000 Received: by mail-wm0-x235.google.com with SMTP id i5so154551251wmg.0 for ; Tue, 16 Aug 2016 02:35:45 -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=zbIvdlWh9IG2M0GDItOx/vXwyGEggTVsXRbiUCAS9m8=; b=dz6EDUWRFwzBvQg2jqxWtdynaVedJM8AWPD4fm+f5mvljC+Kv7/rrN9UdFCOqNnokU cOMtpEDQ53+f3w9Mo2TzGlbbyIDIZ29rAHJR5ae7fXuP81E7FRpGkdIDmuXZX+6UTQP7 70fVADhULwfQHvjsCFMP2idpM72OCzHdvHOjc= 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=zbIvdlWh9IG2M0GDItOx/vXwyGEggTVsXRbiUCAS9m8=; b=kKgAjP27nQGv4btOL0HLIs5yuwKBtzBAOTZgF1/KPcuZlJFZNoo3U5+rDLgQB9UFva anyW1IhB/qpLsIm/hRK0hBW3ytmhd7aSaoiSxVq8UhI5Pr9/eRhwOX1njrek8p7H2lyG 0HcYIYwaKASLRDtO3MOJcwZyf2isg7jXlljS1jw/r5st8I8ePpcEBEEwUEx4tYeutqxC kbc7MJQFf+yNX4cIzWB+tdYyCOxJLmrihuGrRvNBOhL4CNljfVVhIuPL+fLEwXjfA6Jv 8PL4cCgtdwOQ96DlAxPNwGUNPWPl1R4hKxRDdfISuTsCgpNyafnGT+jBIZkGdBmoSG40 Lk8w== X-Gm-Message-State: AEkoousCRwVQ4apGNLL6LWtqjlBKdvyKod6E6w8lDZ7S3GGYazMiet4XP3TFbyubIcs8niQa X-Received: by 10.28.15.194 with SMTP id 185mr21296929wmp.58.1471340144398; Tue, 16 Aug 2016 02:35:44 -0700 (PDT) Received: from localhost.localdomain (host81-129-169-93.range81-129.btcentralplus.com. [81.129.169.93]) by smtp.gmail.com with ESMTPSA id g1sm16614889wjy.5.2016.08.16.02.35.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Aug 2016 02:35:43 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 07/17] pwm: sti: Rename channel => device Date: Tue, 16 Aug 2016 10:34:58 +0100 Message-Id: <20160816093508.28307-8-lee.jones@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160816093508.28307-1-lee.jones@linaro.org> References: <20160816093508.28307-1-lee.jones@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160816_023606_586476_A6081CE6 X-CRM114-Status: GOOD ( 16.97 ) 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, devicetree@vger.kernel.org, patrice.chotard@st.com, thierry.reding@gmail.com, Lee Jones MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This is to bring the terminology used in the STi PWM driver more into line with the PWM subsystem. Signed-off-by: Lee Jones --- drivers/pwm/pwm-sti.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index 92abbd5..5c7fdd1 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -21,7 +21,7 @@ #include #include -#define STI_DS_REG(ch) (4 * (ch)) /* Channel's Duty Cycle register */ +#define STI_DS_REG(ch) (4 * (ch)) /* Device's Duty Cycle register */ #define STI_PWMCR 0x50 /* Control/Config register */ #define STI_INTEN 0x54 /* Interrupt Enable/Disable register */ #define PWM_PRESCALE_LOW_MASK 0x0f @@ -40,7 +40,7 @@ enum { struct sti_pwm_compat_data { const struct reg_field *reg_fields; - unsigned int num_chan; + unsigned int num_devs; unsigned int max_pwm_cnt; unsigned int max_prescale; }; @@ -130,13 +130,13 @@ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, /* Allow configuration changes if one of the * following conditions satisfy. - * 1. No channels have been configured. - * 2. Only one channel has been configured and the new request - * is for the same channel. - * 3. Only one channel has been configured and the new request is - * for a new channel and period of the new channel is same as + * 1. No devices have been configured. + * 2. Only one device has been configured and the new request + * is for the same device. + * 3. Only one device has been configured and the new request is + * for a new device and period of the new device is same as * the current configured period. - * 4. More than one channels are configured and period of the new + * 4. More than one devices are configured and period of the new * requestis the same as the current period. */ if (!ncfg || @@ -201,7 +201,7 @@ static int sti_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) int ret = 0; /* - * Since we have a common enable for all PWM channels, + * Since we have a common enable for all PWM devices, * do not enable if already enabled. */ mutex_lock(&pc->sti_pwm_lock); @@ -259,11 +259,11 @@ static int sti_pwm_probe_dt(struct sti_pwm_chip *pc) const struct reg_field *reg_fields; struct device_node *np = dev->of_node; struct sti_pwm_compat_data *cdata = pc->cdata; - u32 num_chan; + u32 num_devs; - of_property_read_u32(np, "st,pwm-num-chan", &num_chan); - if (num_chan) - cdata->num_chan = num_chan; + of_property_read_u32(np, "st,pwm-num-chans", &num_devs); + if (num_devs) + cdata->num_devs = num_devs; reg_fields = cdata->reg_fields; @@ -330,7 +330,7 @@ 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->num_devs = 1; pc->cdata = cdata; pc->dev = dev; @@ -362,7 +362,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->num_devs; pc->chip.can_sleep = true; ret = pwmchip_add(&pc->chip); @@ -381,7 +381,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->num_devs; i++) pwm_disable(&pc->chip.pwms[i]); clk_unprepare(pc->clk);