From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC08FC43387 for ; Wed, 16 Jan 2019 20:15:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 82DE620840 for ; Wed, 16 Jan 2019 20:15:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fOB+vogY"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="G4SoAY2S" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82DE620840 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=XS1OpDgqhthZVbnmvf+U7iqtThm/C2j84PMtYio4670=; b=fOB+vogY0jAjdgNOWG61gDXk1j rwKFLW0zvVnQYXE6MYmOQSWCSvt8q1GiOKeMWTYDu9DJW97QXkqqUNZqnyZnevI4Kh2OVsUxz5Jus 8pUSyzi7pjrpHx3SSrw5U9FAJLIYnjmbh2UU/7Ss3rDJLUJ1y7v7XIUGk9nGzr1Y4epHSQpfJ4XfE PLGIA5Eh6ZjWZxa2KeaB/uwU/fQgB49Oi2MH9N5Zujsf8MGrPhtFmM64Rc26LBgL1ydquU+4x16fi p0Z78E/3RZgDvZ70AigMU0b2TkSb4r2Q714oIuOczjBwHQp7fdBlH5FGLNI69xT/bga3iZkCf1JIK BZ5HatKw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjrb5-0004tr-SQ; Wed, 16 Jan 2019 20:15:35 +0000 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gjraX-00035K-HC for linux-arm-kernel@lists.infradead.org; Wed, 16 Jan 2019 20:15:12 +0000 Received: by mail-yw1-xc41.google.com with SMTP id g75so2951551ywb.1 for ; Wed, 16 Jan 2019 12:15:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=S7wCeu05hHguSgfo2vWjAAXTn1+lMff+GP9q/onQ8yE=; b=G4SoAY2SxqBomn5UdY4Q11KjbPWvXJ121qL7hMU7VQnioLW+hLJjKGTKaejDy5X6XM fUfIxwqcQp3fwVI/PBGmQW5kpCnTP142gm6kWQMSLY2iHCk60h2DPpD6+3snuSWowT3r G9nRMe3tMABSsCGQdX3PDge2DPF2UeucSc2XE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=S7wCeu05hHguSgfo2vWjAAXTn1+lMff+GP9q/onQ8yE=; b=IVQo2/QZ5fnea9MgjJLkYUzlvg5M+juyHcfAUulRyKr0xXF0VaKCMjmpHY0NBn53VC atayznrXLhvaKeCtvN7FoYxizdQnapF9nrz5SwFahdTc641UAQXFJM5E/Exj4VOLKAtr wCFh/f8iiVR6o/ZPxpV3KBbfx2mZfDKULfBObE5aTTgAcetHPokVsvRe5tgK7LlMNgC3 pmneAzUUPAWu0jf7eM3U8Wl5smr6/zHu1ZEOtJDENWsdauhFhEB0J6D/3Zi12C6p2Phy +m1XAYDlMk6dcB99JVp+e3K6uFY2elUgkPyhgPfggu6VJs+i1DFcHWK/EkzAIEhaUbVJ X/sg== X-Gm-Message-State: AJcUukd9cLLgbOIsXQbz2a926QYgsTUKIy0NETWGM4LM5UQoM0xvN/8M 7WWa/F0K19+bWffcMqnMm85HIw== X-Google-Smtp-Source: ALg8bN4GrDCzBz0ayB1/MpoOAW7Rkj3L3kit+NG4BVpi7DM1EDuHrwA4xmT9G3VlZ+JNQlEdOVrN+A== X-Received: by 2002:a81:5b82:: with SMTP id p124mr9527104ywb.153.1547669700550; Wed, 16 Jan 2019 12:15:00 -0800 (PST) Received: from shitalt.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id w63sm2541026ywc.46.2019.01.16.12.14.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 12:15:00 -0800 (PST) From: Sheetal Tigadoli To: Thierry Reding , Rob Herring , Mark Rutland , Florian Fainelli , Ray Jui , Scott Branden Subject: [PATCH V2 2/4] drivers: pwm: pwm-bcm-kona: Switch to using atomic PWM Framework Date: Thu, 17 Jan 2019 01:45:14 +0530 Message-Id: <1547669716-20070-3-git-send-email-sheetal.tigadoli@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1547669716-20070-1-git-send-email-sheetal.tigadoli@broadcom.com> References: <1547669716-20070-1-git-send-email-sheetal.tigadoli@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190116_121502_693401_FCFDFB54 X-CRM114-Status: GOOD ( 21.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, Sheetal Tigadoli , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Switch to using atomic PWM Framework on broadcom PWM kona driver Signed-off-by: Sheetal Tigadoli --- drivers/pwm/pwm-bcm-kona.c | 201 +++++++++++++++++++-------------------------- 1 file changed, 83 insertions(+), 118 deletions(-) diff --git a/drivers/pwm/pwm-bcm-kona.c b/drivers/pwm/pwm-bcm-kona.c index 09a95ae..fe63289 100644 --- a/drivers/pwm/pwm-bcm-kona.c +++ b/drivers/pwm/pwm-bcm-kona.c @@ -108,151 +108,116 @@ static void kona_pwmc_apply_settings(struct kona_pwmc *kp, unsigned int chan) ndelay(400); } -static int kona_pwmc_config(struct pwm_chip *chip, struct pwm_device *pwm, - int duty_ns, int period_ns) -{ - struct kona_pwmc *kp = to_kona_pwmc(chip); - u64 val, div, rate; - unsigned long prescale = PRESCALE_MIN, pc, dc; - unsigned int value, chan = pwm->hwpwm; - - /* - * Find period count, duty count and prescale to suit duty_ns and - * period_ns. This is done according to formulas described below: - * - * period_ns = 10^9 * (PRESCALE + 1) * PC / PWM_CLK_RATE - * duty_ns = 10^9 * (PRESCALE + 1) * DC / PWM_CLK_RATE - * - * PC = (PWM_CLK_RATE * period_ns) / (10^9 * (PRESCALE + 1)) - * DC = (PWM_CLK_RATE * duty_ns) / (10^9 * (PRESCALE + 1)) - */ - - rate = clk_get_rate(kp->clk); - - while (1) { - div = 1000000000; - div *= 1 + prescale; - val = rate * period_ns; - pc = div64_u64(val, div); - val = rate * duty_ns; - dc = div64_u64(val, div); - - /* If duty_ns or period_ns are not achievable then return */ - if (pc < PERIOD_COUNT_MIN || dc < DUTY_CYCLE_HIGH_MIN) - return -EINVAL; - - /* If pc and dc are in bounds, the calculation is done */ - if (pc <= PERIOD_COUNT_MAX && dc <= DUTY_CYCLE_HIGH_MAX) - break; - - /* Otherwise, increase prescale and recalculate pc and dc */ - if (++prescale > PRESCALE_MAX) - return -EINVAL; - } - - /* - * Don't apply settings if disabled. The period and duty cycle are - * always calculated above to ensure the new values are - * validated immediately instead of on enable. - */ - if (pwm_is_enabled(pwm)) { - kona_pwmc_prepare_for_settings(kp, chan); - - value = readl(kp->base + PRESCALE_OFFSET); - value &= ~PRESCALE_MASK(chan); - value |= prescale << PRESCALE_SHIFT(chan); - writel(value, kp->base + PRESCALE_OFFSET); - - writel(pc, kp->base + PERIOD_COUNT_OFFSET(chan)); - - writel(dc, kp->base + DUTY_CYCLE_HIGH_OFFSET(chan)); - - kona_pwmc_apply_settings(kp, chan); - } - - return 0; -} - -static int kona_pwmc_set_polarity(struct pwm_chip *chip, struct pwm_device *pwm, - enum pwm_polarity polarity) +static void kona_pwmc_disable(struct pwm_chip *chip, struct pwm_device *pwm) { struct kona_pwmc *kp = to_kona_pwmc(chip); unsigned int chan = pwm->hwpwm; unsigned int value; - int ret; - - ret = clk_prepare_enable(kp->clk); - if (ret < 0) { - dev_err(chip->dev, "failed to enable clock: %d\n", ret); - return ret; - } kona_pwmc_prepare_for_settings(kp, chan); - value = readl(kp->base + PWM_CONTROL_OFFSET); - - if (polarity == PWM_POLARITY_NORMAL) - value |= 1 << PWM_CONTROL_POLARITY_SHIFT(chan); - else - value &= ~(1 << PWM_CONTROL_POLARITY_SHIFT(chan)); + /* Simulate a disable by configuring for zero duty */ + writel(0, kp->base + DUTY_CYCLE_HIGH_OFFSET(chan)); + writel(0, kp->base + PERIOD_COUNT_OFFSET(chan)); - writel(value, kp->base + PWM_CONTROL_OFFSET); + /* Set prescale to 0 for this channel */ + value = readl(kp->base + PRESCALE_OFFSET); + value &= ~PRESCALE_MASK(chan); + writel(value, kp->base + PRESCALE_OFFSET); kona_pwmc_apply_settings(kp, chan); clk_disable_unprepare(kp->clk); - - return 0; } -static int kona_pwmc_enable(struct pwm_chip *chip, struct pwm_device *pwm) +static int kona_pwmc_apply(struct pwm_chip *chip, struct pwm_device *pwm, + struct pwm_state *state) { struct kona_pwmc *kp = to_kona_pwmc(chip); + struct pwm_state cstate; + u64 val, div, rate; + unsigned long prescale = PRESCALE_MIN, pc, dc; + unsigned int value, chan = pwm->hwpwm; int ret; - ret = clk_prepare_enable(kp->clk); - if (ret < 0) { - dev_err(chip->dev, "failed to enable clock: %d\n", ret); - return ret; - } - - ret = kona_pwmc_config(chip, pwm, pwm_get_duty_cycle(pwm), - pwm_get_period(pwm)); - if (ret < 0) { - clk_disable_unprepare(kp->clk); - return ret; - } + pwm_get_state(pwm, &cstate); + + if (state->enabled) { + /* + * Find period count, duty count and prescale to suit duty_ns + * and period_ns. This is done according to formulas described + * below: + * + * period_ns = 10^9 * (PRESCALE + 1) * PC / PWM_CLK_RATE + * duty_ns = 10^9 * (PRESCALE + 1) * DC / PWM_CLK_RATE + * + * PC = (PWM_CLK_RATE * period_ns) / (10^9 * (PRESCALE + 1)) + * DC = (PWM_CLK_RATE * duty_ns) / (10^9 * (PRESCALE + 1)) + */ + rate = clk_get_rate(kp->clk); + + while (1) { + div = 1000000000; + div *= 1 + prescale; + val = rate * state->period; + pc = div64_u64(val, div); + val = rate * state->duty_cycle; + dc = div64_u64(val, div); + + /* If duty_ns or period_ns are not achievable then + * return + */ + if (pc < PERIOD_COUNT_MIN || dc < DUTY_CYCLE_HIGH_MIN) + return -EINVAL; + + /* If pc & dc are in bounds, the calculation is done */ + if (pc <= PERIOD_COUNT_MAX && dc <= DUTY_CYCLE_HIGH_MAX) + break; + + /* Otherwise, increase prescale & recalculate pc & dc */ + if (++prescale > PRESCALE_MAX) + return -EINVAL; + } + + if (!cstate.enabled) { + ret = clk_prepare_enable(kp->clk); + if (ret < 0) { + dev_err(chip->dev, + "failed to enable clock: %d\n", ret); + return ret; + } + } - return 0; -} - -static void kona_pwmc_disable(struct pwm_chip *chip, struct pwm_device *pwm) -{ - struct kona_pwmc *kp = to_kona_pwmc(chip); - unsigned int chan = pwm->hwpwm; - unsigned int value; + kona_pwmc_prepare_for_settings(kp, chan); - kona_pwmc_prepare_for_settings(kp, chan); + value = readl(kp->base + PRESCALE_OFFSET); + value &= ~PRESCALE_MASK(chan); + value |= prescale << PRESCALE_SHIFT(chan); + writel(value, kp->base + PRESCALE_OFFSET); + writel(pc, kp->base + PERIOD_COUNT_OFFSET(chan)); + writel(dc, kp->base + DUTY_CYCLE_HIGH_OFFSET(chan)); - /* Simulate a disable by configuring for zero duty */ - writel(0, kp->base + DUTY_CYCLE_HIGH_OFFSET(chan)); - writel(0, kp->base + PERIOD_COUNT_OFFSET(chan)); + if (cstate.polarity != state->polarity) { + value = readl(kp->base + PWM_CONTROL_OFFSET); + if (state->polarity == PWM_POLARITY_NORMAL) + value |= 1 << PWM_CONTROL_POLARITY_SHIFT(chan); + else + value &= ~(1 << + PWM_CONTROL_POLARITY_SHIFT(chan)); - /* Set prescale to 0 for this channel */ - value = readl(kp->base + PRESCALE_OFFSET); - value &= ~PRESCALE_MASK(chan); - writel(value, kp->base + PRESCALE_OFFSET); + writel(value, kp->base + PWM_CONTROL_OFFSET); + } - kona_pwmc_apply_settings(kp, chan); + kona_pwmc_apply_settings(kp, chan); + } else if (cstate.enabled) { + kona_pwmc_disable(chip, pwm); + } - clk_disable_unprepare(kp->clk); + return 0; } static const struct pwm_ops kona_pwm_ops = { - .config = kona_pwmc_config, - .set_polarity = kona_pwmc_set_polarity, - .enable = kona_pwmc_enable, - .disable = kona_pwmc_disable, + .apply = kona_pwmc_apply, .owner = THIS_MODULE, }; -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel