From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: linux-kernel@vger.kernel.org,
Sascha Hauer <kernel@pengutronix.de>,
Peter De Schrijver <pdeschrijver@nvidia.com>,
Tero Kristo <t-kristo@ti.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Russell King <linux@arm.linux.org.uk>,
Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v4 5/6] clk: tegra: switch to GENMASK()
Date: Thu, 9 Jul 2015 19:43:53 +0300 [thread overview]
Message-ID: <1436460234-61425-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1436460234-61425-1-git-send-email-andriy.shevchenko@linux.intel.com>
Convert the code to use GENMASK() helper instead of div_mask() macro.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/clk/tegra/clk-divider.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/tegra/clk-divider.c b/drivers/clk/tegra/clk-divider.c
index 59a5714..bf7f667 100644
--- a/drivers/clk/tegra/clk-divider.c
+++ b/drivers/clk/tegra/clk-divider.c
@@ -24,9 +24,8 @@
#include "clk.h"
#define pll_out_override(p) (BIT((p->shift - 6)))
-#define div_mask(d) ((1 << (d->width)) - 1)
#define get_mul(d) (1 << d->frac_width)
-#define get_max_div(d) div_mask(d)
+#define get_max_div(d) GENMASK(d->width - 1, 0)
#define PERIPH_CLK_UART_DIV_ENB BIT(24)
@@ -73,7 +72,7 @@ static unsigned long clk_frac_div_recalc_rate(struct clk_hw *hw,
u64 rate = parent_rate;
reg = readl_relaxed(divider->reg) >> divider->shift;
- div = reg & div_mask(divider);
+ div = reg & GENMASK(divider->width - 1, 0);
mul = get_mul(divider);
div += mul;
@@ -120,7 +119,7 @@ static int clk_frac_div_set_rate(struct clk_hw *hw, unsigned long rate,
spin_lock_irqsave(divider->lock, flags);
val = readl_relaxed(divider->reg);
- val &= ~(div_mask(divider) << divider->shift);
+ val &= ~(GENMASK(divider->width - 1, 0) << divider->shift);
val |= div << divider->shift;
if (divider->flags & TEGRA_DIVIDER_UART) {
--
2.1.4
next prev parent reply other threads:[~2015-07-09 16:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 16:43 [PATCH v4 0/6] clk: replace div_mask() by GENMASK() Andy Shevchenko
2015-07-09 16:43 ` [PATCH v4 1/6] clk: divider: switch to GENMASK() Andy Shevchenko
2015-07-09 16:43 ` [PATCH v4 2/6] clk: mmp: " Andy Shevchenko
2015-07-09 16:43 ` [PATCH v4 3/6] clk: socfpga: " Andy Shevchenko
2015-07-09 19:50 ` Dinh Nguyen
2015-07-09 20:54 ` Andy Shevchenko
2015-07-09 16:43 ` [PATCH v4 4/6] clk: ti: divider: " Andy Shevchenko
2015-07-09 16:43 ` Andy Shevchenko [this message]
2015-07-09 16:43 ` [PATCH v4 6/6] ARM: imx: " Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436460234-61425-6-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=dinguyen@opensource.altera.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=pdeschrijver@nvidia.com \
--cc=sboyd@codeaurora.org \
--cc=t-kristo@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome