mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Subject: [PATCH v3 07/10] ARM: boards: socfpga new mem calibration function
Date: Mon,  9 Feb 2015 11:47:48 +0100	[thread overview]
Message-ID: <1423478871-15276-8-git-send-email-s.trumtrar@pengutronix.de> (raw)
In-Reply-To: <1423478871-15276-1-git-send-email-s.trumtrar@pengutronix.de>

From: Markus Pargmann <mpa@pengutronix.de>

Use the new socfpga_mem_calibration function. This is a sideeffect of
the new script to import generated sequencer code. The return value of
the function is 1 if the calibration succeeds, 0 otherwise.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 arch/arm/boards/ebv-socrates/lowlevel.c        |  5 ++---
 arch/arm/boards/terasic-sockit/lowlevel.c      |  5 ++---
 arch/arm/mach-socfpga/include/mach/sequencer.c | 10 ++++++++++
 arch/arm/mach-socfpga/include/mach/sequencer.h |  5 +++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boards/ebv-socrates/lowlevel.c b/arch/arm/boards/ebv-socrates/lowlevel.c
index 66cb226b2143..ea4e1d746a95 100644
--- a/arch/arm/boards/ebv-socrates/lowlevel.c
+++ b/arch/arm/boards/ebv-socrates/lowlevel.c
@@ -83,9 +83,8 @@ static noinline void socrates_entry(void)
 
 	puts_ll("SDRAM calibration...\n");
 
-	ret = socfpga_sdram_calibration(inst_rom_init, inst_rom_init_size,
-				ac_rom_init, ac_rom_init_size);
-	if (ret)
+	ret = socfpga_mem_calibration();
+	if (!ret)
 		hang();
 
 	puts_ll("done\n");
diff --git a/arch/arm/boards/terasic-sockit/lowlevel.c b/arch/arm/boards/terasic-sockit/lowlevel.c
index 78d5d41b0457..8012783df3f8 100644
--- a/arch/arm/boards/terasic-sockit/lowlevel.c
+++ b/arch/arm/boards/terasic-sockit/lowlevel.c
@@ -83,9 +83,8 @@ static noinline void sockit_entry(void)
 
 	puts_ll("SDRAM calibration...\n");
 
-	ret = socfpga_sdram_calibration(inst_rom_init, inst_rom_init_size,
-				ac_rom_init, ac_rom_init_size);
-	if (ret)
+	ret = socfpga_mem_calibration();
+	if (!ret)
 		hang();
 
 	puts_ll("done\n");
diff --git a/arch/arm/mach-socfpga/include/mach/sequencer.c b/arch/arm/mach-socfpga/include/mach/sequencer.c
index 87dc6677ec8b..a8ba217344f9 100644
--- a/arch/arm/mach-socfpga/include/mach/sequencer.c
+++ b/arch/arm/mach-socfpga/include/mach/sequencer.c
@@ -4366,3 +4366,13 @@ static int socfpga_sdram_calibration(const uint32_t *inst_rom_init, uint32_t ins
 
 	return pass == 0 ? -EINVAL : 0;
 }
+
+static int socfpga_mem_calibration(void)
+{
+	int ret;
+
+	ret = socfpga_sdram_calibration(inst_rom_init, inst_rom_init_size,
+					ac_rom_init, ac_rom_init_size);
+
+	return !ret;
+}
diff --git a/arch/arm/mach-socfpga/include/mach/sequencer.h b/arch/arm/mach-socfpga/include/mach/sequencer.h
index 7c9157a25779..5bf524d854a7 100644
--- a/arch/arm/mach-socfpga/include/mach/sequencer.h
+++ b/arch/arm/mach-socfpga/include/mach/sequencer.h
@@ -445,6 +445,11 @@ typedef uint32_t t_btfld;
 #define RW_MGR_INST_ROM_WRITE BASE_RW_MGR + 0x1800
 #define RW_MGR_AC_ROM_WRITE BASE_RW_MGR + 0x1C00
 
+static const uint32_t inst_rom_init_size;
+static const uint32_t inst_rom_init[];
+static const uint32_t ac_rom_init_size;
+static const uint32_t ac_rom_init[];
+
 /* parameter variable holder */
 
 typedef struct param_type {
-- 
2.1.4


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

  parent reply	other threads:[~2015-02-09 10:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-09 10:47 [PATCH v3 00/10] Socfpga: Sequencer updates Steffen Trumtrar
2015-02-09 10:47 ` [PATCH v3 01/10] ARM: sockit: Define inst_rom_init static Steffen Trumtrar
2015-02-09 10:47 ` [PATCH v3 02/10] ARM: socfpga: avoid using external regulator for PLL Steffen Trumtrar
2015-02-09 10:47 ` [PATCH v3 03/10] ARM: socfpga: clkmgr: set alteragrp clocks Steffen Trumtrar
2015-02-09 10:47 ` [PATCH v3 04/10] ARM: socfpga: clkmgr: bypass debug root clock Steffen Trumtrar
2015-02-09 10:47 ` [PATCH v3 05/10] ARM: socfpga: clock-manager: set mainnandsdmmcclk Steffen Trumtrar
2015-02-09 10:47 ` [PATCH v3 06/10] scripts: socfpga sequencer extraction tool Steffen Trumtrar
2015-02-09 10:47 ` Steffen Trumtrar [this message]
2015-02-09 10:47 ` [PATCH v3 08/10] ARM: socfpga: Import sequencer code from generated uboot Steffen Trumtrar
2015-02-09 10:47 ` [PATCH v3 09/10] ARM: socfpga: cleanup sequencer warnings Steffen Trumtrar
2015-02-09 10:47 ` [PATCH v3 10/10] ARM: socfpga: update defconfig Steffen Trumtrar

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=1423478871-15276-8-git-send-email-s.trumtrar@pengutronix.de \
    --to=s.trumtrar@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