From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH] ARM: i.MX53: Make clock tree setup better readable
Date: Thu, 28 Jun 2018 09:28:03 +0200 [thread overview]
Message-ID: <20180628072803.25428-1-s.hauer@pengutronix.de> (raw)
Change write register accesses to read-modify-write accesses. This
makes it clearer which bits are actually changed by the code.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-imx/imx53.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-imx/imx53.c b/arch/arm/mach-imx/imx53.c
index 56f1bda75e..b22929f749 100644
--- a/arch/arm/mach-imx/imx53.c
+++ b/arch/arm/mach-imx/imx53.c
@@ -86,7 +86,7 @@ int imx53_devices_init(void)
void imx53_init_lowlevel_early(unsigned int cpufreq_mhz)
{
void __iomem *ccm = (void __iomem *)MX53_CCM_BASE_ADDR;
- u32 r;
+ u32 r, cbcdr, cbcmr;
imx5_init_lowlevel();
@@ -122,8 +122,16 @@ void imx53_init_lowlevel_early(unsigned int cpufreq_mhz)
imx5_setup_pll_400((void __iomem *)MX53_PLL3_BASE_ADDR);
/* Switch peripheral to PLL3 */
- writel(0x00015154, ccm + MX5_CCM_CBCMR);
- writel(0x02888945 | (1<<16), ccm + MX5_CCM_CBCDR);
+ cbcmr = readl(ccm + MX5_CCM_CBCMR);
+ cbcmr &= ~(3 << 12);
+ cbcmr |= (1 << 12);
+ writel(cbcmr, ccm + MX5_CCM_CBCMR);
+
+ cbcdr = readl(ccm + MX5_CCM_CBCDR);
+ cbcdr |= (1 << 25);
+ cbcdr &= ~(7 << 16);
+ cbcdr |= (1 << 16);
+ writel(cbcdr, ccm + MX5_CCM_CBCDR);
/* make sure change is effective */
while (readl(ccm + MX5_CCM_CDHIPR));
@@ -131,14 +139,13 @@ void imx53_init_lowlevel_early(unsigned int cpufreq_mhz)
imx5_setup_pll_400((void __iomem *)MX53_PLL2_BASE_ADDR);
/* Switch peripheral to PLL2 */
- r = 0x00808145 |
- (2 << 10) |
- (0 << 16) |
- (1 << 19);
-
- writel(r, ccm + MX5_CCM_CBCDR);
+ cbcdr &= ~(1 << 25);
+ cbcdr &= ~(7 << 16);
+ writel(cbcdr, ccm + MX5_CCM_CBCDR);
- writel(0x00016154, ccm + MX5_CCM_CBCMR);
+ cbcmr &= ~(3 << 12);
+ cbcmr |= (2 << 12);
+ writel(cbcmr, ccm + MX5_CCM_CBCMR);
r = readl(ccm + MX5_CCM_CSCMR1);
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
reply other threads:[~2018-06-28 7:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180628072803.25428-1-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.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