From patchwork Wed Jul 23 08:09:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 372840 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 3C45614019F for ; Wed, 23 Jul 2014 18:10:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757117AbaGWIKK (ORCPT ); Wed, 23 Jul 2014 04:10:10 -0400 Received: from mail-lb0-f175.google.com ([209.85.217.175]:33896 "EHLO mail-lb0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751347AbaGWIKI (ORCPT ); Wed, 23 Jul 2014 04:10:08 -0400 Received: by mail-lb0-f175.google.com with SMTP id 10so613224lbg.20 for ; Wed, 23 Jul 2014 01:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=gpbtPjssvKPRBUMhsmroahFkOVa0myMKhxkb1tiTPhI=; b=uqamEKnGlUkrLL/MjLnAn8xwekTA+rKIyBW05kLQP3bmwpkGzGJsBqkKm57p7HJD62 XPaW2mXb+9IYpGBhVOc0btMSIVpVgeOZcR47T5lciVzvuN9+Lt/HalZ8Wlp/7Hm5mMow zclkJ4SM+H5gqfIMEHawMBkndNNHa4d3DCBgCYnz7Q8joc72j4+7euqUjBmaD6AT3WeK VTGCyaeNzMtXZNXQkOPIthlz6w6iva9iUkybQ+bFEw9/ThDijnlJ0UWQCNx/XkPokx7T bxHb2uzeyZBkJxAC3jR2ubsPEh9iIJU2fNrqY8k5cwhxKBlGbPiKiKN/bRrqz47oRTX1 ahGQ== X-Received: by 10.152.29.200 with SMTP id m8mr41278403lah.4.1406103006679; Wed, 23 Jul 2014 01:10:06 -0700 (PDT) Received: from anuminas.rup.mentorg.com (pppoe.178-66-57-197.dynamic.avangarddsl.ru. [178.66.57.197]) by mx.google.com with ESMTPSA id k1sm4331659lbc.14.2014.07.23.01.10.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Jul 2014 01:10:05 -0700 (PDT) From: Dmitry Eremin-Solenikov To: Sascha Hauer , Thierry Reding Cc: linux-pwm@vger.kernel.org, Dmitry Eremin-Solenikov Subject: [PATCH] pwm: imx: don't reprogram PWMSAR if PWM is disabled Date: Wed, 23 Jul 2014 12:09:47 +0400 Message-Id: <1406102987-14797-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.0.1 Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org From: Dmitry Eremin-Solenikov Writing several values to PWMSAR register with PWM being disabled can lead to FIFO (connected to PWMSAR) being overflown. Then after enabling PWM, hardware will use stale values. Instead cache the duty cycles and write them to the hardware only before enabling PWM. Signed-off-by: Dmitry Eremin-Solenikov --- drivers/pwm/pwm-imx.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index c735127..79c2b24 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -46,6 +46,7 @@ struct imx_chip { struct clk *clk_ipg; void __iomem *mmio_base; + unsigned long duty_cycles; struct pwm_chip chip; @@ -105,7 +106,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip, { struct imx_chip *imx = to_imx_chip(chip); unsigned long long c; - unsigned long period_cycles, duty_cycles, prescale; + unsigned long period_cycles, prescale; u32 cr; c = clk_get_rate(imx->clk_per); @@ -118,7 +119,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip, period_cycles /= prescale; c = (unsigned long long)period_cycles * duty_ns; do_div(c, period_ns); - duty_cycles = c; + imx->duty_cycles = c; /* * according to imx pwm RM, the real period value should be @@ -134,7 +135,8 @@ static int imx_pwm_config_v2(struct pwm_chip *chip, period_cycles -= 2; - writel(duty_cycles, imx->mmio_base + MX3_PWMSAR); + if (test_bit(PWMF_ENABLED, &pwm->flags)) + writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR); writel(period_cycles, imx->mmio_base + MX3_PWMPR); cr = readl(imx->mmio_base + MX3_PWMCR); @@ -157,6 +159,9 @@ static void imx_pwm_set_enable_v2(struct pwm_chip *chip, bool enable) struct imx_chip *imx = to_imx_chip(chip); u32 val; + if (enable) + writel(imx->duty_cycles, imx->mmio_base + MX3_PWMSAR); + val = readl(imx->mmio_base + MX3_PWMCR); if (enable)