[PATCH 1/2] ARM: at91: Remove at91sama5d3_get_ddram_size() call

[PATCH 1/2] ARM: at91: Remove at91sama5d3_get_ddram_size() call

[Alexander Shiyan]

Since all barebox sama5d3 boards now support devicetree,
we can remove the separate at91sama5d3_get_ddram_size() call.

Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 arch/arm/mach-at91/ddramc.c      | 2 +-
 include/mach/at91/at91_ddrsdrc.h | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/mach-at91/ddramc.c b/arch/arm/mach-at91/ddramc.c
index 494a045249..313d0c3325 100644
--- a/arch/arm/mach-at91/ddramc.c
+++ b/arch/arm/mach-at91/ddramc.c
@@ -31,7 +31,7 @@ void __noreturn sama5d3_barebox_entry(unsigned int r4, void *boarddata)
 {
 	__sama5d3_stashed_bootrom_r4 = r4;
 
-	barebox_arm_entry(SAMA5_DDRCS, at91sama5d3_get_ddram_size(),
+	barebox_arm_entry(SAMA5_DDRCS, sama5_ramsize(IOMEM(SAMA5D3_BASE_MPDDRC)),
 			  boarddata);
 }
 
diff --git a/include/mach/at91/at91_ddrsdrc.h b/include/mach/at91/at91_ddrsdrc.h
index b9b0eb20b3..b344be4d1f 100644
--- a/include/mach/at91/at91_ddrsdrc.h
+++ b/include/mach/at91/at91_ddrsdrc.h
@@ -357,11 +357,6 @@ static inline u32 at91sam9n12_get_ddram_size(void)
 	return at91_get_ddram_size(IOMEM(AT91SAM9N12_BASE_DDRSDRC0), true);
 }
 
-static inline u32 at91sama5d3_get_ddram_size(void)
-{
-	return at91_get_ddram_size(IOMEM(SAMA5D3_BASE_MPDDRC), true);
-}
-
 static inline u32 at91sama5d4_get_ddram_size(void)
 {
 	return at91_get_ddram_size(IOMEM(SAMA5D4_BASE_MPDDRC), true);
-- 
2.39.1

[PATCH 2/2] ARM: at91: sama5d3_xplained: Fix lowlevel barebox_entry() call

[Alexander Shiyan]

Let's use the sama5d3_barebox_entry() call for the sama5d3_xplained
board to properly save bootstrap R4 register.

Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 arch/arm/boards/sama5d3_xplained/lowlevel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boards/sama5d3_xplained/lowlevel.c b/arch/arm/boards/sama5d3_xplained/lowlevel.c
index d66b10fa8f..2a0fed1141 100644
--- a/arch/arm/boards/sama5d3_xplained/lowlevel.c
+++ b/arch/arm/boards/sama5d3_xplained/lowlevel.c
@@ -59,5 +59,5 @@ SAMA5D3_ENTRY_FUNCTION(start_sama5d3_xplained, r4)
 
 	fdt = __dtb_z_at91_sama5d3_xplained_start + get_runtime_offset();
 
-	barebox_arm_entry(SAMA5_DDRCS, SZ_256M, fdt);
+	sama5d3_barebox_entry(r4, fdt);
 }
-- 
2.39.1

Re: [PATCH 1/2] ARM: at91: Remove at91sama5d3_get_ddram_size() call

[Sascha Hauer]

On Wed, 02 Apr 2025 08:57:52 +0300, Alexander Shiyan wrote:
> Since all barebox sama5d3 boards now support devicetree,
> we can remove the separate at91sama5d3_get_ddram_size() call.
> 
> 

Applied, thanks!

[1/2] ARM: at91: Remove at91sama5d3_get_ddram_size() call
      https://git.pengutronix.de/cgit/barebox/commit/?id=6e3417abe397 (link may not be stable)
[2/2] ARM: at91: sama5d3_xplained: Fix lowlevel barebox_entry() call
      https://git.pengutronix.de/cgit/barebox/commit/?id=6442b9223a4a (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>