From: Nicolas Ferre <nicolas.ferre@microchip.com>
To: Claudiu Beznea <claudiu.beznea@microchip.com>,
<mturquette@baylibre.com>, <sboyd@kernel.org>,
<alexandre.belloni@bootlin.com>,
<ludovic.desroches@microchip.com>
Cc: <linux-clk@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [RESEND PATCH 4/5] clk: at91: clk-master: add register definition for sama7g5's master clock
Date: Tue, 30 Mar 2021 19:23:07 +0200 [thread overview]
Message-ID: <607e986b-1170-503a-84cc-ee9a9f32fd32@microchip.com> (raw)
In-Reply-To: <20210324094353.1710114-5-claudiu.beznea@microchip.com>
On 24/03/2021 at 10:43, Claudiu Beznea wrote:
> Add register definitions for SAMA7G5's master clock. These would be
> also used by architecture specific power saving code. With this, update
> also clk-master.c.
>
> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
> ---
> drivers/clk/at91/clk-master.c | 51 +++++++++++++++++------------------
> include/linux/clk/at91_pmc.h | 26 ++++++++++++++++++
> 2 files changed, 50 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
> index 6f1fb2eb2a8d..a6a393bb1def 100644
> --- a/drivers/clk/at91/clk-master.c
> +++ b/drivers/clk/at91/clk-master.c
> @@ -17,15 +17,7 @@
> #define MASTER_DIV_SHIFT 8
> #define MASTER_DIV_MASK 0x7
>
> -#define PMC_MCR 0x30
> -#define PMC_MCR_ID_MSK GENMASK(3, 0)
> -#define PMC_MCR_CMD BIT(7)
> -#define PMC_MCR_DIV GENMASK(10, 8)
> -#define PMC_MCR_CSS GENMASK(20, 16)
> #define PMC_MCR_CSS_SHIFT (16)
> -#define PMC_MCR_EN BIT(28)
> -
> -#define PMC_MCR_ID(x) ((x) & PMC_MCR_ID_MSK)
>
> #define MASTER_MAX_ID 4
>
> @@ -685,17 +677,20 @@ static void clk_sama7g5_master_set(struct clk_master *master,
>
> spin_lock_irqsave(master->lock, flags);
>
> - regmap_write(master->regmap, PMC_MCR, PMC_MCR_ID(master->id));
> - regmap_read(master->regmap, PMC_MCR, &val);
> - regmap_update_bits(master->regmap, PMC_MCR,
> - (status ? PMC_MCR_EN : 0) | PMC_MCR_CSS | PMC_MCR_DIV |
> - PMC_MCR_CMD | PMC_MCR_ID_MSK,
> - (status ? PMC_MCR_EN : 0) |
> + regmap_write(master->regmap, AT91_PMC_MCR_V2,
> + AT91_PMC_MCR_V2_ID(master->id));
> + regmap_read(master->regmap, AT91_PMC_MCR_V2, &val);
> + regmap_update_bits(master->regmap, AT91_PMC_MCR_V2,
> + (status ? AT91_PMC_MCR_V2_EN : 0) |
> + AT91_PMC_MCR_V2_CSS | AT91_PMC_MCR_V2_DIV |
> + AT91_PMC_MCR_V2_CMD | AT91_PMC_MCR_V2_ID_MSK,
> + (status ? AT91_PMC_MCR_V2_EN : 0) |
Ok, here also. Can't we make it simpler to read?
> (master->parent << PMC_MCR_CSS_SHIFT) |
> (master->div << MASTER_DIV_SHIFT) |
> - PMC_MCR_CMD | PMC_MCR_ID(master->id));
> + AT91_PMC_MCR_V2_CMD |
> + AT91_PMC_MCR_V2_ID(master->id));
>
> - cparent = (val & PMC_MCR_CSS) >> PMC_MCR_CSS_SHIFT;
> + cparent = (val & AT91_PMC_MCR_V2_CSS) >> PMC_MCR_CSS_SHIFT;
>
> /* Wait here only if parent is being changed. */
> while ((cparent != master->parent) && !clk_master_ready(master))
> @@ -720,10 +715,12 @@ static void clk_sama7g5_master_disable(struct clk_hw *hw)
>
> spin_lock_irqsave(master->lock, flags);
>
> - regmap_write(master->regmap, PMC_MCR, master->id);
> - regmap_update_bits(master->regmap, PMC_MCR,
> - PMC_MCR_EN | PMC_MCR_CMD | PMC_MCR_ID_MSK,
> - PMC_MCR_CMD | PMC_MCR_ID(master->id));
> + regmap_write(master->regmap, AT91_PMC_MCR_V2, master->id);
> + regmap_update_bits(master->regmap, AT91_PMC_MCR_V2,
> + AT91_PMC_MCR_V2_EN | AT91_PMC_MCR_V2_CMD |
> + AT91_PMC_MCR_V2_ID_MSK,
> + AT91_PMC_MCR_V2_CMD |
> + AT91_PMC_MCR_V2_ID(master->id));
>
> spin_unlock_irqrestore(master->lock, flags);
> }
> @@ -736,12 +733,12 @@ static int clk_sama7g5_master_is_enabled(struct clk_hw *hw)
>
> spin_lock_irqsave(master->lock, flags);
>
> - regmap_write(master->regmap, PMC_MCR, master->id);
> - regmap_read(master->regmap, PMC_MCR, &val);
> + regmap_write(master->regmap, AT91_PMC_MCR_V2, master->id);
> + regmap_read(master->regmap, AT91_PMC_MCR_V2, &val);
>
> spin_unlock_irqrestore(master->lock, flags);
>
> - return !!(val & PMC_MCR_EN);
> + return !!(val & AT91_PMC_MCR_V2_EN);
> }
>
> static int clk_sama7g5_master_set_rate(struct clk_hw *hw, unsigned long rate,
> @@ -837,10 +834,10 @@ at91_clk_sama7g5_register_master(struct regmap *regmap,
> master->mux_table = mux_table;
>
> spin_lock_irqsave(master->lock, flags);
> - regmap_write(master->regmap, PMC_MCR, master->id);
> - regmap_read(master->regmap, PMC_MCR, &val);
> - master->parent = (val & PMC_MCR_CSS) >> PMC_MCR_CSS_SHIFT;
> - master->div = (val & PMC_MCR_DIV) >> MASTER_DIV_SHIFT;
> + regmap_write(master->regmap, AT91_PMC_MCR_V2, master->id);
> + regmap_read(master->regmap, AT91_PMC_MCR_V2, &val);
> + master->parent = (val & AT91_PMC_MCR_V2_CSS) >> PMC_MCR_CSS_SHIFT;
> + master->div = (val & AT91_PMC_MCR_V2_DIV) >> MASTER_DIV_SHIFT;
> spin_unlock_irqrestore(master->lock, flags);
>
> hw = &master->hw;
> diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h
> index a4f82e836a7c..ccb3f034bfa9 100644
> --- a/include/linux/clk/at91_pmc.h
> +++ b/include/linux/clk/at91_pmc.h
> @@ -137,6 +137,32 @@
> #define AT91_PMC_PLLADIV2_ON (1 << 12)
> #define AT91_PMC_H32MXDIV BIT(24)
>
> +#define AT91_PMC_MCR_V2 0x30 /* Master Clock Register [SAMA7G5 only] */
> +#define AT91_PMC_MCR_V2_ID_MSK (0xF)
> +#define AT91_PMC_MCR_V2_ID(_id) ((_id) & AT91_PMC_MCR_V2_ID_MSK)
> +#define AT91_PMC_MCR_V2_CMD (1 << 7)
> +#define AT91_PMC_MCR_V2_DIV (7 << 8)
> +#define AT91_PMC_MCR_V2_DIV1 (0 << 8)
> +#define AT91_PMC_MCR_V2_DIV2 (1 << 8)
> +#define AT91_PMC_MCR_V2_DIV4 (2 << 8)
> +#define AT91_PMC_MCR_V2_DIV8 (3 << 8)
> +#define AT91_PMC_MCR_V2_DIV16 (4 << 8)
> +#define AT91_PMC_MCR_V2_DIV32 (5 << 8)
> +#define AT91_PMC_MCR_V2_DIV64 (6 << 8)
> +#define AT91_PMC_MCR_V2_DIV3 (7 << 8)
> +#define AT91_PMC_MCR_V2_CSS (0x1F << 16)
> +#define AT91_PMC_MCR_V2_CSS_MD_SLCK (0 << 16)
> +#define AT91_PMC_MCR_V2_CSS_TD_SLCK (1 << 16)
> +#define AT91_PMC_MCR_V2_CSS_MAINCK (2 << 16)
> +#define AT91_PMC_MCR_V2_CSS_MCK0 (3 << 16)
> +#define AT91_PMC_MCR_V2_CSS_SYSPLL (5 << 16)
> +#define AT91_PMC_MCR_V2_CSS_DDRPLL (6 << 16)
> +#define AT91_PMC_MCR_V2_CSS_IMGPLL (7 << 16)
> +#define AT91_PMC_MCR_V2_CSS_BAUDPLL (8 << 16)
> +#define AT91_PMC_MCR_V2_CSS_AUDIOPLL (9 << 16)
> +#define AT91_PMC_MCR_V2_CSS_ETHPLL (10 << 16)
> +#define AT91_PMC_MCR_V2_EN (1 << 28)
> +
> #define AT91_PMC_XTALF 0x34 /* Main XTAL Frequency Register [SAMA7G5 only] */
>
> #define AT91_PMC_USB 0x38 /* USB Clock Register [some SAM9 only] */
>
Autherwise, it's fine. Thanks. Best regards,
Nicolas
--
Nicolas Ferre
next prev parent reply other threads:[~2021-03-30 17:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 9:43 [RESEND PATCH 0/5] clk: at91: updates for power management and dvfs Claudiu Beznea
2021-03-24 9:43 ` [RESEND PATCH 1/5] clk: at91: re-factor clocks suspend/resume Claudiu Beznea
2021-03-30 17:14 ` Nicolas Ferre
2021-03-31 8:47 ` Claudiu.Beznea
2021-03-31 11:37 ` Nicolas Ferre
2021-03-24 9:43 ` [RESEND PATCH 2/5] clk: at91: pmc: execute suspend/resume only for backup mode Claudiu Beznea
2021-03-24 9:43 ` [RESEND PATCH 3/5] clk: at91: sama7g5: add securam's peripheral clock Claudiu Beznea
2021-03-30 17:27 ` Nicolas Ferre
2021-03-24 9:43 ` [RESEND PATCH 4/5] clk: at91: clk-master: add register definition for sama7g5's master clock Claudiu Beznea
2021-03-30 17:23 ` Nicolas Ferre [this message]
2021-03-24 9:43 ` [RESEND PATCH 5/5] clk: at91: clk-master: update for dvfs Claudiu Beznea
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=607e986b-1170-503a-84cc-ee9a9f32fd32@microchip.com \
--to=nicolas.ferre@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=claudiu.beznea@microchip.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).