mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: sam@ravnborg.org
Subject: [PATCH v2 05/10] ARM: at91: remove duplicate get_ddram_size code
Date: Mon,  1 Apr 2019 11:31:01 +0200	[thread overview]
Message-ID: <20190401093106.4595-6-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20190401093106.4595-1-a.fatoum@pengutronix.de>

Both at91_get_ddram_size and at91sama5_get_ddram_size are the
same if is_sdram == false and is_nb == true.

is_sdram is always false, because according to the sama5d{2,3,4}
datasheets, the lowest possible value for AT91_DDRSDRC_MD is 3
(i.e. none of them supports SDR SDRAM).

Therefore have at91sama5_get_ddram_size call at91_get_ddram_size
with is_nb == true and remove the duplicate code.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Tested-by: Sam Ravnborg <sam@ravnborg.org>
---
 .../mach-at91/include/mach/at91sam9_ddrsdr.h  | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h b/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h
index a775d3b19691..795eb0ce9a9f 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h
@@ -148,6 +148,7 @@ static inline u32 at91_get_ddram_size(void * __iomem base, bool is_nb)
 	cr = readl(base + AT91_DDRSDRC_CR);
 	mdr = readl(base + AT91_DDRSDRC_MDR);
 
+	/* will always be false for sama5d2, sama5d3 or sama5d4 */
 	is_sdram = (mdr & AT91_DDRSDRC_MD) <= AT91_DDRSDRC_MD_LOW_POWER_SDR;
 
 	/* Formula:
@@ -224,31 +225,7 @@ static inline u32 at91sam9n12_get_ddram_size(void)
 #ifdef CONFIG_SOC_SAMA5
 static inline u32 at91sama5_get_ddram_size(void __iomem *base)
 {
-	u32 cr;
-	u32 mdr;
-	u32 size;
-
-	cr = readl(base + AT91_DDRSDRC_CR);
-	mdr = readl(base + AT91_DDRSDRC_MDR);
-
-	/* Formula:
-	 * size = bank << (col + row + 1);
-	 * if (bandwidth == 32 bits)
-	 *	size <<= 1;
-	 */
-	size = 1;
-	/* COL */
-	size += (cr & AT91_DDRSDRC_NC) + 9;
-	/* ROW */
-	size += ((cr & AT91_DDRSDRC_NR) >> 2) + 11;
-	/* BANK */
-	size = ((cr & AT91_DDRSDRC_NB) ? 8 : 4) << size;
-
-	/* bandwidth */
-	if (!(mdr & AT91_DDRSDRC_DBW))
-		size <<= 1;
-
-	return size;
+	return at91_get_ddram_size(base, true);
 }
 #else
 static inline u32 at91sama5_get_ddram_size(void __iomem *base)
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2019-04-01  9:31 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-01  9:30 [PATCH v2 00/10] ARM: at91: misc fixes and cleanup Ahmad Fatoum
2019-04-01  9:30 ` [PATCH v2 01/10] ARM: at91: replace __raw_{readl, writel} of peripherals with readl, writel Ahmad Fatoum
2019-04-01  9:30 ` [PATCH v2 02/10] ARM: at91: debug_ll: make UART base address configurable Ahmad Fatoum
2019-04-01  9:30 ` [PATCH v2 03/10] arm: sama5d4: fix stack setup Ahmad Fatoum
2019-04-01  9:31 ` [PATCH v2 04/10] ARM: at91: fix at91sama5_get_ddram_size for sama5d4 Ahmad Fatoum
2019-04-01  9:31 ` Ahmad Fatoum [this message]
2019-04-01  9:31 ` [PATCH v2 06/10] ARM: at91: remove at91sam9g45_get_ddram_size helper Ahmad Fatoum
2019-04-01 20:45   ` Sam Ravnborg
2019-04-03  7:18   ` Sascha Hauer
2019-04-03  9:56     ` Ahmad Fatoum
2019-04-03 10:11       ` Sascha Hauer
2019-04-01  9:31 ` [PATCH v2 07/10] ARM: at91: remove at91sam9n12_get_ddram_size helper Ahmad Fatoum
2019-04-01 20:45   ` Sam Ravnborg
2019-04-01  9:31 ` [PATCH v2 08/10] ARM: at91: remove at91sam9x5_get_ddram_size helper Ahmad Fatoum
2019-04-01 20:46   ` Sam Ravnborg
2019-04-01  9:31 ` [PATCH v2 09/10] ARM: at91: remove at91sama5_get_ddram_size helper Ahmad Fatoum
2019-04-01 20:46   ` Sam Ravnborg
2019-04-01  9:31 ` [PATCH v2 10/10] clk: at91: fix warning about missing const-safety Ahmad Fatoum
2019-04-01 20:48   ` Sam Ravnborg
2019-04-01 21:36     ` Ahmad Fatoum
2019-04-01 21:34 ` [PATCH v2 11/10] " Ahmad Fatoum
2019-04-02 16:37   ` Sam Ravnborg

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=20190401093106.4595-6-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=sam@ravnborg.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