Skip to contentSkip to conversation

arm: socfpga: gen5: move to DM

RFC PATCH Superseded Simon Goldschmidt 2 participants 28 messages Oct 15, 2019 – Oct 24, 2019

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

v2 cover arm: socfpga: gen5: move to DM

This is an RFC series with the target to move SPL code from arch to DM drivers.

It is not finished, but I send this here for discussion mainly about the devicetree format with the goal of keeping the various sub- architectures (cyclone5, arria10, etc.) in the same style.

Patch 8 adds a C tool to convert existing gen5 qts handoff files to a handoff dtsi. As an example, the last patch contains the handoff dtsi for socfpga_socrates.

I have sent v1 some time ago, but this one has heavily changed and is not finished, thus v2 but RFC. This series also is not edited to fix patman warnings, yet.

Changes in v2:
- add dts based reset handling (messed up in v1)
- split this patch from v1 5/6
- split this patch from v1 5/6

Simon Goldschmidt (18):
ddr: socfpga: gen5: constify altera_gen5_sdram_ops
dts: arm: socfpga: add label for clkmgr
arm: socfpga: gen5: increase SPL_SYS_MALLOC_F_LEN
timer: dw-apb: add reset handling
arm: socfpga: gen5: move initial reset handling to reset driver
arm: dts: socfpga: add settings for gen5 clk driver
arm: dts: socfpga: make clock nodes available in SPL
socfpga: gen5: add new tool to create handoff dtsi files
sdram: socfpga: gen5: make config structs dts compatible
ddr: socfpga: gen5: fetch handoff information from 'of_to_platdata'
ddr: socfpga: gen5: read handoff information from devicetree
arm: socfpga: gen5: add readonly clk driver
arm: socfpga: gen5: enable DM CLK
arm: socfpga: gen5: move clock initialization to CLK driver
arm: socfpga: gen5: load CLK config from devicetree
spi: cadence_qspi: support DM_CLK
arm: socfpga: gen5: parse qspi clock from devictree
socfpga: gen5: move CLK and SDRAM to DM

 MAINTAINERS                                   |   1 +
 arch/arm/dts/socfpga-common-u-boot.dtsi       |  71 ++
 arch/arm/dts/socfpga.dtsi                     |   7 +-
 .../dts/socfpga_cyclone5_socrates-u-boot.dtsi |   1 +
 .../socfpga_cyclone5_socrates_handoff.dtsi    | 290 +++++++
 arch/arm/mach-socfpga/Kconfig                 |   4 +-
 arch/arm/mach-socfpga/Makefile                |   5 -
 arch/arm/mach-socfpga/clock_manager.c         |  31 +-
 arch/arm/mach-socfpga/clock_manager_gen5.c    | 528 -------------
 arch/arm/mach-socfpga/create_handoff_gen5.c   | 660 ++++++++++++++++
 arch/arm/mach-socfpga/freeze_controller.c     |  10 +-
 .../mach-socfpga/include/mach/clock_manager.h |   2 +
 .../include/mach/clock_manager_gen5.h         |  14 -
 .../mach-socfpga/include/mach/sdram_gen5.h    |  16 +-
 arch/arm/mach-socfpga/qts-to-handoff.sh       |  83 +++
 arch/arm/mach-socfpga/reset_manager_gen5.c    |  13 -
 arch/arm/mach-socfpga/spl_gen5.c              |  29 +-
 arch/arm/mach-socfpga/wrap_pll_config.c       | 146 ----
 arch/arm/mach-socfpga/wrap_sdram_config.c     | 318 --------
 drivers/clk/altera/Makefile                   |   1 +
 drivers/clk/altera/clk-gen5.c                 | 705 ++++++++++++++++++
 drivers/ddr/altera/sdram_gen5.c               |  92 ++-
 drivers/ddr/altera/sequencer.c                |  74 +-
 drivers/ddr/altera/sequencer.h                |   9 +-
 drivers/reset/reset-socfpga.c                 |  37 +-
 drivers/spi/cadence_qspi.c                    |  20 +-
 drivers/timer/dw-apb-timer.c                  |  18 +-
 include/configs/socfpga_common.h              |   5 -
 28 files changed, 2072 insertions(+), 1118 deletions(-)
 create mode 100644 arch/arm/dts/socfpga_cyclone5_socrates_handoff.dtsi
 delete mode 100644 arch/arm/mach-socfpga/clock_manager_gen5.c
 create mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c
 create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh
 delete mode 100644 arch/arm/mach-socfpga/wrap_pll_config.c
 delete mode 100644 arch/arm/mach-socfpga/wrap_sdram_config.c
 create mode 100644 drivers/clk/altera/clk-gen5.c
Signature · 1 line
2.20.1
#1 lore raw

RFC PATCH v2 1/18 ddr: socfpga: gen5: constify altera_gen5_sdram_ops

Make the function pointer struct const, as it does not need to be writable. This doesn't really change anything other than moving this variable to a different section. No functional change.

---

Changes in v2: None

 drivers/ddr/altera/sdram_gen5.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ddr/altera/sdram_gen5.c +1 -1
index fcd89b619d..8c8ea19eb9 100644
@@ -626,7 +626,7 @@ static int altera_gen5_sdram_get_info(struct udevice *dev,
 	return 0;
 }
 
-static struct ram_ops altera_gen5_sdram_ops = {
+static const struct ram_ops altera_gen5_sdram_ops = {
 	.get_info = altera_gen5_sdram_get_info,
 };
 
Signature · 1 line
2.20.1
#2 lore raw

RFC PATCH v2 2/18 dts: arm: socfpga: add label for clkmgr

In reply to Simon Goldschmidt

In preparation for moving socfpga gen5 clock handoff data to devicetree, add a label to the base devicetree so that dts files including this base tree can reference clkmgr by label.

---

Changes in v2: None

 arch/arm/dts/socfpga.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/dts/socfpga.dtsi +1 -1
index 51a6a51b53..eda558f2fe 100644
@@ -114,7 +114,7 @@
 			status = "disabled";
 		};
 
-		clkmgr at ffd04000 {
+		clkmgr: clkmgr at ffd04000 {
 				compatible = "altr,clk-mgr";
 				reg = <0xffd04000 0x1000>;
 
Signature · 1 line
2.20.1
#3 lore raw

RFC PATCH v2 3/18 arm: socfpga: gen5: increase SPL_SYS_MALLOC_F_LEN

In reply to Simon Goldschmidt

In preparation to adding more DM based drivers, increase the SPL pre-relocation heap just enough to allow those new drivers to run.

---

Changes in v2: None

 arch/arm/mach-socfpga/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-socfpga/Kconfig +1 -1
index 1d914648e3..9efdcd6f10 100644
@@ -13,7 +13,7 @@ config SPL_STACK_R_ADDR
 	default 0x00800000 if TARGET_SOCFPGA_GEN5
 
 config SPL_SYS_MALLOC_F_LEN
-	default 0x800 if TARGET_SOCFPGA_GEN5
+	default 0x1100 if TARGET_SOCFPGA_GEN5
 
 config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE
 	default 0xa2
Signature · 1 line
2.20.1
#4 lore raw

RFC PATCH v2 4/18 timer: dw-apb: add reset handling

In reply to Simon Goldschmidt

To use this timer on socfpga as system tick, it needs to take itself out of reset.

---

Changes in v2: None

 drivers/timer/dw-apb-timer.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/timer/dw-apb-timer.c +17 -1
index 86312b8dc7..fad22be8c9 100644
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <clk.h>
+#include <reset.h>
 #include <timer.h>
 
 #include <asm/io.h>
@@ -18,7 +19,8 @@
 #define DW_APB_CTRL		0x8
 
 struct dw_apb_timer_priv {
-	fdt_addr_t	regs;
+	fdt_addr_t regs;
+	struct reset_ctl_bulk resets;
 };
 
 static int dw_apb_timer_get_count(struct udevice *dev, u64 *count)
@@ -42,6 +44,12 @@ static int dw_apb_timer_probe(struct udevice *dev)
 	struct clk clk;
 	int ret;
 
+	ret = reset_get_bulk(dev, &priv->resets);
+	if (ret)
+		dev_warn(dev, "Can't get reset: %d\n", ret);
+	else
+		reset_deassert_bulk(&priv->resets);
+
 	ret = clk_get_by_index(dev, 0, &clk);
 	if (ret)
 		return ret;
@@ -67,6 +75,13 @@ static int dw_apb_timer_ofdata_to_platdata(struct udevice *dev)
 	return 0;
 }
 
+static int dw_apb_timer_remove(struct udevice *dev)
+{
+	struct dw_apb_timer_priv *priv = dev_get_priv(dev);
+
+	return reset_release_bulk(&priv->resets);
+}
+
 static const struct timer_ops dw_apb_timer_ops = {
 	.get_count	= dw_apb_timer_get_count,
 };
@@ -83,5 +98,6 @@ U_BOOT_DRIVER(dw_apb_timer) = {
 	.probe		= dw_apb_timer_probe,
 	.of_match	= dw_apb_timer_ids,
 	.ofdata_to_platdata = dw_apb_timer_ofdata_to_platdata,
+	.remove		= dw_apb_timer_remove,
 	.priv_auto_alloc_size = sizeof(struct dw_apb_timer_priv),
 };
Signature · 1 line
2.20.1
#5 lore raw

RFC PATCH v2 5/18 arm: socfpga: gen5: move initial reset handling to reset driver

In reply to Simon Goldschmidt

This moves disabling all peripherals from ad-hoc code in arch/arm to the socfpga reset driver.

To do this, DM initialization and UCLASS_RESET probing has to be done earlier in the SPL. Also, the gen5 devicetrees need an added property that tells the reset driver which bits to set and which need to be left at 0 (L4WD0).

---

Changes in v2:
- add dts based reset handling (messed up in v1)

 arch/arm/dts/socfpga-common-u-boot.dtsi    |  1 +
 arch/arm/mach-socfpga/reset_manager_gen5.c | 13 --------
 arch/arm/mach-socfpga/spl_gen5.c           | 21 ++++++------
 drivers/reset/reset-socfpga.c              | 37 ++++++++++++++++++++--
 4 files changed, 45 insertions(+), 27 deletions(-)
arch/arm/dts/socfpga-common-u-boot.dtsi +1 -0
index 322c858c4b..aebe476e3f 100644
@@ -12,6 +12,7 @@
 
 &rst {
 	u-boot,dm-pre-reloc;
+	altr,modrst-reset-val = <1 0xffffffbf 0xffffffff>;
 };
 
 &sdr {
arch/arm/mach-socfpga/reset_manager_gen5.c +0 -13
index 9a32f5abfe..34e59b852b 100644
@@ -48,19 +48,6 @@ void socfpga_per_reset(u32 reset, int set)
 		clrbits_le32(reg, 1 << RSTMGR_RESET(reset));
 }
 
-/*
- * Assert reset on every peripheral but L4WD0.
- * Watchdog must be kept intact to prevent glitches
- * and/or hangs.
- */
-void socfpga_per_reset_all(void)
-{
-	const u32 l4wd0 = 1 << RSTMGR_RESET(SOCFPGA_RESET(L4WD0));
-
-	writel(~l4wd0, &reset_manager_base->per_mod_reset);
-	writel(0xffffffff, &reset_manager_base->per2_mod_reset);
-}
-
 #define L3REGS_REMAP_LWHPS2FPGA_MASK	0x10
 #define L3REGS_REMAP_HPS2FPGA_MASK	0x08
 #define L3REGS_REMAP_OCRAM_MASK		0x01
arch/arm/mach-socfpga/spl_gen5.c +9 -12
index 87b76b47de..1ae8025746 100644
@@ -84,12 +84,19 @@ void board_init_f(ulong dummy)
 	socfpga_sdram_remap_zero();
 	socfpga_pl310_clear();
 
+	ret = spl_early_init();
+	if (ret) {
+		debug("spl_early_init() failed: %d\n", ret);
+		hang();
+	}
+
 	debug("Freezing all I/O banks\n");
 	/* freeze all IO banks */
 	sys_mgr_frzctrl_freeze_req();
 
-	/* Put everything into reset but L4WD0. */
-	socfpga_per_reset_all();
+	ret = uclass_get_device(UCLASS_RESET, 0, &dev);
+	if (ret)
+		debug("Reset init failed: %d\n", ret);
 
 	if (!socfpga_is_booting_from_fpga()) {
 		/* Put FPGA bridges into reset too. */
@@ -130,16 +137,6 @@ void board_init_f(ulong dummy)
 	debug_uart_init();
 #endif
 
-	ret = spl_early_init();
-	if (ret) {
-		debug("spl_early_init() failed: %d\n", ret);
-		hang();
-	}
-
-	ret = uclass_get_device(UCLASS_RESET, 0, &dev);
-	if (ret)
-		debug("Reset init failed: %d\n", ret);
-
 	/* enable console uart printing */
 	preloader_console_init();
 
drivers/reset/reset-socfpga.c +35 -2
index 93ec9cfdb6..c5fd0679c7 100644
@@ -106,6 +106,39 @@ static const struct reset_ops socfpga_reset_ops = {
 	.rst_deassert = socfpga_reset_deassert,
 };
 
+/*
+ * This function ensures that in SPL, all peripherals are reset at startup.
+ * It does this by reading reset values from the device tree.
+ */
+static int socfpga_reset_set_inital_reset_values(struct udevice *dev)
+{
+#ifdef CONFIG_SPL_BUILD
+	struct socfpga_reset_data *data = dev_get_priv(dev);
+	int ret;
+	u32 modrst_vals[5];
+	size_t i, sz, offset;
+
+	ret = dev_read_size(dev, "altr,modrst-reset-val");
+	if (ret >= sizeof(u32)) {
+		sz = min(ret/sizeof(u32), ARRAY_SIZE(modrst_vals));
+		ret = dev_read_u32_array(dev, "altr,modrst-reset-val",
+					 modrst_vals, sz);
+		if (ret) {
+			dev_warn(dev, "Failed to read modrst reset values\n");
+			return ret;
+		}
+		/* first item is register offset to start */
+		offset = modrst_vals[0] * 4;
+		for (i = 1; i < sz; i++) {
+			writel(modrst_vals[i], data->modrst_base + offset);
+			offset += 4;
+		}
+	}
+#endif
+
+	return 0;
+}
+
 static int socfpga_reset_probe(struct udevice *dev)
 {
 	struct socfpga_reset_data *data = dev_get_priv(dev);
@@ -117,7 +150,7 @@ static int socfpga_reset_probe(struct udevice *dev)
 	modrst_offset = dev_read_u32_default(dev, "altr,modrst-offset", 0x10);
 	data->modrst_base = membase + modrst_offset;
 
-	return 0;
+	return socfpga_reset_set_inital_reset_values(dev);
 }
 
 static int socfpga_reset_remove(struct udevice *dev)
@@ -163,5 +196,5 @@ U_BOOT_DRIVER(socfpga_reset) = {
 	.priv_auto_alloc_size = sizeof(struct socfpga_reset_data),
 	.ops = &socfpga_reset_ops,
 	.remove = socfpga_reset_remove,
-	.flags	= DM_FLAG_OS_PREPARE,
+	.flags	= DM_FLAG_PRE_RELOC | DM_FLAG_OS_PREPARE,
 };
Signature · 1 line
2.20.1
#6 lore raw

RFC PATCH v2 6/18 arm: dts: socfpga: add settings for gen5 clk driver

In reply to Simon Goldschmidt

For some clocks, the socfpga gen5 clock driver in preparation needs a source register, which is used to select the parent clock.

Add these to the socfpga gen5 base device tree.

---

Changes in v2:
- split this patch from v1 5/6

 arch/arm/dts/socfpga.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/dts/socfpga.dtsi +5 -0
index eda558f2fe..8ff3f211cb 100644
@@ -332,6 +332,7 @@
 						compatible = "altr,socfpga-gate-clk";
 						clocks = <&mainclk>, <&per_base_clk>;
 						div-reg = <0x64 4 3>;
+						src-reg = <0x70 0 1>;
 						clk-gate = <0x60 2>;
 					};
 
@@ -340,6 +341,7 @@
 						compatible = "altr,socfpga-gate-clk";
 						clocks = <&mainclk>, <&per_base_clk>;
 						div-reg = <0x64 7 3>;
+						src-reg = <0x70 1 1>;
 						clk-gate = <0x60 3>;
 					};
 
@@ -453,6 +455,7 @@
 						#clock-cells = <0>;
 						compatible = "altr,socfpga-gate-clk";
 						clocks = <&f2s_periph_ref_clk>, <&main_nand_sdmmc_clk>, <&per_nand_mmc_clk>;
+						src-reg = <0xac 0 2>;
 						clk-gate = <0xa0 8>;
 						clk-phase = <0 135>;
 					};
@@ -469,6 +472,7 @@
 						#clock-cells = <0>;
 						compatible = "altr,socfpga-gate-clk";
 						clocks = <&f2s_periph_ref_clk>, <&main_nand_sdmmc_clk>, <&per_nand_mmc_clk>;
+						src-reg = <0xac 2 2>;
 						clk-gate = <0xa0 9>;
 					};
 
@@ -491,6 +495,7 @@
 						#clock-cells = <0>;
 						compatible = "altr,socfpga-gate-clk";
 						clocks = <&f2s_periph_ref_clk>, <&main_qspi_clk>, <&per_qspi_clk>;
+						src-reg = <0xac 4 2>;
 						clk-gate = <0xa0 11>;
 					};
 
Signature · 1 line
2.20.1
#7 lore raw

RFC PATCH v2 7/18 arm: dts: socfpga: make clock nodes available in SPL

In reply to Simon Goldschmidt

The socfpga gen5 clock driver will need some of the clock nodes to be preserved in the SPL devicetree. Mark them appropriately.

---

Changes in v2:
- split this patch from v1 5/6

 arch/arm/dts/socfpga-common-u-boot.dtsi | 70 +++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
arch/arm/dts/socfpga-common-u-boot.dtsi +70 -0
index aebe476e3f..7bc3b0021f 100644
@@ -7,6 +7,12 @@
 /{
 	soc {
 		u-boot,dm-pre-reloc;
+		clkmgr at ffd04000 {
+			u-boot,dm-pre-reloc;
+			clocks {
+				u-boot,dm-pre-reloc;
+			};
+		};
 	};
 };
 
@@ -18,3 +24,67 @@
 &sdr {
 	u-boot,dm-pre-reloc;
 };
+
+&osc1 {
+	u-boot,dm-pre-reloc;
+};
+
+&osc2 {
+	u-boot,dm-pre-reloc;
+};
+
+&f2s_periph_ref_clk {
+	u-boot,dm-pre-reloc;
+};
+
+&main_pll {
+	u-boot,dm-pre-reloc;
+};
+
+&mainclk {
+	u-boot,dm-pre-reloc;
+};
+
+&main_qspi_clk {
+	u-boot,dm-pre-reloc;
+};
+
+&main_nand_sdmmc_clk {
+	u-boot,dm-pre-reloc;
+};
+
+&periph_pll {
+	u-boot,dm-pre-reloc;
+};
+
+&per_qspi_clk {
+	u-boot,dm-pre-reloc;
+};
+
+&per_nand_mmc_clk {
+	u-boot,dm-pre-reloc;
+};
+
+&per_base_clk {
+	u-boot,dm-pre-reloc;
+};
+
+&l4_mp_clk {
+	u-boot,dm-pre-reloc;
+};
+
+&l4_sp_clk {
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc_clk {
+	u-boot,dm-pre-reloc;
+};
+
+&sdmmc_clk_divided {
+	u-boot,dm-pre-reloc;
+};
+
+&qspi_clk {
+	u-boot,dm-pre-reloc;
+};
Signature · 1 line
2.20.1
#8 lore raw

RFC PATCH v2 8/18 socfpga: gen5: add new tool to create handoff dtsi files

In reply to Simon Goldschmidt

This new tool converts handoff information from quartus to "*_handoff.dtsi" devicetree files. This is in preparation to move from ad-hoc code in arch that parses the 'qts' header files to drivers parsing the same information from devicetree.

Converting existing U-Boot 'qts' files is also supported.

---

Changes in v2: None

 arch/arm/mach-socfpga/create_handoff_gen5.c | 660 ++++++++++++++++++++
 arch/arm/mach-socfpga/qts-to-handoff.sh     |  83 +++
 2 files changed, 743 insertions(+)
 create mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c
 create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh
arch/arm/mach-socfpga/create_handoff_gen5.c new file +660 -0
new file mode 100644
index 0000000000..6ec436719d
@@ -0,0 +1,660 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * This is a host-tool that needs to be compiled per board and prints the
+ * handoff.dtsi to stdout.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+/* Define kernel types */
+typedef uint8_t u8;
+typedef uint32_t u32;
+
+#ifdef USE_QUARTUS_OUTPUT
+#ifdef ARRIA5
+#include "iocsr_config_arria5.c"
+#include "pinmux_config_arria5.c"
+#else
+#include "iocsr_config_cyclone5.c"
+#include "pinmux_config_cyclone5.c"
+#endif
+#include "pll_config.h"
+#include "sdram/sdram_config.h"
+#include "sequencer_auto.h"
+#include "sequencer_defines.h"
+#include "sequencer_auto_ac_init.c"
+#include "sequencer_auto_inst_init.c"
+#define RW_MGR(x) __RW_MGR_##x
+#else
+#define RW_MGR(x) RW_MGR_##x
+#include <iocsr_config.h>
+#include <pinmux_config.h>
+#include <pll_config.h>
+#include <sdram_config.h>
+#endif
+
+#include "include/mach/clock_manager_gen5.h"
+#include "include/mach/sdram_gen5.h"
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
+#endif
+
+const char handoff_dtsi_hdr[] =
+	"// SPDX-License-Identifier: GPL-2.0\n"
+	"/*\n"
+	" *<auto-generated>\n"
+	" *	This code was generated by a tool based on\n"
+	" *	handoffs from both Qsys and Quartus.\n"
+	" *\n"
+	" *	Changes to this file may be lost if\n"
+	" *	the code is regenerated.\n"
+	" *</auto-generated>\n"
+	" */\n";
+
+/* Wrap PLL config */
+
+#define MAIN_VCO_BASE (					\
+	(CONFIG_HPS_MAINPLLGRP_VCO_DENOM <<		\
+		CLKMGR_MAINPLLGRP_VCO_DENOM_OFFSET) |	\
+	(CONFIG_HPS_MAINPLLGRP_VCO_NUMER <<		\
+		CLKMGR_MAINPLLGRP_VCO_NUMER_OFFSET)	\
+	)
+
+#define PERI_VCO_BASE (					\
+	(CONFIG_HPS_PERPLLGRP_VCO_PSRC <<		\
+		CLKMGR_PERPLLGRP_VCO_PSRC_OFFSET) |	\
+	(CONFIG_HPS_PERPLLGRP_VCO_DENOM <<		\
+		CLKMGR_PERPLLGRP_VCO_DENOM_OFFSET) |	\
+	(CONFIG_HPS_PERPLLGRP_VCO_NUMER <<		\
+		CLKMGR_PERPLLGRP_VCO_NUMER_OFFSET)	\
+	)
+
+#define SDR_VCO_BASE (					\
+	(CONFIG_HPS_SDRPLLGRP_VCO_SSRC <<		\
+		CLKMGR_SDRPLLGRP_VCO_SSRC_OFFSET) |	\
+	(CONFIG_HPS_SDRPLLGRP_VCO_DENOM <<		\
+		CLKMGR_SDRPLLGRP_VCO_DENOM_OFFSET) |	\
+	(CONFIG_HPS_SDRPLLGRP_VCO_NUMER <<		\
+		CLKMGR_SDRPLLGRP_VCO_NUMER_OFFSET)	\
+	)
+
+static const struct cm_config cm_default = {
+	/* main group */
+	MAIN_VCO_BASE,
+	(CONFIG_HPS_MAINPLLGRP_MPUCLK_CNT <<
+		CLKMGR_MAINPLLGRP_MPUCLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT <<
+		CLKMGR_MAINPLLGRP_MAINCLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_DBGATCLK_CNT <<
+		CLKMGR_MAINPLLGRP_DBGATCLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_MAINQSPICLK_CNT <<
+		CLKMGR_MAINPLLGRP_MAINQSPICLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_MAINNANDSDMMCCLK_CNT <<
+		CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CNT <<
+		CLKMGR_MAINPLLGRP_CFGS2FUSER0CLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L3MPCLK <<
+		CLKMGR_MAINPLLGRP_MAINDIV_L3MPCLK_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK <<
+		CLKMGR_MAINPLLGRP_MAINDIV_L3SPCLK_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L4MPCLK <<
+		CLKMGR_MAINPLLGRP_MAINDIV_L4MPCLK_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L4SPCLK <<
+		CLKMGR_MAINPLLGRP_MAINDIV_L4SPCLK_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGATCLK <<
+		CLKMGR_MAINPLLGRP_DBGDIV_DBGATCLK_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGCLK <<
+		CLKMGR_MAINPLLGRP_DBGDIV_DBGCLK_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK <<
+		CLKMGR_MAINPLLGRP_TRACEDIV_TRACECLK_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_L4SRC_L4MP <<
+		CLKMGR_MAINPLLGRP_L4SRC_L4MP_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_L4SRC_L4SP <<
+		CLKMGR_MAINPLLGRP_L4SRC_L4SP_OFFSET),
+
+	/* peripheral group */
+	PERI_VCO_BASE,
+	(CONFIG_HPS_PERPLLGRP_EMAC0CLK_CNT <<
+		CLKMGR_PERPLLGRP_EMAC0CLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_EMAC1CLK_CNT <<
+		CLKMGR_PERPLLGRP_EMAC1CLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT <<
+		CLKMGR_PERPLLGRP_PERQSPICLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_PERNANDSDMMCCLK_CNT <<
+		CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_PERBASECLK_CNT <<
+		CLKMGR_PERPLLGRP_PERBASECLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_S2FUSER1CLK_CNT <<
+		CLKMGR_PERPLLGRP_S2FUSER1CLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_DIV_USBCLK <<
+		CLKMGR_PERPLLGRP_DIV_USBCLK_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_DIV_SPIMCLK <<
+		CLKMGR_PERPLLGRP_DIV_SPIMCLK_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_DIV_CAN0CLK <<
+		CLKMGR_PERPLLGRP_DIV_CAN0CLK_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_DIV_CAN1CLK <<
+		CLKMGR_PERPLLGRP_DIV_CAN1CLK_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_GPIODIV_GPIODBCLK <<
+		CLKMGR_PERPLLGRP_GPIODIV_GPIODBCLK_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_SRC_QSPI <<
+		CLKMGR_PERPLLGRP_SRC_QSPI_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_SRC_NAND <<
+		CLKMGR_PERPLLGRP_SRC_NAND_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_SRC_SDMMC <<
+		CLKMGR_PERPLLGRP_SRC_SDMMC_OFFSET),
+
+	/* sdram pll group */
+	SDR_VCO_BASE,
+	(CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_PHASE <<
+		CLKMGR_SDRPLLGRP_DDRDQSCLK_PHASE_OFFSET) |
+	(CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_CNT <<
+		CLKMGR_SDRPLLGRP_DDRDQSCLK_CNT_OFFSET),
+	(CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_PHASE <<
+		CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_OFFSET) |
+	(CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT <<
+		CLKMGR_SDRPLLGRP_DDR2XDQSCLK_CNT_OFFSET),
+	(CONFIG_HPS_SDRPLLGRP_DDRDQCLK_PHASE <<
+		CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_OFFSET) |
+	(CONFIG_HPS_SDRPLLGRP_DDRDQCLK_CNT <<
+		CLKMGR_SDRPLLGRP_DDRDQCLK_CNT_OFFSET),
+	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_PHASE <<
+		CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
+	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
+		CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
+
+	/* altera group */
+	CONFIG_HPS_ALTERAGRP_MPUCLK,
+};
+
+/* Wrap SDRAM config */
+static const struct socfpga_sdram_config sdram_config = {
+	.ctrl_cfg =
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<
+			SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<
+			SDR_CTRLGRP_CTRLCFG_MEMBL_LSB)			|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<
+			SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN <<
+			SDR_CTRLGRP_CTRLCFG_ECCEN_LSB)			|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN <<
+			SDR_CTRLGRP_CTRLCFG_ECCCORREN_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN <<
+			SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<
+			SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<
+			SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<
+			SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),
+	.dram_timing1 =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<
+			SDR_CTRLGRP_DRAMTIMING1_TCWL_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL <<
+			SDR_CTRLGRP_DRAMTIMING1_TAL_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL <<
+			SDR_CTRLGRP_DRAMTIMING1_TCL_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<
+			SDR_CTRLGRP_DRAMTIMING1_TRRD_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW <<
+			SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<
+			SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),
+	.dram_timing2 =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI <<
+			SDR_CTRLGRP_DRAMTIMING2_TREFI_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRCD <<
+			SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP <<
+			SDR_CTRLGRP_DRAMTIMING2_TRP_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<
+			SDR_CTRLGRP_DRAMTIMING2_TWR_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR <<
+			SDR_CTRLGRP_DRAMTIMING2_TWTR_LSB),
+	.dram_timing3 =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP <<
+			SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS <<
+			SDR_CTRLGRP_DRAMTIMING3_TRAS_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC <<
+			SDR_CTRLGRP_DRAMTIMING3_TRC_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<
+			SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<
+			SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),
+	.dram_timing4 =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<
+			SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB)	|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<
+			SDR_CTRLGRP_DRAMTIMING4_PWRDOWNEXIT_LSB),
+	.lowpwr_timing =
+		(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<
+			SDR_CTRLGRP_LOWPWRTIMING_AUTOPDCYCLES_LSB)	|
+		(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<
+			SDR_CTRLGRP_LOWPWRTIMING_CLKDISABLECYCLES_LSB),
+	.dram_odt =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ <<
+			SDR_CTRLGRP_DRAMODT_READ_LSB)			|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<
+			SDR_CTRLGRP_DRAMODT_WRITE_LSB),
+	.extratime1 =
+	(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR <<
+			SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_LSB)		|
+	(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_BC <<
+			SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_BC_LSB)		|
+(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_DIFF_CHIP <<
+			SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_DIFF_LSB),
+	.dram_addrw =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<
+			SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS <<
+			SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS <<
+			SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB)		|
+		((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<
+			SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),
+	.dram_if_width =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<
+			SDR_CTRLGRP_DRAMIFWIDTH_IFWIDTH_LSB),
+	.dram_dev_width =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<
+			SDR_CTRLGRP_DRAMDEVWIDTH_DEVWIDTH_LSB),
+	.dram_intr =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN <<
+			SDR_CTRLGRP_DRAMINTR_INTREN_LSB),
+	.lowpwr_eq =
+		(CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK <<
+			SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),
+	.static_cfg =
+		(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<
+			SDR_CTRLGRP_STATICCFG_MEMBL_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<
+			SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),
+	.ctrl_width =
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<
+			SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),
+	.cport_width =
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<
+			SDR_CTRLGRP_CPORTWIDTH_CMDPORTWIDTH_LSB),
+	.cport_wmap =
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP <<
+			SDR_CTRLGRP_CPORTWMAP_CPORTWFIFOMAP_LSB),
+	.cport_rmap =
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP <<
+			SDR_CTRLGRP_CPORTRMAP_CPORTRFIFOMAP_LSB),
+	.rfifo_cmap =
+		(CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<
+			SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),
+	.wfifo_cmap =
+		(CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<
+			SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),
+	.cport_rdwr =
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<
+			SDR_CTRLGRP_CPORTRDWR_CPORTRDWR_LSB),
+	.port_cfg =
+		(CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN <<
+			SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LSB),
+	.fpgaport_rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,
+	.fifo_cfg =
+		(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<
+			SDR_CTRLGRP_FIFOCFG_SYNCMODE_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_INCSYNC <<
+			SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),
+	.mp_priority =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY <<
+			SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),
+	.mp_weight0 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_0_LSB),
+	.mp_weight1 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_32_LSB) |
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB),
+	.mp_weight2 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_14_LSB),
+	.mp_weight3 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),
+	.mp_pacing0 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),
+	.mp_pacing1 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59_32 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD1_59_32_LSB) |
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD2_3_0_LSB),
+	.mp_pacing2 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOLD2_35_4_LSB),
+	.mp_pacing3 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),
+	.mp_threshold0 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<
+			SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),
+	.mp_threshold1 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<
+			SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),
+	.mp_threshold2 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 <<
+			SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LSB),
+	.phy_ctrl0 = CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,
+};
+
+static const struct socfpga_sdram_rw_mgr_config rw_mgr_config = {
+	.activate_0_and_1		= RW_MGR(ACTIVATE_0_AND_1),
+	.activate_0_and_1_wait1		= RW_MGR(ACTIVATE_0_AND_1_WAIT1),
+	.activate_0_and_1_wait2		= RW_MGR(ACTIVATE_0_AND_1_WAIT2),
+	.activate_1			= RW_MGR(ACTIVATE_1),
+	.clear_dqs_enable		= RW_MGR(CLEAR_DQS_ENABLE),
+	.guaranteed_read		= RW_MGR(GUARANTEED_READ),
+	.guaranteed_read_cont		= RW_MGR(GUARANTEED_READ_CONT),
+	.guaranteed_write		= RW_MGR(GUARANTEED_WRITE),
+	.guaranteed_write_wait0		= RW_MGR(GUARANTEED_WRITE_WAIT0),
+	.guaranteed_write_wait1		= RW_MGR(GUARANTEED_WRITE_WAIT1),
+	.guaranteed_write_wait2		= RW_MGR(GUARANTEED_WRITE_WAIT2),
+	.guaranteed_write_wait3		= RW_MGR(GUARANTEED_WRITE_WAIT3),
+	.idle				= RW_MGR(IDLE),
+	.idle_loop1			= RW_MGR(IDLE_LOOP1),
+	.idle_loop2			= RW_MGR(IDLE_LOOP2),
+	.init_reset_0_cke_0		= RW_MGR(INIT_RESET_0_CKE_0),
+	.init_reset_1_cke_0		= RW_MGR(INIT_RESET_1_CKE_0),
+	.lfsr_wr_rd_bank_0		= RW_MGR(LFSR_WR_RD_BANK_0),
+	.lfsr_wr_rd_bank_0_data		= RW_MGR(LFSR_WR_RD_BANK_0_DATA),
+	.lfsr_wr_rd_bank_0_dqs		= RW_MGR(LFSR_WR_RD_BANK_0_DQS),
+	.lfsr_wr_rd_bank_0_nop		= RW_MGR(LFSR_WR_RD_BANK_0_NOP),
+	.lfsr_wr_rd_bank_0_wait		= RW_MGR(LFSR_WR_RD_BANK_0_WAIT),
+	.lfsr_wr_rd_bank_0_wl_1		= RW_MGR(LFSR_WR_RD_BANK_0_WL_1),
+	.lfsr_wr_rd_dm_bank_0		= RW_MGR(LFSR_WR_RD_DM_BANK_0),
+	.lfsr_wr_rd_dm_bank_0_data	= RW_MGR(LFSR_WR_RD_DM_BANK_0_DATA),
+	.lfsr_wr_rd_dm_bank_0_dqs	= RW_MGR(LFSR_WR_RD_DM_BANK_0_DQS),
+	.lfsr_wr_rd_dm_bank_0_nop	= RW_MGR(LFSR_WR_RD_DM_BANK_0_NOP),
+	.lfsr_wr_rd_dm_bank_0_wait	= RW_MGR(LFSR_WR_RD_DM_BANK_0_WAIT),
+	.lfsr_wr_rd_dm_bank_0_wl_1	= RW_MGR(LFSR_WR_RD_DM_BANK_0_WL_1),
+	.mrs0_dll_reset			= RW_MGR(MRS0_DLL_RESET),
+	.mrs0_dll_reset_mirr		= RW_MGR(MRS0_DLL_RESET_MIRR),
+	.mrs0_user			= RW_MGR(MRS0_USER),
+	.mrs0_user_mirr			= RW_MGR(MRS0_USER_MIRR),
+	.mrs1				= RW_MGR(MRS1),
+	.mrs1_mirr			= RW_MGR(MRS1_MIRR),
+	.mrs2				= RW_MGR(MRS2),
+	.mrs2_mirr			= RW_MGR(MRS2_MIRR),
+	.mrs3				= RW_MGR(MRS3),
+	.mrs3_mirr			= RW_MGR(MRS3_MIRR),
+	.precharge_all			= RW_MGR(PRECHARGE_ALL),
+	.read_b2b			= RW_MGR(READ_B2B),
+	.read_b2b_wait1			= RW_MGR(READ_B2B_WAIT1),
+	.read_b2b_wait2			= RW_MGR(READ_B2B_WAIT2),
+	.refresh_all			= RW_MGR(REFRESH_ALL),
+	.rreturn			= RW_MGR(RETURN),
+	.sgle_read			= RW_MGR(SGLE_READ),
+	.zqcl				= RW_MGR(ZQCL),
+
+	.true_mem_data_mask_width	= RW_MGR_TRUE_MEM_DATA_MASK_WIDTH,
+	.mem_address_mirroring		= RW_MGR_MEM_ADDRESS_MIRRORING,
+	.mem_data_mask_width		= RW_MGR_MEM_DATA_MASK_WIDTH,
+	.mem_data_width			= RW_MGR_MEM_DATA_WIDTH,
+	.mem_dq_per_read_dqs		= RW_MGR_MEM_DQ_PER_READ_DQS,
+	.mem_dq_per_write_dqs		= RW_MGR_MEM_DQ_PER_WRITE_DQS,
+	.mem_if_read_dqs_width		= RW_MGR_MEM_IF_READ_DQS_WIDTH,
+	.mem_if_write_dqs_width		= RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
+	.mem_number_of_cs_per_dimm	= RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM,
+	.mem_number_of_ranks		= RW_MGR_MEM_NUMBER_OF_RANKS,
+	.mem_virtual_groups_per_read_dqs =
+		RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS,
+	.mem_virtual_groups_per_write_dqs =
+		RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS,
+};
+
+static const struct socfpga_sdram_io_config io_config = {
+	.delay_per_dchain_tap		= IO_DELAY_PER_DCHAIN_TAP,
+	.delay_per_dqs_en_dchain_tap	= IO_DELAY_PER_DQS_EN_DCHAIN_TAP,
+	.delay_per_opa_tap_lo		= IO_DELAY_PER_OPA_TAP & 0xff,
+	.delay_per_opa_tap_hi		= (IO_DELAY_PER_OPA_TAP << 8) & 0xff,
+	.dll_chain_length		= IO_DLL_CHAIN_LENGTH,
+	.dqdqs_out_phase_max		= IO_DQDQS_OUT_PHASE_MAX,
+	.dqs_en_delay_max		= IO_DQS_EN_DELAY_MAX,
+	.dqs_en_delay_offset		= IO_DQS_EN_DELAY_OFFSET,
+	.dqs_en_phase_max		= IO_DQS_EN_PHASE_MAX,
+	.dqs_in_delay_max		= IO_DQS_IN_DELAY_MAX,
+	.dqs_in_reserve			= IO_DQS_IN_RESERVE,
+	.dqs_out_reserve		= IO_DQS_OUT_RESERVE,
+	.io_in_delay_max		= IO_IO_IN_DELAY_MAX,
+	.io_out1_delay_max		= IO_IO_OUT1_DELAY_MAX,
+	.io_out2_delay_max		= IO_IO_OUT2_DELAY_MAX,
+	.shift_dqs_en_when_shift_dqs	= IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS,
+};
+
+static const struct socfpga_sdram_misc_config misc_config = {
+	.afi_rate_ratio			= AFI_RATE_RATIO,
+	.calib_lfifo_offset		= CALIB_LFIFO_OFFSET,
+	.calib_vfifo_offset		= CALIB_VFIFO_OFFSET,
+	.enable_super_quick_calibration	= ENABLE_SUPER_QUICK_CALIBRATION,
+	.max_latency_count_width	= MAX_LATENCY_COUNT_WIDTH,
+	.read_valid_fifo_size		= READ_VALID_FIFO_SIZE,
+	.reg_file_init_seq_signature_ll	= REG_FILE_INIT_SEQ_SIGNATURE & 0xff,
+	.reg_file_init_seq_signature_lh	= (REG_FILE_INIT_SEQ_SIGNATURE >> 8) & 0xff,
+	.reg_file_init_seq_signature_hl	= (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,
+	.reg_file_init_seq_signature_hh	= (REG_FILE_INIT_SEQ_SIGNATURE >> 24) & 0xff,
+	.tinit_cntr0_val		= TINIT_CNTR0_VAL,
+	.tinit_cntr1_val		= TINIT_CNTR1_VAL,
+	.tinit_cntr2_val		= TINIT_CNTR2_VAL,
+	.treset_cntr0_val		= TRESET_CNTR0_VAL,
+	.treset_cntr1_val		= TRESET_CNTR1_VAL,
+	.treset_cntr2_val		= TRESET_CNTR2_VAL,
+};
+
+static void print_hdr(void)
+{
+	printf(handoff_dtsi_hdr);
+}
+
+static void print_clkmgr_base(void)
+{
+	const char handoff_dtsi_clkmgr_base[] =
+		"\n"
+		"&osc1 {\n"
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC1_HZ */
+		"};\n"
+		"\n"
+		"&osc2 {\n"
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC2_HZ */
+		"};\n"
+		"\n"
+		"&f2s_periph_ref_clk {\n"
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_PER_REF_HZ */
+		"};\n"
+		"\n"
+		"&f2s_sdram_ref_clk {\n"
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_SDR_REF_HZ */
+		"};\n";
+
+	printf(handoff_dtsi_clkmgr_base, CONFIG_HPS_CLK_OSC1_HZ,
+	       CONFIG_HPS_CLK_OSC2_HZ, CONFIG_HPS_CLK_F2S_PER_REF_HZ,
+	       CONFIG_HPS_CLK_F2S_SDR_REF_HZ);
+}
+
+/*
+ * dtc stores u32 array big endian but we load them raw and expect them to be in
+ * little endian format. To prevent this tool to depend on host endianess, do
+ * the switch manually, not via 'htonl'.
+ */
+static u32 swap_bytes(u32 val)
+{
+	return (val << 24) | ((val & 0xFF00ul) << 8) |
+		((val & 0xFF0000ul) >> 8) | (val >> 24);
+}
+
+static void print_array_ulong(const unsigned long *arr, size_t arr_size,
+			      size_t el_per_line, const char *indent1,
+			      const char *name, const char *indent_next)
+{
+	size_t i;
+
+	printf("%s%s = <", indent1, name);
+	for (i = 0; i < arr_size; i++) {
+		printf("0x%08x", swap_bytes((u32)arr[i]));
+		if (i + 1 < arr_size) {
+			if (i % el_per_line == (el_per_line - 1)) {
+				printf("\n%s", indent_next);
+			} else {
+				printf(" ");
+			}
+		}
+	}
+	printf(">;\n");
+}
+
+#ifdef USE_QUARTUS_OUTPUT
+static void print_array_sysmgrinit(const unsigned long *arr, size_t arr_size,
+				   const char *indent1, const char *name,
+				   const char *indent_next)
+{
+	size_t i;
+
+	printf("%s%s = [", indent1, name);
+	for (i = 0; i < arr_size; i++) {
+		printf("%02x", (u8)arr[i]);
+		if (i + 1 < arr_size) {
+			if (i % 8 == 7) {
+				printf("\n%s", indent_next);
+			} else {
+				printf(" ");
+			}
+		}
+	}
+	printf("];\n");
+}
+#define print_array_alt_u32 print_array_ulong
+#else
+#define print_array_sysmgrinit(arr, sz, ind1, n, ind2) print_array_u8(arr, sz, 8, ind1, n, ind2)
+#define print_array_alt_u32 print_array_u32
+#endif
+
+static void print_array_u32(const u32 *arr, size_t arr_size,
+			    size_t el_per_line, const char *indent1,
+			    const char *name, const char *indent_next)
+{
+	size_t i;
+
+	printf("%s%s = <", indent1, name);
+	for (i = 0; i < arr_size; i++) {
+		printf("0x%08x", swap_bytes(arr[i]));
+		if (i + 1 < arr_size) {
+			if (i % el_per_line == (el_per_line - 1)) {
+				printf("\n%s", indent_next);
+			} else {
+				printf(" ");
+			}
+		}
+	}
+	printf(">;\n");
+}
+
+static void print_array_u8(const u8 *arr, size_t arr_size, size_t el_per_line,
+			   const char *indent1, const char *name,
+			   const char *indent_next)
+{
+	size_t i;
+
+	printf("%s%s = [", indent1, name);
+	for (i = 0; i < arr_size; i++) {
+		printf("%02x", arr[i]);
+		if (i + 1 < arr_size) {
+			if (i % el_per_line == (el_per_line - 1)) {
+				printf("\n%s", indent_next);
+			} else {
+				printf(" ");
+			}
+		}
+	}
+	printf("];\n");
+}
+
+
+static void print_clkmgr_cfg(void)
+{
+	const char handoff_dtsi_clkmgr_cfg_a[] =
+		"\n"
+		"&clkmgr {\n";
+	const char handoff_dtsi_clkmgr_cfg_b[] = "};\n";
+	const char clk_mgr_cfg_indent[] = "\t\t\t    ";
+
+	printf(handoff_dtsi_clkmgr_cfg_a);
+	print_array_u32((const u32 *)&cm_default, sizeof(cm_default)/4, 4, "\t",
+			"altr,clk-mgr-cfg", clk_mgr_cfg_indent);
+	printf(handoff_dtsi_clkmgr_cfg_b);
+}
+
+static void print_sysmgr(void)
+{
+	const char handoff_dtsi_sysmgr_begin[] =
+		"\n"
+		"&sysmgr {\n";
+	const char handoff_dtsi_sysmgr_end[] = "};\n";
+	const char sysmgr_cfg_indent[] = "\t\t\t\t\t";
+	size_t i;
+
+	printf(handoff_dtsi_sysmgr_begin);
+
+	/* sys_mgr_init_table is an u8 table */
+	print_array_sysmgrinit(sys_mgr_init_table, ARRAY_SIZE(sys_mgr_init_table),
+			       "\t", "altr,pinmux-cfg","\t\t\t   ");
+	/* ioscr scan chain table 0 */
+	print_array_ulong(iocsr_scan_chain0_table,
+			  ARRAY_SIZE(iocsr_scan_chain0_table), 4,
+			  "\t", "altr,iocsr-scan-chain0-table",
+			  sysmgr_cfg_indent);
+	/* ioscr scan chain table 0 */
+	print_array_ulong(iocsr_scan_chain1_table,
+			  ARRAY_SIZE(iocsr_scan_chain1_table), 4,
+			  "\t", "altr,iocsr-scan-chain1-table",
+			  sysmgr_cfg_indent);
+	/* ioscr scan chain table 0 */
+	print_array_ulong(iocsr_scan_chain2_table,
+			  ARRAY_SIZE(iocsr_scan_chain2_table), 4,
+			  "\t", "altr,iocsr-scan-chain2-table",
+			  sysmgr_cfg_indent);
+	/* ioscr scan chain table 0 */
+	print_array_ulong(iocsr_scan_chain3_table,
+			  ARRAY_SIZE(iocsr_scan_chain3_table), 4,
+			  "\t", "altr,iocsr-scan-chain3-table",
+			  sysmgr_cfg_indent);
+	printf(handoff_dtsi_sysmgr_end);
+}
+
+static void print_sdram_cfg(void)
+{
+	const char handoff_dtsi_sdram_cfg_begin[] =
+		"\n"
+		"&sdr {\n";
+	const char handoff_dtsi_sdram_cfg_end[] = "};\n";
+
+	printf(handoff_dtsi_sdram_cfg_begin);
+	print_array_u32((const u32 *)&sdram_config, sizeof(sdram_config)/4, 4,
+			"\t", "altr,sdr-cfg", "\t\t\t");
+	print_array_u8((const u8 *)&rw_mgr_config, sizeof(rw_mgr_config), 8,
+			"\t", "altr,sdr-rw-mgr-cfg", "\t\t\t       ");
+	print_array_u8((const u8 *)&io_config, sizeof(io_config), 8,
+			"\t", "altr,sdr-io-cfg", "\t\t\t   ");
+	print_array_u8((const u8 *)&misc_config, sizeof(misc_config), 8,
+			"\t", "altr,sdr-misc-cfg", "\t\t\t     ");
+	print_array_alt_u32(ac_rom_init, ARRAY_SIZE(ac_rom_init), 4,
+			"\t", "altr,sdr-ac-rom-init", "\t\t\t\t");
+	print_array_alt_u32(inst_rom_init, ARRAY_SIZE(inst_rom_init), 4,
+			"\t", "altr,sdr-inst-rom-init", "\t\t\t\t  ");
+	printf(handoff_dtsi_sdram_cfg_end);
+}
+
+int main(void)
+{
+	print_hdr();
+	print_clkmgr_base();
+	print_clkmgr_cfg();
+	print_sysmgr();
+	print_sdram_cfg();
+}
arch/arm/mach-socfpga/qts-to-handoff.sh new file +83 -0

83 lines not on this page · raw message

Signature · 1 line
2.20.1
#9 lore raw

RFC PATCH v2 8/18 socfpga: gen5: add new tool to create handoff dtsi files

I mentioned this before, it would be great to not rely on the generated filesand do this based purely on the handoff data generated during a quartusbuild. Did you look at the python source i pointed you to?
--dalon

Quoted 432 lines · Simon Goldschmidt

This new tool converts handoff information from quartus to "*_handoff.dtsi"devicetree files. This is in preparation to move from ad-hoc code in archthat parses the 'qts' header files to drivers parsing the same informationfrom devicetree.
Converting existing U-Boot 'qts' files is also supported.

Changes in v2: None

 arch/arm/mach-socfpga/create_handoff_gen5.c | 660 ++++++++++++++++++++

arch/arm/mach-socfpga/qts-to-handoff.sh | 83 +++ 2 files changed, 743
insertions(+) create mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh

arch/arm/mach- renamed from arch/arm/mach-socfpga/create_handoff_gen5.c +0 -0

socfpga/create_handoff_gen5.cnew file mode 100644index 0000000000..6ec436719d- -- /dev/null+++ b/arch/arm/mach-socfpga/create_handoff_gen5.c@@ -0,0 +1,660 @@+// SPDX-License-Identifier: GPL-2.0+/*+ * This is a host-tool that needs to be compiled per board and prints the+ * handoff.dtsi to stdout.+ */++#include <stdio.h>+#include <stdint.h>++/* Define kernel types */+typedef uint8_t u8;+typedef uint32_t u32;++#ifdef USE_QUARTUS_OUTPUT+#ifdef ARRIA5+#include "iocsr_config_arria5.c"+#include "pinmux_config_arria5.c"+#else+#include "iocsr_config_cyclone5.c"+#include "pinmux_config_cyclone5.c"+#endif+#include "pll_config.h"+#include "sdram/sdram_config.h"+#include "sequencer_auto.h"+#include "sequencer_defines.h"+#include "sequencer_auto_ac_init.c"+#include "sequencer_auto_inst_init.c"+#define RW_MGR(x) __RW_MGR_##x+#else+#define RW_MGR(x) RW_MGR_##x+#include <iocsr_config.h>+#include <pinmux_config.h>+#include <pll_config.h>+#include <sdram_config.h>+#endif++#include "include/mach/clock_manager_gen5.h"+#include "include/mach/sdram_gen5.h"++#ifndef ARRAY_SIZE+#define ARRAY_SIZE(x)
(sizeof(x)/sizeof((x)[0]))+#endif++const char handoff_dtsi_hdr[] =+ "//
SPDX-License-Identifier: GPL-2.0\n"+ "/*\n"+ " *<auto-generated>\n"+ " *
This code was generated by a tool based on\n"+ " * handoffs from
both Qsys and Quartus.\n"+ " *\n"+ " * Changes to this file may be
lost if\n"+ " * the code is regenerated.\n"+ " *</auto-
generated>\n"+ " */\n";++/* Wrap PLL config */++#define MAIN_VCO_BASE (
\+ (CONFIG_HPS_MAINPLLGRP_VCO_DEN
OM << \+ CLKMGR_MAINPLLGRP_VCO_DENOM_OFFSET) | \+
(CONFIG_HPS_MAINPLLGRP_VCO_NUMER << \+ CLKMGR_MAINPLL
GRP_VCO_NUMER_OFFSET) \+ )++#define PERI_VCO_BASE (

		\+	(CONFIG_HPS_PERPLLGRP_VCO_PSRC <<		\+	
	CLKMGR_PERPLLGRP_VCO_PSRC_OFFSET) |	\+	(CONFIG_HPS_PERPLLGRP_
VCO_DENOM <<		\+		CLKMGR_PERPLLGRP_VCO_DENOM_OFFSET) |	
\+	(CONFIG_HPS_PERPLLGRP_VCO_NUMER <<		\+		CLKMGR
_PERPLLGRP_VCO_NUMER_OFFSET)	\+	)++#define SDR_VCO_BASE (		
			\+	(CONFIG_HPS_SDRPLLGRP_VCO_SSRC <<		

\+ CLKMGR_SDRPLLGRP_VCO_SSRC_OFFSET) | \+ (CONFIG_HPS_SD
RPLLGRP_VCO_DENOM << \+ CLKMGR_SDRPLLGRP_VCO_DENOM_OFF
SET) | \+ (CONFIG_HPS_SDRPLLGRP_VCO_NUMER << \+
CLKMGR_SDRPLLGRP_VCO_NUMER_OFFSET) \+ )++static const struct
cm_config cm_default = {+ /* main group */+ MAIN_VCO_BASE,+ (CONFIG_HPS_MA
INPLLGRP_MPUCLK_CNT <<+ CLKMGR_MAINPLLGRP_MPUCLK_CNT_OFFSET),+
(CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT <<+ CLKMGR_MAINPLLGRP_MAINCL
K_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_DBGATCLK_CNT <<+ CLKMGR
_MAINPLLGRP_DBGATCLK_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_MAINQSPICLK_CNT
<<+ CLKMGR_MAINPLLGRP_MAINQSPICLK_CNT_OFFSET),+ (CONFIG_HPS_MA
INPLLGRP_MAINNANDSDMMCCLK_CNT <<+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK
_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CNT <<+
CLKMGR_MAINPLLGRP_CFGS2FUSER0CLK_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_M
AINDIV_L3MPCLK <<+ CLKMGR_MAINPLLGRP_MAINDIV_L3MPCLK_OFFSET) |+
(CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK <<+ CLKMGR_MAINPLLGRP_MAINDI
V_L3SPCLK_OFFSET) |+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L4MPCLK <<+
CLKMGR_MAINPLLGRP_MAINDIV_L4MPCLK_OFFSET) |+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L
4SPCLK <<+ CLKMGR_MAINPLLGRP_MAINDIV_L4SPCLK_OFFSET),+ (CONFI
G_HPS_MAINPLLGRP_DBGDIV_DBGATCLK <<+ CLKMGR_MAINPLLGRP_DBGDIV_DBGATCL
K_OFFSET) |+ (CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGCLK <<+ CLKMGR_MAINPLL
GRP_DBGDIV_DBGCLK_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK <<+
CLKMGR_MAINPLLGRP_TRACEDIV_TRACECLK_OFFSET),+ (CONFIG_HPS_MAINPLLGRP
_L4SRC_L4MP <<+ CLKMGR_MAINPLLGRP_L4SRC_L4MP_OFFSET) |+ (CONFI
G_HPS_MAINPLLGRP_L4SRC_L4SP <<+ CLKMGR_MAINPLLGRP_L4SRC_L4SP_OFF
SET),++ /* peripheral group */+ PERI_VCO_BASE,+ (CONFIG_HPS_PERPLLGRP_
EMAC0CLK_CNT <<+ CLKMGR_PERPLLGRP_EMAC0CLK_CNT_OFFSET),+ (CONFI
G_HPS_PERPLLGRP_EMAC1CLK_CNT <<+ CLKMGR_PERPLLGRP_EMAC1CLK_CNT_OF
FSET),+ (CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT <<+ CLKMGR_PERPLLG
RP_PERQSPICLK_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_PERNANDSDMMCCLK_CNT <<+
CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_
PERBASECLK_CNT <<+ CLKMGR_PERPLLGRP_PERBASECLK_CNT_OFFSET),+ (CONFI
G_HPS_PERPLLGRP_S2FUSER1CLK_CNT <<+ CLKMGR_PERPLLGRP_S2FUSER1CLK_CNT
_OFFSET),+ (CONFIG_HPS_PERPLLGRP_DIV_USBCLK <<+ CLKMGR_PERPLLG
RP_DIV_USBCLK_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_DIV_SPIMCLK <<+
CLKMGR_PERPLLGRP_DIV_SPIMCLK_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_DIV_CAN0CL
K <<+ CLKMGR_PERPLLGRP_DIV_CAN0CLK_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_
DIV_CAN1CLK <<+ CLKMGR_PERPLLGRP_DIV_CAN1CLK_OFFSET),+ (CONFI
G_HPS_PERPLLGRP_GPIODIV_GPIODBCLK <<+ CLKMGR_PERPLLGRP_GPIODIV_GPIODBC
LK_OFFSET),+ (CONFIG_HPS_PERPLLGRP_SRC_QSPI <<+ CLKMGR_PERPLLG
RP_SRC_QSPI_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_SRC_NAND <<+
CLKMGR_PERPLLGRP_SRC_NAND_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_SRC_SDMMC <<+
CLKMGR_PERPLLGRP_SRC_SDMMC_OFFSET),++ /* sdram pll group */+ SDR_VC
O_BASE,+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_PHASE <<+ CLKMGR_SDRPLLG
RP_DDRDQSCLK_PHASE_OFFSET) |+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_CNT <<+
CLKMGR_SDRPLLGRP_DDRDQSCLK_CNT_OFFSET),+ (CONFIG_HPS_SDRPLLGRP_DDR2XDQSCL
K_PHASE <<+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_OFFSET) |+ (CONFI
G_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT <<+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_CNT
_OFFSET),+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_PHASE <<+ CLKMGR_SDRPLLG
RP_DDRDQCLK_PHASE_OFFSET) |+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_CNT <<+
CLKMGR_SDRPLLGRP_DDRDQCLK_CNT_OFFSET),+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CL
K_PHASE <<+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |+ (CONFI
G_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT
_OFFSET),++ /* altera group */+ CONFIG_HPS_ALTERAGRP_MPUCLK,+};++/*
Wrap SDRAM config */+static const struct socfpga_sdram_config sdram_config =
{+ .ctrl_cfg =+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<+

		SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB)		|+		(CONFI
G_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<+			SDR_CTRLGRP_CTRLCFG_MEMB
L_LSB)			|+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCF
G_ADDRORDER <<+			SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB)	
	|+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN <<+		
	SDR_CTRLGRP_CTRLCFG_ECCEN_LSB)			|+		(CONFI
G_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN <<+			SDR_CTRLGRP_CTRL
CFG_ECCCORREN_LSB)		|+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCF
G_REORDEREN <<+			SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB)	
	|+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<+		
	SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB)		|+		(CONFI

G_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<+ SDR_CTRLGRP_CTRL
CFG_DQSTRKEN_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCF
G_NODMPINS <<+ SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),+
.dram_timing1 =+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<+

		SDR_CTRLGRP_DRAMTIMING1_TCWL_LSB)		|+		(CONFI

G_HPS_SDR_CTRLCFG_DRAMTIMING1_AL <<+ SDR_CTRLGRP_DRAMTIMING1_
TAL_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TC
L <<+ SDR_CTRLGRP_DRAMTIMING1_TCL_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<+ SDR_CTRLGRP_DRAM
TIMING1_TRRD_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTI
MING1_TFAW <<+ SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB)
|+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<+
SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),+ .dram_timing2 =+ (CONFIG_HPS_SD
R_CTRLCFG_DRAMTIMING2_IF_TREFI <<+ SDR_CTRLGRP_DRAMTIMING2_
TREFI_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF
_TRCD <<+ SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB) |+

	(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP <<+			SDR_CT
RLGRP_DRAMTIMING2_TRP_LSB)		|+		(CONFIG_HPS_SDR_CTRLCF
G_DRAMTIMING2_IF_TWR <<+			SDR_CTRLGRP_DRAMTIMING2_TWR_LSB)
		|+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR

<<+ SDR_CTRLGRP_DRAMTIMING2_TWTR_LSB),+ .dram_timing3
=+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP <<+
SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB) |+ (CONFIG_HPS_SD
R_CTRLCFG_DRAMTIMING3_TRAS <<+ SDR_CTRLGRP_DRAMTIMING3_
TRAS_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TR
C <<+ SDR_CTRLGRP_DRAMTIMING3_TRC_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<+ SDR_CTRLGRP_DRAM
TIMING3_TMRD_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTI
MING3_TCCD <<+ SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),+
.dram_timing4 =+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT
<<+ SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<+ SDR_CTRL
GRP_DRAMTIMING4_PWRDOWNEXIT_LSB),+ .lowpwr_timing =+ (CONFIG_HPS_SD
R_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<+ SDR_CTRLGRP_LOWP
WRTIMING_AUTOPDCYCLES_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWR
TIMING_CLKDISABLECYCLES <<+ SDR_CTRLGRP_LOWPWRTIMING_CLKDISA
BLECYCLES_LSB),+ .dram_odt =+ (CONFIG_HPS_SDR_CTRLCFG_DRAMOD
T_READ <<+ SDR_CTRLGRP_DRAMODT_READ_LSB)
|+ (CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<+ SDR_CT
RLGRP_DRAMODT_WRITE_LSB),+ .extratime1 =+ (CONFIG_HPS_SDR_CTRLCFG_EXTRAT
IME1_CFG_EXTRA_CTL_CLK_RD_TO_WR <<+ SDR_CTRLGRP_EXTRATIME1_R
D_TO_WR_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_C
TL_CLK_RD_TO_WR_BC <<+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_
BC_LSB) |+(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_R
D_TO_WR_DIFF_CHIP <<+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_DIFF_LSB
),+ .dram_addrw =+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<+
SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS <<+ SDR_CTRLGRP_DRAM
ADDRW_ROWBITS_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMAD
DRW_BANKBITS <<+ SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB)
|+ ((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<+
SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),+ .dram_if_width =+
(CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<+ SDR_CT
RLGRP_DRAMIFWIDTH_IFWIDTH_LSB),+ .dram_dev_width =+ (CONFI
G_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<+ SDR_CTRLGRP_DRAM
DEVWIDTH_DEVWIDTH_LSB),+ .dram_intr =+ (CONFIG_HPS_SDR_CTRLCF
G_DRAMINTR_INTREN <<+ SDR_CTRLGRP_DRAMINTR_INTREN_LSB),+
.lowpwr_eq =+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK <<+
SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),+ .static_cfg =+ (CONFI
G_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<+ SDR_CTRLGRP_STATICCFG_ME
MBL_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEE
CCASDATA <<+ SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),+ .ctrl_
width =+ (CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<+
SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),+ .cport_width =+ (CONFI
G_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<+ SDR_CTRLGRP_CPOR
TWIDTH_CMDPORTWIDTH_LSB),+ .cport_wmap =+ (CONFIG_HPS_SDR_CTRLCF
G_CPORTWMAP_CPORTWMAP <<+ SDR_CTRLGRP_CPORTWMAP_CPORTWFIFO
MAP_LSB),+ .cport_rmap =+ (CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPOR
TRMAP <<+ SDR_CTRLGRP_CPORTRMAP_CPORTRFIFOMAP_LSB),+
.rfifo_cmap =+ (CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<+
SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),+ .wfifo_cmap =+
(CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<+
SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),+ .cport_rdwr =+ (CONFI
G_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<+ SDR_CTRLGRP_CPOR
TRDWR_CPORTRDWR_LSB),+ .port_cfg =+ (CONFIG_HPS_SDR_CTRLCF
G_PORTCFG_AUTOPCHEN <<+ SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LS
B),+ .fpgaport_rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,+ .fifo_cfg =+
(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<+ SDR_CT
RLGRP_FIFOCFG_SYNCMODE_LSB) |+ (CONFIG_HPS_SDR_CTRLCF
G_FIFOCFG_INCSYNC <<+ SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),+
.mp_priority =+ (CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY
<<+ SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),+ .mp_we
ight0 =+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0
<<+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_0_LSB),+
.mp_weight1 =+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIG
HT_49_32 <<+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_
32_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<+
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB)
,+ .mp_weight2 =+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGH
T_45_14 <<+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_
14_LSB),+ .mp_weight3 =+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SU
MOFWEIGHT_63_46 <<+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEI
GHTS_63_46_LSB),+ .mp_pacing0 =+ (CONFIG_HPS_SDR_CTRLCFG_MPPACI
NG_0_THRESHOLD1_31_0 <<+ SDR_CTRLGRP_MPPACING_MPPACING_0_
THRESHOLD1_31_0_LSB),+ .mp_pacing1 =+ (CONFIG_HPS_SDR_CTRLCF
G_MPPACING_1_THRESHOLD1_59_32 <<+ SDR_CTRLGRP_MPPACING_MPP
ACING_1_THRESHOLD1_59_32_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING
_1_THRESHOLD2_3_0 <<+ SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOL
D2_3_0_LSB),+ .mp_pacing2 =+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THR
ESHOLD2_35_4 <<+ SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOL
D2_35_4_LSB),+ .mp_pacing3 =+ (CONFIG_HPS_SDR_CTRLCFG_MPPACI
NG_3_THRESHOLD2_59_36 <<+ SDR_CTRLGRP_MPPACING_MPPACING_3_
THRESHOLD2_59_36_LSB),+ .mp_threshold0 =+ (CONFIG_HPS_SDR_CTRLCF
G_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<+ SDR_CTRL
GRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),+ .mp_threshold1 =+
(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<+
SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),+ .mp_threshold2
=+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_6
4 <<+ SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LS
B),+ .phy_ctrl0 = CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,+};++static const
struct socfpga_sdram_rw_mgr_config rw_mgr_config = {+ .activate_0_and_1
= RW_MGR(ACTIVATE_0_AND_1),+ .activate_0_and_1_wait1 =
RW_MGR(ACTIVATE_0_AND_1_WAIT1),+ .activate_0_and_1_wait2 =
RW_MGR(ACTIVATE_0_AND_1_WAIT2),+ .activate_1 =
RW_MGR(ACTIVATE_1),+ .clear_dqs_enable = RW_MGR(CLEAR_DQS_ENABLE),+
.guaranteed_read = RW_MGR(GUARANTEED_READ),+ .guaranteed_re
ad_cont = RW_MGR(GUARANTEED_READ_CONT),+ .guaranteed_write

	= RW_MGR(GUARANTEED_WRITE),+	.guaranteed_write_wait0		=

RW_MGR(GUARANTEED_WRITE_WAIT0),+ .guaranteed_write_wait1 =
RW_MGR(GUARANTEED_WRITE_WAIT1),+ .guaranteed_write_wait2 =
RW_MGR(GUARANTEED_WRITE_WAIT2),+ .guaranteed_write_wait3 =
RW_MGR(GUARANTEED_WRITE_WAIT3),+ .idle =
RW_MGR(IDLE),+ .idle_loop1 = RW_MGR(IDLE_LOOP1),+

	.idle_loop2			= RW_MGR(IDLE_LOOP2),+	.init_reset_0_

cke_0 = RW_MGR(INIT_RESET_0_CKE_0),+ .init_reset_1_cke_0
= RW_MGR(INIT_RESET_1_CKE_0),+ .lfsr_wr_rd_bank_0 =
RW_MGR(LFSR_WR_RD_BANK_0),+ .lfsr_wr_rd_bank_0_data =
RW_MGR(LFSR_WR_RD_BANK_0_DATA),+ .lfsr_wr_rd_bank_0_dqs =
RW_MGR(LFSR_WR_RD_BANK_0_DQS),+ .lfsr_wr_rd_bank_0_nop =
RW_MGR(LFSR_WR_RD_BANK_0_NOP),+ .lfsr_wr_rd_bank_0_wait =
RW_MGR(LFSR_WR_RD_BANK_0_WAIT),+ .lfsr_wr_rd_bank_0_wl_1 =
RW_MGR(LFSR_WR_RD_BANK_0_WL_1),+ .lfsr_wr_rd_dm_bank_0 =
RW_MGR(LFSR_WR_RD_DM_BANK_0),+ .lfsr_wr_rd_dm_bank_0_data =
RW_MGR(LFSR_WR_RD_DM_BANK_0_DATA),+ .lfsr_wr_rd_dm_bank_0_dqs =
RW_MGR(LFSR_WR_RD_DM_BANK_0_DQS),+ .lfsr_wr_rd_dm_bank_0_nop =
RW_MGR(LFSR_WR_RD_DM_BANK_0_NOP),+ .lfsr_wr_rd_dm_bank_0_wait =
RW_MGR(LFSR_WR_RD_DM_BANK_0_WAIT),+ .lfsr_wr_rd_dm_bank_0_wl_1 =
RW_MGR(LFSR_WR_RD_DM_BANK_0_WL_1),+ .mrs0_dll_reset =
RW_MGR(MRS0_DLL_RESET),+ .mrs0_dll_reset_mirr =
RW_MGR(MRS0_DLL_RESET_MIRR),+ .mrs0_user =
RW_MGR(MRS0_USER),+ .mrs0_user_mirr =
RW_MGR(MRS0_USER_MIRR),+ .mrs1 =
RW_MGR(MRS1),+ .mrs1_mirr = RW_MGR(MRS1_MIRR),+
.mrs2 = RW_MGR(MRS2),+ .mrs2_mirr
= RW_MGR(MRS2_MIRR),+ .mrs3 = RW_MGR(MRS3),+
.mrs3_mirr = RW_MGR(MRS3_MIRR),+ .precharge_all

	= RW_MGR(PRECHARGE_ALL),+	.read_b2b			=

RW_MGR(READ_B2B),+ .read_b2b_wait1 =
RW_MGR(READ_B2B_WAIT1),+ .read_b2b_wait2 =
RW_MGR(READ_B2B_WAIT2),+ .refresh_all =
RW_MGR(REFRESH_ALL),+ .rreturn = RW_MGR(RETURN),+ .sgle_
read = RW_MGR(SGLE_READ),+ .zqcl
= RW_MGR(ZQCL),++ .true_mem_data_mask_width =
RW_MGR_TRUE_MEM_DATA_MASK_WIDTH,+ .mem_address_mirroring =
RW_MGR_MEM_ADDRESS_MIRRORING,+ .mem_data_mask_width =
RW_MGR_MEM_DATA_MASK_WIDTH,+ .mem_data_width =
RW_MGR_MEM_DATA_WIDTH,+ .mem_dq_per_read_dqs =
RW_MGR_MEM_DQ_PER_READ_DQS,+ .mem_dq_per_write_dqs =
RW_MGR_MEM_DQ_PER_WRITE_DQS,+ .mem_if_read_dqs_width =
RW_MGR_MEM_IF_READ_DQS_WIDTH,+ .mem_if_write_dqs_width =
RW_MGR_MEM_IF_WRITE_DQS_WIDTH,+ .mem_number_of_cs_per_dimm =
RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM,+ .mem_number_of_ranks =
RW_MGR_MEM_NUMBER_OF_RANKS,+ .mem_virtual_groups_per_read_dqs =+
RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS,+ .mem_virtual_groups_per_write_dq
s =+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS,+};++static const struct
socfpga_sdram_io_config io_config = {+ .delay_per_dchain_tap
= IO_DELAY_PER_DCHAIN_TAP,+ .delay_per_dqs_en_dchain_tap =
IO_DELAY_PER_DQS_EN_DCHAIN_TAP,+ .delay_per_opa_tap_lo =
IO_DELAY_PER_OPA_TAP & 0xff,+ .delay_per_opa_tap_hi =
(IO_DELAY_PER_OPA_TAP << 8) & 0xff,+ .dll_chain_length =
IO_DLL_CHAIN_LENGTH,+ .dqdqs_out_phase_max =
IO_DQDQS_OUT_PHASE_MAX,+ .dqs_en_delay_max =
IO_DQS_EN_DELAY_MAX,+ .dqs_en_delay_offset =
IO_DQS_EN_DELAY_OFFSET,+ .dqs_en_phase_max =
IO_DQS_EN_PHASE_MAX,+ .dqs_in_delay_max = IO_DQS_IN_DELAY_MAX,+ .dqs_i
n_reserve = IO_DQS_IN_RESERVE,+ .dqs_out_reserve

	= IO_DQS_OUT_RESERVE,+	.io_in_delay_max		=

IO_IO_IN_DELAY_MAX,+ .io_out1_delay_max =
IO_IO_OUT1_DELAY_MAX,+ .io_out2_delay_max =
IO_IO_OUT2_DELAY_MAX,+ .shift_dqs_en_when_shift_dqs =
IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS,+};++static const struct
socfpga_sdram_misc_config misc_config = {+ .afi_rate_ratio
= AFI_RATE_RATIO,+ .calib_lfifo_offset = CALIB_LFIFO_OFFSET,+
.calib_vfifo_offset = CALIB_VFIFO_OFFSET,+ .enable_super_
quick_calibration = ENABLE_SUPER_QUICK_CALIBRATION,+ .max_latency_c
ount_width = MAX_LATENCY_COUNT_WIDTH,+ .read_valid_fifo_size
= READ_VALID_FIFO_SIZE,+ .reg_file_init_seq_signature_ll =
REG_FILE_INIT_SEQ_SIGNATURE & 0xff,+ .reg_file_init_seq_signature_lh =
(REG_FILE_INIT_SEQ_SIGNATURE >> 8) & 0xff,+ .reg_file_init_seq_signature_hl
= (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,+ .reg_file_init_seq_signa
ture_hh = (REG_FILE_INIT_SEQ_SIGNATURE >> 24) & 0xff,+ .tinit_cntr0_v
al = TINIT_CNTR0_VAL,+ .tinit_cntr1_val =
TINIT_CNTR1_VAL,+ .tinit_cntr2_val = TINIT_CNTR2_VAL,+ .trese
t_cntr0_val = TRESET_CNTR0_VAL,+ .treset_cntr1_val
= TRESET_CNTR1_VAL,+ .treset_cntr2_val = TRESET_CNTR2_VAL,+};++static
void print_hdr(void)+{+ printf(handoff_dtsi_hdr);+}++static void
print_clkmgr_base(void)+{+ const char handoff_dtsi_clkmgr_base[] =+
"\n"+ "&osc1 {\n"+ " clock-frequency = <%d>;\n" /*
CONFIG_HPS_CLK_OSC1_HZ */+ "};\n"+ "\n"+ "&osc2
{\n"+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC2_HZ */+

	"};\n"+		"\n"+		"&f2s_periph_ref_clk {\n"+		

" clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_PER_REF_HZ */+
"};\n"+ "\n"+ "&f2s_sdram_ref_clk {\n"+
" clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_SDR_REF_HZ */+
"};\n";++ printf(handoff_dtsi_clkmgr_base, CONFIG_HPS_CLK_OSC1_HZ,+
CONFIG_HPS_CLK_OSC2_HZ, CONFIG_HPS_CLK_F2S_PER_REF_HZ,+ CONFIG_HP
S_CLK_F2S_SDR_REF_HZ);+}++/*+ * dtc stores u32 array big endian but we load them raw and expect them to be in+ * little endian format. To prevent this tool to depend on host endianess, do+ * the switch manually, not via 'htonl'.+
*/+static u32 swap_bytes(u32 val)+{+ return (val << 24) | ((val & 0xFF00ul)
<< 8) |+ ((val & 0xFF0000ul) >> 8) | (val >> 24);+}++static void
print_array_ulong(const unsigned long *arr, size_t arr_size,+
size_t el_per_line, const char *indent1,+ const
char *name, const char *indent_next)+{+ size_t i;++ printf("%s%s =
<", indent1, name);+ for (i = 0; i < arr_size; i++) {+ printf("0x%08x
", swap_bytes((u32)arr[i]));+ if (i + 1 < arr_size) {+
if (i % el_per_line == (el_per_line - 1)) {+ printf("
\n%s", indent_next);+ } else {+ printf
(" ");+ }+ }+ }+ printf(">;\n")
;+}++#ifdef USE_QUARTUS_OUTPUT+static void print_array_sysmgrinit(const
unsigned long *arr, size_t arr_size,+ const char
*indent1, const char *name,+ const char
*indent_next)+{+ size_t i;++ printf("%s%s = [", indent1, name);+
for (i = 0; i < arr_size; i++) {+ printf("%02x", (u8)arr[i]);+

	if (i + 1 < arr_size) {+			if (i % 8 == 7) {+		
		printf("\n%s", indent_next);+			} else {+	
			printf(" ");+			}+		}+	
}+	printf("];\n");+}+#define print_array_alt_u32

print_array_ulong+#else+#define print_array_sysmgrinit(arr, sz, ind1, n, ind2) print_array_u8(arr, sz, 8, ind1, n, ind2)+#define print_array_alt_u32 print_array_u32+#endif++static void print_array_u32(const u32 *arr, size_t
arr_size,+ size_t el_per_line, const char *indent1,+
const char *name, const char *indent_next)+{+ size_t i;++
printf("%s%s = <", indent1, name);+ for (i = 0; i < arr_size; i++) {+
printf("0x%08x", swap_bytes(arr[i]));+ if (i + 1 < arr_size) {+

			if (i % el_per_line == (el_per_line - 1)) {+		
		printf("\n%s", indent_next);+			} else {+	
			printf(" ");+			}+		}+	
}+	printf(">;\n");+}++static void print_array_u8(const u8 *arr, size_t

arr_size, size_t el_per_line,+ const char *indent1,
const char *name,+ const char *indent_next)+{+ size_t
i;++ printf("%s%s = [", indent1, name);+ for (i = 0; i < arr_size; i++)
{+ printf("%02x", arr[i]);+ if (i + 1 < arr_size) {+

		if (i % el_per_line == (el_per_line - 1)) {+			
	printf("\n%s", indent_next);+			} else {+		
		printf(" ");+			}+		}+	}+	

printf("];\n");+}+++static void print_clkmgr_cfg(void)+{+ const char
handoff_dtsi_clkmgr_cfg_a[] =+ "\n"+ "&clkmgr
{\n";+ const char handoff_dtsi_clkmgr_cfg_b[] = "};\n";+ const char
clk_mgr_cfg_indent[] = "\t\t\t ";++ printf(handoff_dtsi_clkmgr_cfg_a
);+ print_array_u32((const u32 *)&cm_default, sizeof(cm_default)/4, 4,
"\t",+ "altr,clk-mgr-cfg", clk_mgr_cfg_indent);+ printf
(handoff_dtsi_clkmgr_cfg_b);+}++static void print_sysmgr(void)+{+ const
char handoff_dtsi_sysmgr_begin[] =+ "\n"+ "&sysmgr
{\n";+ const char handoff_dtsi_sysmgr_end[] = "};\n";+ const char
sysmgr_cfg_indent[] = "\t\t\t\t\t";+ size_t i;++ printf(handoff_dtsi_sy
smgr_begin);++ /* sys_mgr_init_table is an u8 table */+ print_array_sy
smgrinit(sys_mgr_init_table, ARRAY_SIZE(sys_mgr_init_table),+

       "\t", "altr,pinmux-cfg","\t\t\t   ");+	/* ioscr scan chain table 0

*/+ print_array_ulong(iocsr_scan_chain0_table,+ ARRA
Y_SIZE(iocsr_scan_chain0_table), 4,+ "\t", "altr,iocsr-
scan-chain0-table",+ sysmgr_cfg_indent);+ /* ioscr scan
chain table 0 */+ print_array_ulong(iocsr_scan_chain1_table,+

	  ARRAY_SIZE(iocsr_scan_chain1_table), 4,+			  "\t"
, "altr,iocsr-scan-chain1-table",+			  sysmgr_cfg_indent);+	
/* ioscr scan chain table 0 */+	print_array_ulong(iocsr_scan_chain2_tabl
e,+			  ARRAY_SIZE(iocsr_scan_chain2_table), 4,+		
	  "\t", "altr,iocsr-scan-chain2-table",+			  sysmgr_cfg_i
ndent);+	/* ioscr scan chain table 0 */+	print_array_ulong(iocsr_scan_c
hain3_table,+			  ARRAY_SIZE(iocsr_scan_chain3_table), 4,+	
		  "\t", "altr,iocsr-scan-chain3-table",+			  sysm
gr_cfg_indent);+	printf(handoff_dtsi_sysmgr_end);+}++static void
print_sdram_cfg(void)+{+	const char handoff_dtsi_sdram_cfg_begin[] =+	
	"\n"+		"&sdr {\n";+	const char

handoff_dtsi_sdram_cfg_end[] = "};\n";++ printf(handoff_dtsi_sdram_cfg_be
gin);+ print_array_u32((const u32 *)&sdram_config,
sizeof(sdram_config)/4, 4,+ "\t", "altr,sdr-cfg",
"\t\t\t");+ print_array_u8((const u8 *)&rw_mgr_config,
sizeof(rw_mgr_config), 8,+ "\t", "altr,sdr-rw-mgr-cfg",
"\t\t\t ");+ print_array_u8((const u8 *)&io_config,
sizeof(io_config), 8,+ "\t", "altr,sdr-io-cfg",
"\t\t\t ");+ print_array_u8((const u8 *)&misc_config,
sizeof(misc_config), 8,+ "\t", "altr,sdr-misc-cfg",
"\t\t\t ");+ print_array_alt_u32(ac_rom_init,
ARRAY_SIZE(ac_rom_init), 4,+ "\t", "altr,sdr-ac-rom-init",
"\t\t\t\t");+ print_array_alt_u32(inst_rom_init, ARRAY_SIZE(inst_rom_init),
4,+ "\t", "altr,sdr-inst-rom-init", "\t\t\t\t ");+ printf
(handoff_dtsi_sdram_cfg_end);+}++int main(void)+{+ print_hdr();+ print_
clkmgr_base();+ print_clkmgr_cfg();+ print_sysmgr();+ print_
sdram_cfg();+}diff --git a/arch/arm/mach-socfpga/qts-to-handoff.sh b/arch/arm/mach-socfpga/qts-to-handoff.shnew file mode 100755index 0000000000..b9032a5411--- /dev/null+++ b/arch/arm/mach-socfpga/qts-to- handoff.sh@@ -0,0 +1,83 @@+#!/bin/sh+# This script converts Quartus handoff files (in Quartus or U-Boot format)+# to a handoff.dtsi file.+++usage() {+
MY_BASENAME=basename $0+ echo "${MY_BASENAME} [soc_type]
[input_qts_dir] [input_bsp_dir] [output_file]"+ echo " or"+ echo
"${MY_BASENAME} 'u-boot' [uboot_qts_dir] [output_file]"+ echo ""+ echo
"Process QTS-generated headers into handoff.dtsi:"+ echo ""+ echo
" soc_type - Type of SoC, either 'cyclone5' or 'arria5'."+ echo
" input_qts_dir - Directory with compiled Quartus project"+ echo
" and containing the Quartus project file (QPF)."+ echo
" input_bsp_dir - Directory with generated bsp containing"+ echo
" the settings.bsp file."+ echo " output_file - Full
filename to store the handoff dtsi file."+ echo " uboot_qts_dir -
board/qts directory if input files are in"+ echo " 'old-
style' U-Boot format."+ echo ""+}++soc="$1"++HANDOFF_TEMPLATE="`dirname
$0`/create_handoff_gen5.c"++case "$soc" in+"cyclone5"|"arria5")+ if [
"$#" -ne 4 ] ; then+ usage+ exit 1+ fi+ in_qts_dir="$2
"+ in_bsp_dir="$3"+ output_file="$4"+ out_dir=`dirname
${output_file}`++ if [ ! -d "${in_qts_dir}" -o ! -d "${in_bsp_dir}" -o \+

	! -d "${out_dir}" -o -z "${soc}" ] ; then+		usage+		

exit 3+ fi++ if [ "$soc" = "cyclone5" ] ; then+ CMDLIN
E_DEFINES="-DCYCLONE5"+ else+ CMDLINE_DEFINES="-DARRIA5"+
fi+ CMDLINE_DEFINES="${CMDLINE_DEFINES} -DUSE_QUARTUS_OUTPUT
-I${in_bsp_dir}/generated/"+ for d in ${in_qts_dir}/hps_isw_handoff/*/ ; do+

	CMDLINE_DEFINES="${CMDLINE_DEFINES} -I$d"+	done+	;;+"u-boot")+	

if [ "$#" -ne 3 ] ; then+ usage+ exit 1+ fi+ in_qts
_dir="$2"+ output_file="$3"+ out_dir=dirname ${output_file}++ if [ !
-d "${in_qts_dir}" -o ! -d "${out_dir}" ] ; then+ usage+
exit 3+ fi++ CMDLINE_DEFINES="-I${in_qts_dir}"+ ;;+*)+ usage+

	exit 1+	;;+esac++# compile+gcc ${CMDLINE_DEFINES} ${HANDOFF_TEMPLATE}

-o ${out_dir}/create_handoff_gen5+${out_dir}/create_handoff_gen5 > ${output_file}++# TODO: remove tmp file:+#rm $${out_dir}/create_handoff_gen5

#10 lore raw

RFC PATCH v2 8/18 socfpga: gen5: add new tool to create handoff dtsi files

Dalon L Westergreen <[email protected]> schrieb am Di., 22. Okt. 2019, 19:10:

Quoted 5 lines

I mentioned this before, it would be great to not rely on the generated files
and do this based purely on the handoff data generated during a quartus build. Did you look at the python source i pointed you to?

No, not yet. But I don't think that will be a problem. I sent this series mainly to discuss the dts format (boardspecific handoff dtsi vs genetic dtsi plus boardspecific header file).

I still favor boardspecific handoff dtsi, but I would like to use the same style for all socfpga flavours.

Plus this tool is required to convert existing boards where we don't have the quartus project files at hand.

Regards,
Simon

Quoted 1,550 lines

--dalon

On Tue, 2019-10-15 at 22:10 +0200, Simon Goldschmidt wrote:

This new tool converts handoff information from quartus to "*_handoff.dtsi"

devicetree files. This is in preparation to move from ad-hoc code in arch

that parses the 'qts' header files to drivers parsing the same information

from devicetree.

Converting existing U-Boot 'qts' files is also supported.

Signed-off-by Simon Goldschmidt <

simon.k.r.goldschmidt at gmail.com

Quoted 1 line

---

Changes in v2: None

 arch/arm/mach-socfpga/create_handoff_gen5.c | 660 ++++++++++++++++++++
 arch/arm/mach-socfpga/qts-to-handoff.sh     |  83 +++
 2 files changed, 743 insertions(+)
 create mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c
 create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh
arch/arm/mach-socfpga/create_handoff_gen5.c +0 -0

new file mode 100644

index 0000000000..6ec436719d

--- /dev/null

+++ b/arch/arm/mach-socfpga/create_handoff_gen5.c

arch/arm/mach-socfpga/create_handoff_gen5.c +660 -0
@@ -0,0 +1,660 @@
 
+// SPDX-License-Identifier: GPL-2.0
 
+/*
 
+ * This is a host-tool that needs to be compiled per board and prints the
 
+ * handoff.dtsi to stdout.
 
+ */
 
+
 
+#include <stdio.h>
 
+#include <stdint.h>
 
+
 
+/* Define kernel types */
 
+typedef uint8_t u8;
 
+typedef uint32_t u32;
 
+
 
+#ifdef USE_QUARTUS_OUTPUT
 
+#ifdef ARRIA5
 
+#include "iocsr_config_arria5.c"
 
+#include "pinmux_config_arria5.c"
 
+#else
 
+#include "iocsr_config_cyclone5.c"
 
+#include "pinmux_config_cyclone5.c"
 
+#endif
 
+#include "pll_config.h"
 
+#include "sdram/sdram_config.h"
 
+#include "sequencer_auto.h"
 
+#include "sequencer_defines.h"
 
+#include "sequencer_auto_ac_init.c"
 
+#include "sequencer_auto_inst_init.c"
 
+#define RW_MGR(x) __RW_MGR_##x
 
+#else
 
+#define RW_MGR(x) RW_MGR_##x
 
+#include <iocsr_config.h>
 
+#include <pinmux_config.h>
 
+#include <pll_config.h>
 
+#include <sdram_config.h>
 
+#endif
 
+
 
+#include "include/mach/clock_manager_gen5.h"
 
+#include "include/mach/sdram_gen5.h"
 
+
 
+#ifndef ARRAY_SIZE
 
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 
+#endif
 
+
 
+const char handoff_dtsi_hdr[] =
 
+	"// SPDX-License-Identifier: GPL-2.0\n"
 
+	"/*\n"
 
+	" *<auto-generated>\n"
 
+	" *	This code was generated by a tool based on\n"
 
+	" *	handoffs from both Qsys and Quartus.\n"
 
+	" *\n"
 
+	" *	Changes to this file may be lost if\n"
 
+	" *	the code is regenerated.\n"
 
+	" *</auto-generated>\n"
 
+	" */\n";
 
+
 
+/* Wrap PLL config */
 
+
 
+#define MAIN_VCO_BASE (					\
 
+	(CONFIG_HPS_MAINPLLGRP_VCO_DENOM <<		\
 
+		CLKMGR_MAINPLLGRP_VCO_DENOM_OFFSET) |	\
 
+	(CONFIG_HPS_MAINPLLGRP_VCO_NUMER <<		\
 
+		CLKMGR_MAINPLLGRP_VCO_NUMER_OFFSET)	\
 
+	)
 
+
 
+#define PERI_VCO_BASE (					\
 
+	(CONFIG_HPS_PERPLLGRP_VCO_PSRC <<		\
 
+		CLKMGR_PERPLLGRP_VCO_PSRC_OFFSET) |	\
 
+	(CONFIG_HPS_PERPLLGRP_VCO_DENOM <<		\
 
+		CLKMGR_PERPLLGRP_VCO_DENOM_OFFSET) |	\
 
+	(CONFIG_HPS_PERPLLGRP_VCO_NUMER <<		\
 
+		CLKMGR_PERPLLGRP_VCO_NUMER_OFFSET)	\
 
+	)
 
+
 
+#define SDR_VCO_BASE (					\
 
+	(CONFIG_HPS_SDRPLLGRP_VCO_SSRC <<		\
 
+		CLKMGR_SDRPLLGRP_VCO_SSRC_OFFSET) |	\
 
+	(CONFIG_HPS_SDRPLLGRP_VCO_DENOM <<		\
 
+		CLKMGR_SDRPLLGRP_VCO_DENOM_OFFSET) |	\
 
+	(CONFIG_HPS_SDRPLLGRP_VCO_NUMER <<		\
 
+		CLKMGR_SDRPLLGRP_VCO_NUMER_OFFSET)	\
 
+	)
 
+
 
+static const struct cm_config cm_default = {
 
+	/* main group */
 
+	MAIN_VCO_BASE,
 
+	(CONFIG_HPS_MAINPLLGRP_MPUCLK_CNT <<
 
+		CLKMGR_MAINPLLGRP_MPUCLK_CNT_OFFSET),
 
+	(CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT <<
 
+		CLKMGR_MAINPLLGRP_MAINCLK_CNT_OFFSET),
 
+	(CONFIG_HPS_MAINPLLGRP_DBGATCLK_CNT <<
 
+		CLKMGR_MAINPLLGRP_DBGATCLK_CNT_OFFSET),
 
+	(CONFIG_HPS_MAINPLLGRP_MAINQSPICLK_CNT <<
 
+		CLKMGR_MAINPLLGRP_MAINQSPICLK_CNT_OFFSET),
 
+	(CONFIG_HPS_MAINPLLGRP_MAINNANDSDMMCCLK_CNT <<
 
+		CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
 
+	(CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CNT <<
 
+		CLKMGR_MAINPLLGRP_CFGS2FUSER0CLK_CNT_OFFSET),
 
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L3MPCLK <<
 
+		CLKMGR_MAINPLLGRP_MAINDIV_L3MPCLK_OFFSET) |
 
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK <<
 
+		CLKMGR_MAINPLLGRP_MAINDIV_L3SPCLK_OFFSET) |
 
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L4MPCLK <<
 
+		CLKMGR_MAINPLLGRP_MAINDIV_L4MPCLK_OFFSET) |
 
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L4SPCLK <<
 
+		CLKMGR_MAINPLLGRP_MAINDIV_L4SPCLK_OFFSET),
 
+	(CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGATCLK <<
 
+		CLKMGR_MAINPLLGRP_DBGDIV_DBGATCLK_OFFSET) |
 
+	(CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGCLK <<
 
+		CLKMGR_MAINPLLGRP_DBGDIV_DBGCLK_OFFSET),
 
+	(CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK <<
 
+		CLKMGR_MAINPLLGRP_TRACEDIV_TRACECLK_OFFSET),
 
+	(CONFIG_HPS_MAINPLLGRP_L4SRC_L4MP <<
 
+		CLKMGR_MAINPLLGRP_L4SRC_L4MP_OFFSET) |
 
+	(CONFIG_HPS_MAINPLLGRP_L4SRC_L4SP <<
 
+		CLKMGR_MAINPLLGRP_L4SRC_L4SP_OFFSET),
 
+
 
+	/* peripheral group */
 
+	PERI_VCO_BASE,
 
+	(CONFIG_HPS_PERPLLGRP_EMAC0CLK_CNT <<
 
+		CLKMGR_PERPLLGRP_EMAC0CLK_CNT_OFFSET),
 
+	(CONFIG_HPS_PERPLLGRP_EMAC1CLK_CNT <<
 
+		CLKMGR_PERPLLGRP_EMAC1CLK_CNT_OFFSET),
 
+	(CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT <<
 
+		CLKMGR_PERPLLGRP_PERQSPICLK_CNT_OFFSET),
 
+	(CONFIG_HPS_PERPLLGRP_PERNANDSDMMCCLK_CNT <<
 
+		CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
 
+	(CONFIG_HPS_PERPLLGRP_PERBASECLK_CNT <<
 
+		CLKMGR_PERPLLGRP_PERBASECLK_CNT_OFFSET),
 
+	(CONFIG_HPS_PERPLLGRP_S2FUSER1CLK_CNT <<
 
+		CLKMGR_PERPLLGRP_S2FUSER1CLK_CNT_OFFSET),
 
+	(CONFIG_HPS_PERPLLGRP_DIV_USBCLK <<
 
+		CLKMGR_PERPLLGRP_DIV_USBCLK_OFFSET) |
 
+	(CONFIG_HPS_PERPLLGRP_DIV_SPIMCLK <<
 
+		CLKMGR_PERPLLGRP_DIV_SPIMCLK_OFFSET) |
 
+	(CONFIG_HPS_PERPLLGRP_DIV_CAN0CLK <<
 
+		CLKMGR_PERPLLGRP_DIV_CAN0CLK_OFFSET) |
 
+	(CONFIG_HPS_PERPLLGRP_DIV_CAN1CLK <<
 
+		CLKMGR_PERPLLGRP_DIV_CAN1CLK_OFFSET),
 
+	(CONFIG_HPS_PERPLLGRP_GPIODIV_GPIODBCLK <<
 
+		CLKMGR_PERPLLGRP_GPIODIV_GPIODBCLK_OFFSET),
 
+	(CONFIG_HPS_PERPLLGRP_SRC_QSPI <<
 
+		CLKMGR_PERPLLGRP_SRC_QSPI_OFFSET) |
 
+	(CONFIG_HPS_PERPLLGRP_SRC_NAND <<
 
+		CLKMGR_PERPLLGRP_SRC_NAND_OFFSET) |
 
+	(CONFIG_HPS_PERPLLGRP_SRC_SDMMC <<
 
+		CLKMGR_PERPLLGRP_SRC_SDMMC_OFFSET),
 
+
 
+	/* sdram pll group */
 
+	SDR_VCO_BASE,
 
+	(CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_PHASE <<
 
+		CLKMGR_SDRPLLGRP_DDRDQSCLK_PHASE_OFFSET) |
 
+	(CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_CNT <<
 
+		CLKMGR_SDRPLLGRP_DDRDQSCLK_CNT_OFFSET),
 
+	(CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_PHASE <<
 
+		CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_OFFSET) |
 
+	(CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT <<
 
+		CLKMGR_SDRPLLGRP_DDR2XDQSCLK_CNT_OFFSET),
 
+	(CONFIG_HPS_SDRPLLGRP_DDRDQCLK_PHASE <<
 
+		CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_OFFSET) |
 
+	(CONFIG_HPS_SDRPLLGRP_DDRDQCLK_CNT <<
 
+		CLKMGR_SDRPLLGRP_DDRDQCLK_CNT_OFFSET),
 
+	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_PHASE <<
 
+		CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
 
+	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
 
+		CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
 
+
 
+	/* altera group */
 
+	CONFIG_HPS_ALTERAGRP_MPUCLK,
 
+};
 
+
 
+/* Wrap SDRAM config */
 
+static const struct socfpga_sdram_config sdram_config = {
 
+	.ctrl_cfg =
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<
 
+			SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<
 
+			SDR_CTRLGRP_CTRLCFG_MEMBL_LSB)			|
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<
 
+			SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN <<
 
+			SDR_CTRLGRP_CTRLCFG_ECCEN_LSB)			|
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN <<
 
+			SDR_CTRLGRP_CTRLCFG_ECCCORREN_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN <<
 
+			SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<
 
+			SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<
 
+			SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<
 
+			SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),
 
+	.dram_timing1 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<
 
+			SDR_CTRLGRP_DRAMTIMING1_TCWL_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL <<
 
+			SDR_CTRLGRP_DRAMTIMING1_TAL_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL <<
 
+			SDR_CTRLGRP_DRAMTIMING1_TCL_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<
 
+			SDR_CTRLGRP_DRAMTIMING1_TRRD_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW <<
 
+			SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<
 
+			SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),
 
+	.dram_timing2 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI <<
 
+			SDR_CTRLGRP_DRAMTIMING2_TREFI_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRCD <<
 
+			SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP <<
 
+			SDR_CTRLGRP_DRAMTIMING2_TRP_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<
 
+			SDR_CTRLGRP_DRAMTIMING2_TWR_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR <<
 
+			SDR_CTRLGRP_DRAMTIMING2_TWTR_LSB),
 
+	.dram_timing3 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP <<
 
+			SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS <<
 
+			SDR_CTRLGRP_DRAMTIMING3_TRAS_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC <<
 
+			SDR_CTRLGRP_DRAMTIMING3_TRC_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<
 
+			SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<
 
+			SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),
 
+	.dram_timing4 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<
 
+			SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB)	|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<
 
+			SDR_CTRLGRP_DRAMTIMING4_PWRDOWNEXIT_LSB),
 
+	.lowpwr_timing =
 
+		(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<
 
+			SDR_CTRLGRP_LOWPWRTIMING_AUTOPDCYCLES_LSB)	|
 
+		(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<
 
+			SDR_CTRLGRP_LOWPWRTIMING_CLKDISABLECYCLES_LSB),
 
+	.dram_odt =
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ <<
 
+			SDR_CTRLGRP_DRAMODT_READ_LSB)			|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<
 
+			SDR_CTRLGRP_DRAMODT_WRITE_LSB),
 
+	.extratime1 =
 
+	(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR <<
 
+			SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_LSB)		|
 
+	(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_BC <<
 
+			SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_BC_LSB)		|
 
+(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_DIFF_CHIP <<
 
+			SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_DIFF_LSB),
 
+	.dram_addrw =
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<
 
+			SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS <<
 
+			SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS <<
 
+			SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB)		|
 
+		((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<
 
+			SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),
 
+	.dram_if_width =
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<
 
+			SDR_CTRLGRP_DRAMIFWIDTH_IFWIDTH_LSB),
 
+	.dram_dev_width =
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<
 
+			SDR_CTRLGRP_DRAMDEVWIDTH_DEVWIDTH_LSB),
 
+	.dram_intr =
 
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN <<
 
+			SDR_CTRLGRP_DRAMINTR_INTREN_LSB),
 
+	.lowpwr_eq =
 
+		(CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK <<
 
+			SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),
 
+	.static_cfg =
 
+		(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<
 
+			SDR_CTRLGRP_STATICCFG_MEMBL_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<
 
+			SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),
 
+	.ctrl_width =
 
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<
 
+			SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),
 
+	.cport_width =
 
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<
 
+			SDR_CTRLGRP_CPORTWIDTH_CMDPORTWIDTH_LSB),
 
+	.cport_wmap =
 
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP <<
 
+			SDR_CTRLGRP_CPORTWMAP_CPORTWFIFOMAP_LSB),
 
+	.cport_rmap =
 
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP <<
 
+			SDR_CTRLGRP_CPORTRMAP_CPORTRFIFOMAP_LSB),
 
+	.rfifo_cmap =
 
+		(CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<
 
+			SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),
 
+	.wfifo_cmap =
 
+		(CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<
 
+			SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),
 
+	.cport_rdwr =
 
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<
 
+			SDR_CTRLGRP_CPORTRDWR_CPORTRDWR_LSB),
 
+	.port_cfg =
 
+		(CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN <<
 
+			SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LSB),
 
+	.fpgaport_rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,
 
+	.fifo_cfg =
 
+		(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<
 
+			SDR_CTRLGRP_FIFOCFG_SYNCMODE_LSB)		|
 
+		(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_INCSYNC <<
 
+			SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),
 
+	.mp_priority =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY <<
 
+			SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),
 
+	.mp_weight0 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0 <<
 
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_0_LSB),
 
+	.mp_weight1 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 <<
 
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_32_LSB) |
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<
 
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB),
 
+	.mp_weight2 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 <<
 
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_14_LSB),
 
+	.mp_weight3 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<
 
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),
 
+	.mp_pacing0 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<
 
+			SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),
 
+	.mp_pacing1 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59_32 <<
 
+			SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD1_59_32_LSB) |
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 <<
 
+			SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD2_3_0_LSB),
 
+	.mp_pacing2 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 <<
 
+			SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOLD2_35_4_LSB),
 
+	.mp_pacing3 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<
 
+			SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),
 
+	.mp_threshold0 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<
 
+			SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),
 
+	.mp_threshold1 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<
 
+			SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),
 
+	.mp_threshold2 =
 
+		(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 <<
 
+			SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LSB),
 
+	.phy_ctrl0 = CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,
 
+};
 
+
 
+static const struct socfpga_sdram_rw_mgr_config rw_mgr_config = {
 
+	.activate_0_and_1		= RW_MGR(ACTIVATE_0_AND_1),
 
+	.activate_0_and_1_wait1		= RW_MGR(ACTIVATE_0_AND_1_WAIT1),
 
+	.activate_0_and_1_wait2		= RW_MGR(ACTIVATE_0_AND_1_WAIT2),
 
+	.activate_1			= RW_MGR(ACTIVATE_1),
 
+	.clear_dqs_enable		= RW_MGR(CLEAR_DQS_ENABLE),
 
+	.guaranteed_read		= RW_MGR(GUARANTEED_READ),
 
+	.guaranteed_read_cont		= RW_MGR(GUARANTEED_READ_CONT),
 
+	.guaranteed_write		= RW_MGR(GUARANTEED_WRITE),
 
+	.guaranteed_write_wait0		= RW_MGR(GUARANTEED_WRITE_WAIT0),
 
+	.guaranteed_write_wait1		= RW_MGR(GUARANTEED_WRITE_WAIT1),
 
+	.guaranteed_write_wait2		= RW_MGR(GUARANTEED_WRITE_WAIT2),
 
+	.guaranteed_write_wait3		= RW_MGR(GUARANTEED_WRITE_WAIT3),
 
+	.idle				= RW_MGR(IDLE),
 
+	.idle_loop1			= RW_MGR(IDLE_LOOP1),
 
+	.idle_loop2			= RW_MGR(IDLE_LOOP2),
 
+	.init_reset_0_cke_0		= RW_MGR(INIT_RESET_0_CKE_0),
 
+	.init_reset_1_cke_0		= RW_MGR(INIT_RESET_1_CKE_0),
 
+	.lfsr_wr_rd_bank_0		= RW_MGR(LFSR_WR_RD_BANK_0),
 
+	.lfsr_wr_rd_bank_0_data		= RW_MGR(LFSR_WR_RD_BANK_0_DATA),
 
+	.lfsr_wr_rd_bank_0_dqs		= RW_MGR(LFSR_WR_RD_BANK_0_DQS),
 
+	.lfsr_wr_rd_bank_0_nop		= RW_MGR(LFSR_WR_RD_BANK_0_NOP),
 
+	.lfsr_wr_rd_bank_0_wait		= RW_MGR(LFSR_WR_RD_BANK_0_WAIT),
 
+	.lfsr_wr_rd_bank_0_wl_1		= RW_MGR(LFSR_WR_RD_BANK_0_WL_1),
 
+	.lfsr_wr_rd_dm_bank_0		= RW_MGR(LFSR_WR_RD_DM_BANK_0),
 
+	.lfsr_wr_rd_dm_bank_0_data	= RW_MGR(LFSR_WR_RD_DM_BANK_0_DATA),
 
+	.lfsr_wr_rd_dm_bank_0_dqs	= RW_MGR(LFSR_WR_RD_DM_BANK_0_DQS),
 
+	.lfsr_wr_rd_dm_bank_0_nop	= RW_MGR(LFSR_WR_RD_DM_BANK_0_NOP),
 
+	.lfsr_wr_rd_dm_bank_0_wait	= RW_MGR(LFSR_WR_RD_DM_BANK_0_WAIT),
 
+	.lfsr_wr_rd_dm_bank_0_wl_1	= RW_MGR(LFSR_WR_RD_DM_BANK_0_WL_1),
 
+	.mrs0_dll_reset			= RW_MGR(MRS0_DLL_RESET),
 
+	.mrs0_dll_reset_mirr		= RW_MGR(MRS0_DLL_RESET_MIRR),
 
+	.mrs0_user			= RW_MGR(MRS0_USER),
 
+	.mrs0_user_mirr			= RW_MGR(MRS0_USER_MIRR),
 
+	.mrs1				= RW_MGR(MRS1),
 
+	.mrs1_mirr			= RW_MGR(MRS1_MIRR),
 
+	.mrs2				= RW_MGR(MRS2),
 
+	.mrs2_mirr			= RW_MGR(MRS2_MIRR),
 
+	.mrs3				= RW_MGR(MRS3),
 
+	.mrs3_mirr			= RW_MGR(MRS3_MIRR),
 
+	.precharge_all			= RW_MGR(PRECHARGE_ALL),
 
+	.read_b2b			= RW_MGR(READ_B2B),
 
+	.read_b2b_wait1			= RW_MGR(READ_B2B_WAIT1),
 
+	.read_b2b_wait2			= RW_MGR(READ_B2B_WAIT2),
 
+	.refresh_all			= RW_MGR(REFRESH_ALL),
 
+	.rreturn			= RW_MGR(RETURN),
 
+	.sgle_read			= RW_MGR(SGLE_READ),
 
+	.zqcl				= RW_MGR(ZQCL),
 
+
 
+	.true_mem_data_mask_width	= RW_MGR_TRUE_MEM_DATA_MASK_WIDTH,
 
+	.mem_address_mirroring		= RW_MGR_MEM_ADDRESS_MIRRORING,
 
+	.mem_data_mask_width		= RW_MGR_MEM_DATA_MASK_WIDTH,
 
+	.mem_data_width			= RW_MGR_MEM_DATA_WIDTH,
 
+	.mem_dq_per_read_dqs		= RW_MGR_MEM_DQ_PER_READ_DQS,
 
+	.mem_dq_per_write_dqs		= RW_MGR_MEM_DQ_PER_WRITE_DQS,
 
+	.mem_if_read_dqs_width		= RW_MGR_MEM_IF_READ_DQS_WIDTH,
 
+	.mem_if_write_dqs_width		= RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
 
+	.mem_number_of_cs_per_dimm	= RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM,
 
+	.mem_number_of_ranks		= RW_MGR_MEM_NUMBER_OF_RANKS,
 
+	.mem_virtual_groups_per_read_dqs =
 
+		RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS,
 
+	.mem_virtual_groups_per_write_dqs =
 
+		RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS,
 
+};
 
+
 
+static const struct socfpga_sdram_io_config io_config = {
 
+	.delay_per_dchain_tap		= IO_DELAY_PER_DCHAIN_TAP,
 
+	.delay_per_dqs_en_dchain_tap	= IO_DELAY_PER_DQS_EN_DCHAIN_TAP,
 
+	.delay_per_opa_tap_lo		= IO_DELAY_PER_OPA_TAP & 0xff,
 
+	.delay_per_opa_tap_hi		= (IO_DELAY_PER_OPA_TAP << 8) & 0xff,
 
+	.dll_chain_length		= IO_DLL_CHAIN_LENGTH,
 
+	.dqdqs_out_phase_max		= IO_DQDQS_OUT_PHASE_MAX,
 
+	.dqs_en_delay_max		= IO_DQS_EN_DELAY_MAX,
 
+	.dqs_en_delay_offset		= IO_DQS_EN_DELAY_OFFSET,
 
+	.dqs_en_phase_max		= IO_DQS_EN_PHASE_MAX,
 
+	.dqs_in_delay_max		= IO_DQS_IN_DELAY_MAX,
 
+	.dqs_in_reserve			= IO_DQS_IN_RESERVE,
 
+	.dqs_out_reserve		= IO_DQS_OUT_RESERVE,
 
+	.io_in_delay_max		= IO_IO_IN_DELAY_MAX,
 
+	.io_out1_delay_max		= IO_IO_OUT1_DELAY_MAX,
 
+	.io_out2_delay_max		= IO_IO_OUT2_DELAY_MAX,
 
+	.shift_dqs_en_when_shift_dqs	= IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS,
 
+};
 
+
 
+static const struct socfpga_sdram_misc_config misc_config = {
 
+	.afi_rate_ratio			= AFI_RATE_RATIO,
 
+	.calib_lfifo_offset		= CALIB_LFIFO_OFFSET,
 
+	.calib_vfifo_offset		= CALIB_VFIFO_OFFSET,
 
+	.enable_super_quick_calibration	= ENABLE_SUPER_QUICK_CALIBRATION,
 
+	.max_latency_count_width	= MAX_LATENCY_COUNT_WIDTH,
 
+	.read_valid_fifo_size		= READ_VALID_FIFO_SIZE,
 
+	.reg_file_init_seq_signature_ll	= REG_FILE_INIT_SEQ_SIGNATURE & 0xff,
 
+	.reg_file_init_seq_signature_lh	= (REG_FILE_INIT_SEQ_SIGNATURE >> 8) & 0xff,
 
+	.reg_file_init_seq_signature_hl	= (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,
 
+	.reg_file_init_seq_signature_hh	= (REG_FILE_INIT_SEQ_SIGNATURE >> 24) & 0xff,
 
+	.tinit_cntr0_val		= TINIT_CNTR0_VAL,
 
+	.tinit_cntr1_val		= TINIT_CNTR1_VAL,
 
+	.tinit_cntr2_val		= TINIT_CNTR2_VAL,
 
+	.treset_cntr0_val		= TRESET_CNTR0_VAL,
 
+	.treset_cntr1_val		= TRESET_CNTR1_VAL,
 
+	.treset_cntr2_val		= TRESET_CNTR2_VAL,
 
+};
 
+
 
+static void print_hdr(void)
 
+{
 
+	printf(handoff_dtsi_hdr);
 
+}
 
+
 
+static void print_clkmgr_base(void)
 
+{
 
+	const char handoff_dtsi_clkmgr_base[] =
 
+		"\n"
 
+		"&osc1 {\n"
 
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC1_HZ */
 
+		"};\n"
 
+		"\n"
 
+		"&osc2 {\n"
 
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC2_HZ */
 
+		"};\n"
 
+		"\n"
 
+		"&f2s_periph_ref_clk {\n"
 
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_PER_REF_HZ */
 
+		"};\n"
 
+		"\n"
 
+		"&f2s_sdram_ref_clk {\n"
 
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_SDR_REF_HZ */
 
+		"};\n";
 
+
 
+	printf(handoff_dtsi_clkmgr_base, CONFIG_HPS_CLK_OSC1_HZ,
 
+	       CONFIG_HPS_CLK_OSC2_HZ, CONFIG_HPS_CLK_F2S_PER_REF_HZ,
 
+	       CONFIG_HPS_CLK_F2S_SDR_REF_HZ);
 
+}
 
+
 
+/*
 
+ * dtc stores u32 array big endian but we load them raw and expect them to be in
 
+ * little endian format. To prevent this tool to depend on host endianess, do
 
+ * the switch manually, not via 'htonl'.
 
+ */
 
+static u32 swap_bytes(u32 val)
 
+{
 
+	return (val << 24) | ((val & 0xFF00ul) << 8) |
 
+		((val & 0xFF0000ul) >> 8) | (val >> 24);
 
+}
 
+
 
+static void print_array_ulong(const unsigned long *arr, size_t arr_size,
 
+			      size_t el_per_line, const char *indent1,
 
+			      const char *name, const char *indent_next)
 
+{
 
+	size_t i;
 
+
 
+	printf("%s%s = <", indent1, name);
 
+	for (i = 0; i < arr_size; i++) {
 
+		printf("0x%08x", swap_bytes((u32)arr[i]));
 
+		if (i + 1 < arr_size) {
 
+			if (i % el_per_line == (el_per_line - 1)) {
 
+				printf("\n%s", indent_next);
 
+			} else {
 
+				printf(" ");
 
+			}
 
+		}
 
+	}
 
+	printf(">;\n");
 
+}
 
+
 
+#ifdef USE_QUARTUS_OUTPUT
 
+static void print_array_sysmgrinit(const unsigned long *arr, size_t arr_size,
 
+				   const char *indent1, const char *name,
 
+				   const char *indent_next)
 
+{
 
+	size_t i;
 
+
 
+	printf("%s%s = [", indent1, name);
 
+	for (i = 0; i < arr_size; i++) {
 
+		printf("%02x", (u8)arr[i]);
 
+		if (i + 1 < arr_size) {
 
+			if (i % 8 == 7) {
 
+				printf("\n%s", indent_next);
 
+			} else {
 
+				printf(" ");
 
+			}
 
+		}
 
+	}
 
+	printf("];\n");
 
+}
 
+#define print_array_alt_u32 print_array_ulong
 
+#else
 
+#define print_array_sysmgrinit(arr, sz, ind1, n, ind2) print_array_u8(arr, sz, 8, ind1, n, ind2)
 
+#define print_array_alt_u32 print_array_u32
 
+#endif
 
+
 
+static void print_array_u32(const u32 *arr, size_t arr_size,
 
+			    size_t el_per_line, const char *indent1,
 
+			    const char *name, const char *indent_next)
 
+{
 
+	size_t i;
 
+
 
+	printf("%s%s = <", indent1, name);
 
+	for (i = 0; i < arr_size; i++) {
 
+		printf("0x%08x", swap_bytes(arr[i]));
 
+		if (i + 1 < arr_size) {
 
+			if (i % el_per_line == (el_per_line - 1)) {
 
+				printf("\n%s", indent_next);
 
+			} else {
 
+				printf(" ");
 
+			}
 
+		}
 
+	}
 
+	printf(">;\n");
 
+}
 
+
 
+static void print_array_u8(const u8 *arr, size_t arr_size, size_t el_per_line,
 
+			   const char *indent1, const char *name,
 
+			   const char *indent_next)
 
+{
 
+	size_t i;
 
+
 
+	printf("%s%s = [", indent1, name);
 
+	for (i = 0; i < arr_size; i++) {
 
+		printf("%02x", arr[i]);
 
+		if (i + 1 < arr_size) {
 
+			if (i % el_per_line == (el_per_line - 1)) {
 
+				printf("\n%s", indent_next);
 
+			} else {
 
+				printf(" ");
 
+			}
 
+		}
 
+	}
 
+	printf("];\n");
 
+}
 
+
 
+
 
+static void print_clkmgr_cfg(void)
 
+{
 
+	const char handoff_dtsi_clkmgr_cfg_a[] =
 
+		"\n"
 
+		"&clkmgr {\n";
 
+	const char handoff_dtsi_clkmgr_cfg_b[] = "};\n";
 
+	const char clk_mgr_cfg_indent[] = "\t\t\t    ";
 
+
 
+	printf(handoff_dtsi_clkmgr_cfg_a);
 
+	print_array_u32((const u32 *)&cm_default, sizeof(cm_default)/4, 4, "\t",
 
+			"altr,clk-mgr-cfg", clk_mgr_cfg_indent);
 
+	printf(handoff_dtsi_clkmgr_cfg_b);
 
+}
 
+
 
+static void print_sysmgr(void)
 
+{
 
+	const char handoff_dtsi_sysmgr_begin[] =
 
+		"\n"
 
+		"&sysmgr {\n";
 
+	const char handoff_dtsi_sysmgr_end[] = "};\n";
 
+	const char sysmgr_cfg_indent[] = "\t\t\t\t\t";
 
+	size_t i;
 
+
 
+	printf(handoff_dtsi_sysmgr_begin);
 
+
 
+	/* sys_mgr_init_table is an u8 table */
 
+	print_array_sysmgrinit(sys_mgr_init_table, ARRAY_SIZE(sys_mgr_init_table),
 
+			       "\t", "altr,pinmux-cfg","\t\t\t   ");
 
+	/* ioscr scan chain table 0 */
 
+	print_array_ulong(iocsr_scan_chain0_table,
 
+			  ARRAY_SIZE(iocsr_scan_chain0_table), 4,
 
+			  "\t", "altr,iocsr-scan-chain0-table",
 
+			  sysmgr_cfg_indent);
 
+	/* ioscr scan chain table 0 */
 
+	print_array_ulong(iocsr_scan_chain1_table,
 
+			  ARRAY_SIZE(iocsr_scan_chain1_table), 4,
 
+			  "\t", "altr,iocsr-scan-chain1-table",
 
+			  sysmgr_cfg_indent);
 
+	/* ioscr scan chain table 0 */
 
+	print_array_ulong(iocsr_scan_chain2_table,
 
+			  ARRAY_SIZE(iocsr_scan_chain2_table), 4,
 
+			  "\t", "altr,iocsr-scan-chain2-table",
 
+			  sysmgr_cfg_indent);
 
+	/* ioscr scan chain table 0 */
 
+	print_array_ulong(iocsr_scan_chain3_table,
 
+			  ARRAY_SIZE(iocsr_scan_chain3_table), 4,
 
+			  "\t", "altr,iocsr-scan-chain3-table",
 
+			  sysmgr_cfg_indent);
 
+	printf(handoff_dtsi_sysmgr_end);
 
+}
 
+
 
+static void print_sdram_cfg(void)
 
+{
 
+	const char handoff_dtsi_sdram_cfg_begin[] =
 
+		"\n"
 
+		"&sdr {\n";
 
+	const char handoff_dtsi_sdram_cfg_end[] = "};\n";
 
+
 
+	printf(handoff_dtsi_sdram_cfg_begin);
 
+	print_array_u32((const u32 *)&sdram_config, sizeof(sdram_config)/4, 4,
 
+			"\t", "altr,sdr-cfg", "\t\t\t");
 
+	print_array_u8((const u8 *)&rw_mgr_config, sizeof(rw_mgr_config), 8,
 
+			"\t", "altr,sdr-rw-mgr-cfg", "\t\t\t       ");
 
+	print_array_u8((const u8 *)&io_config, sizeof(io_config), 8,
 
+			"\t", "altr,sdr-io-cfg", "\t\t\t   ");
 
+	print_array_u8((const u8 *)&misc_config, sizeof(misc_config), 8,
 
+			"\t", "altr,sdr-misc-cfg", "\t\t\t     ");
 
+	print_array_alt_u32(ac_rom_init, ARRAY_SIZE(ac_rom_init), 4,
 
+			"\t", "altr,sdr-ac-rom-init", "\t\t\t\t");
 
+	print_array_alt_u32(inst_rom_init, ARRAY_SIZE(inst_rom_init), 4,
 
+			"\t", "altr,sdr-inst-rom-init", "\t\t\t\t  ");
 
+	printf(handoff_dtsi_sdram_cfg_end);
 
+}
 
+
 
+int main(void)
 
+{
 
+	print_hdr();
 
+	print_clkmgr_base();
 
+	print_clkmgr_cfg();
 
+	print_sysmgr();
 
+	print_sdram_cfg();
 
+}
arch/arm/mach-socfpga/qts-to-handoff.sh +0 -0

new file mode 100755

index 0000000000..b9032a5411

--- /dev/null

+++ b/arch/arm/mach-socfpga/qts-to-handoff.sh

arch/arm/mach-socfpga/qts-to-handoff.sh +83 -0
@@ -0,0 +1,83 @@
 
+#!/bin/sh
 
+# This script converts Quartus handoff files (in Quartus or U-Boot format)
 
+# to a handoff.dtsi file.
 
+
 
+
 
+usage() {
 
+	MY_BASENAME=`basename $0`
 
+	echo "${MY_BASENAME} [soc_type] [input_qts_dir] [input_bsp_dir] [output_file]"
 
+	echo " or"
 
+	echo "${MY_BASENAME} 'u-boot' [uboot_qts_dir] [output_file]"
 
+	echo ""
 
+	echo "Process QTS-generated headers into handoff.dtsi:"
 
+	echo ""
 
+	echo "  soc_type      - Type of SoC, either 'cyclone5' or 'arria5'."
 
+	echo "  input_qts_dir - Directory with compiled Quartus project"
 
+	echo "                  and containing the Quartus project file (QPF)."
 
+	echo "  input_bsp_dir - Directory with generated bsp containing"
 
+	echo "                  the settings.bsp file."
 
+	echo "  output_file   - Full filename to store the handoff dtsi file."
 
+	echo "  uboot_qts_dir - board/qts directory if input files are in"
 
+	echo "                  'old-style' U-Boot format."
 
+	echo ""
 
+}
 
+
 
+soc="$1"
 
+
 
+HANDOFF_TEMPLATE="`dirname $0`/create_handoff_gen5.c"
 
+
 
+case "$soc" in
 
+"cyclone5"|"arria5")
 
+	if [ "$#" -ne 4 ] ; then
 
+		usage
 
+		exit 1
 
+	fi
 
+	in_qts_dir="$2"
 
+	in_bsp_dir="$3"
 
+	output_file="$4"
 
+	out_dir=`dirname ${output_file}`
 
+
 
+	if [ ! -d "${in_qts_dir}" -o ! -d "${in_bsp_dir}" -o \
 
+		! -d "${out_dir}" -o -z "${soc}" ] ; then
 
+		usage
 
+		exit 3
 
+	fi
 
+
 
+	if [ "$soc" = "cyclone5" ] ; then
 
+		CMDLINE_DEFINES="-DCYCLONE5"
 
+	else
 
+		CMDLINE_DEFINES="-DARRIA5"
 
+	fi
 
+	CMDLINE_DEFINES="${CMDLINE_DEFINES} -DUSE_QUARTUS_OUTPUT -I${in_bsp_dir}/generated/"
 
+	for d in ${in_qts_dir}/hps_isw_handoff/*/ ; do
 
+		CMDLINE_DEFINES="${CMDLINE_DEFINES} -I$d"
 
+	done
 
+	;;
 
+"u-boot")
 
+	if [ "$#" -ne 3 ] ; then
 
+		usage
 
+		exit 1
 
+	fi
 
+	in_qts_dir="$2"
 
+	output_file="$3"
 
+	out_dir=`dirname ${output_file}`
 
+
 
+	if [ ! -d "${in_qts_dir}" -o ! -d "${out_dir}" ] ; then
 
+		usage
 
+		exit 3
 
+	fi
 
+
 
+	CMDLINE_DEFINES="-I${in_qts_dir}"
 
+	;;
 
+*)
 
+	usage
 
+	exit 1
 
+	;;
 
+esac
 
+
 
+# compile
 
+gcc ${CMDLINE_DEFINES} ${HANDOFF_TEMPLATE} -o ${out_dir}/create_handoff_gen5
 
+${out_dir}/create_handoff_gen5 > ${output_file}
 
+
 
+# TODO: remove tmp file:
 
+#rm $${out_dir}/create_handoff_gen5
#11 lore raw

RFC PATCH v2 8/18 socfpga: gen5: add new tool to create handoff dtsi files

Quoted 10 lines · Simon Goldschmidt

Dalon L Westergreen <[email protected]> schrieb am Di., 22. Okt. 2019, 19:10:

Quoted 4 lines

I mentioned this before, it would be great to not rely on the generated files
and do this based purely on the handoff data generated during a quartus build. Did you look at the python source i pointed you to?

No, not yet. But I don't think that will be a problem. I sent this series mainly to discuss the dts format (boardspecific handoff dtsi vs genetic dtsi plus boardspecific header file).

The board specific dtsi does look cleaner, but i do like the simplicity of generating the header in arria10.
I could easily replicate what you do, generate the header, and use it to create the dtsi.
--dalon

Quoted 466 lines

I still favor boardspecific handoff dtsi, but I would like to use the same style for all socfpga flavours.

Plus this tool is required to convert existing boards where we don't have the quartus project files at hand.

Regards,
Simon

Quoted 457 lines

--dalon

Quoted 455 lines · Simon Goldschmidt

This new tool converts handoff information from quartus to "*_handoff.dtsi"devicetree files. This is in preparation to move from ad- hoc code in archthat parses the 'qts' header files to drivers parsing the same informationfrom devicetree.
Converting existing U-Boot 'qts' files is also supported.

Changes in v2: None

 arch/arm/mach-socfpga/create_handoff_gen5.c | 660 ++++++++++++++++++++

arch/arm/mach-socfpga/qts-to-handoff.sh | 83 +++ 2 files changed, 743
insertions(+) create mode 100644 arch/arm/mach- socfpga/create_handoff_gen5.c create mode 100755 arch/arm/mach- socfpga/qts-to-handoff.sh

arch/arm/mach- renamed from arch/arm/mach-socfpga/create_handoff_gen5.c +0 -0

socfpga/create_handoff_gen5.cnew file mode 100644index 0000000000..6ec436719d--- /dev/null+++ b/arch/arm/mach- socfpga/create_handoff_gen5.c@@ -0,0 +1,660 @@+// SPDX-License-Identifier:
GPL-2.0+/*+ * This is a host-tool that needs to be compiled per board and prints the+ * handoff.dtsi to stdout.+ */++#include <stdio.h>+#include <stdint.h>++/* Define kernel types */+typedef uint8_t u8;+typedef uint32_t u32;++#ifdef USE_QUARTUS_OUTPUT+#ifdef ARRIA5+#include "iocsr_config_arria5.c"+#include "pinmux_config_arria5.c"+#else+#include "iocsr_config_cyclone5.c"+#include "pinmux_config_cyclone5.c"+#endif+#include "pll_config.h"+#include "sdram/sdram_config.h"+#include "sequencer_auto.h"+#include "sequencer_defines.h"+#include "sequencer_auto_ac_init.c"+#include "sequencer_auto_inst_init.c"+#define RW_MGR(x) __RW_MGR_##x+#else+#define RW_MGR(x) RW_MGR_##x+#include <iocsr_config.h>+#include <pinmux_config.h>+#include <pll_config.h>+#include <sdram_config.h>+#endif++#include "include/mach/clock_manager_gen5.h"+#include "include/mach/sdram_gen5.h"++#ifndef ARRAY_SIZE+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))+#endif++const char handoff_dtsi_hdr[] =+
"// SPDX-License-Identifier: GPL-2.0\n"+ "/*\n"+ " *<auto-
generated>\n"+ " * This code was generated by a tool based on\n"+ "
* handoffs from both Qsys and Quartus.\n"+ " *\n"+ " * Changes to
this file may be lost if\n"+ " * the code is regenerated.\n"+ "
*</auto-generated>\n"+ " */\n";++/* Wrap PLL config */++#define
MAIN_VCO_BASE ( \+ (CONFIG_HPS_MAINPL
LGRP_VCO_DENOM << \+ CLKMGR_MAINPLLGRP_VCO_DENOM_OFFSET
) | \+ (CONFIG_HPS_MAINPLLGRP_VCO_NUMER << \+
CLKMGR_MAINPLLGRP_VCO_NUMER_OFFSET) \+ )++#define PERI_VCO_BASE (

					\+	(CONFIG_HPS_PERPLLGRP_VCO_
PSRC <<		\+		CLKMGR_PERPLLGRP_VCO_PSRC_OFFSET) |	\+
	(CONFIG_HPS_PERPLLGRP_VCO_DENOM <<		\+		CL
KMGR_PERPLLGRP_VCO_DENOM_OFFSET) |	\+	(CONFIG_HPS_PERPLLGRP_VCO_
NUMER <<		\+		CLKMGR_PERPLLGRP_VCO_NUMER_OFFSET)	\+
	)++#define SDR_VCO_BASE (					\+
	(CONFIG_HPS_SDRPLLGRP_VCO_SSRC <<		\+		CL
KMGR_SDRPLLGRP_VCO_SSRC_OFFSET) |	\+	(CONFIG_HPS_SDRPLLGRP_VCO_DENOM <<
		\+		CLKMGR_SDRPLLGRP_VCO_DENOM_OFFSET) |	\+
	(CONFIG_HPS_SDRPLLGRP_VCO_NUMER <<		\+		CL

KMGR_SDRPLLGRP_VCO_NUMER_OFFSET) \+ )++static const struct cm_config
cm_default = {+ /* main group */+ MAIN_VCO_BASE,+ (CONFIG_HPS_MAINPL
LGRP_MPUCLK_CNT <<+ CLKMGR_MAINPLLGRP_MPUCLK_CNT_OFFSET),+
(CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT <<+ CLKMGR_MAINPLLGRP_MAINCL
K_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_DBGATCLK_CNT <<+ CL
KMGR_MAINPLLGRP_DBGATCLK_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_MAINQSPIC
LK_CNT <<+ CLKMGR_MAINPLLGRP_MAINQSPICLK_CNT_OFFSET),+ (C
ONFIG_HPS_MAINPLLGRP_MAINNANDSDMMCCLK_CNT <<+ CLKMGR_PERPLLGRP
_PERNANDSDMMCCLK_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CN
T <<+ CLKMGR_MAINPLLGRP_CFGS2FUSER0CLK_CNT_OFFSET),+ (C
ONFIG_HPS_MAINPLLGRP_MAINDIV_L3MPCLK <<+ CLKMGR_MAINPLLGRP_MAINDI
V_L3MPCLK_OFFSET) |+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK <<+
CLKMGR_MAINPLLGRP_MAINDIV_L3SPCLK_OFFSET) |+ (CONFIG_HPS_MAINPLLGRP_M
AINDIV_L4MPCLK <<+ CLKMGR_MAINPLLGRP_MAINDIV_L4MPCLK_OFFSET
) |+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L4SPCLK <<+ CLKMGR_MAI
NPLLGRP_MAINDIV_L4SPCLK_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGATCLK
<<+ CLKMGR_MAINPLLGRP_DBGDIV_DBGATCLK_OFFSET) |+ (CONFIG_HP
S_MAINPLLGRP_DBGDIV_DBGCLK <<+ CLKMGR_MAINPLLGRP_DBGDIV_DBGCLK_
OFFSET),+ (CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK <<+ CLKMGR_MAI
NPLLGRP_TRACEDIV_TRACECLK_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_L4SRC_L4M
P <<+ CLKMGR_MAINPLLGRP_L4SRC_L4MP_OFFSET) |+ (CONFIG_HP
S_MAINPLLGRP_L4SRC_L4SP <<+ CLKMGR_MAINPLLGRP_L4SRC_L4SP_OFF
SET),++ /* peripheral group */+ PERI_VCO_BASE,+ (CONFIG_HPS_PERPLL
GRP_EMAC0CLK_CNT <<+ CLKMGR_PERPLLGRP_EMAC0CLK_CNT_OFFSET),+
(CONFIG_HPS_PERPLLGRP_EMAC1CLK_CNT <<+ CLKMGR_PERPLLGRP_EMAC1CL
K_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT <<+ CL
KMGR_PERPLLGRP_PERQSPICLK_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_PERNANDSDM
MCCLK_CNT <<+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),+
(CONFIG_HPS_PERPLLGRP_PERBASECLK_CNT <<+ CLKMGR_PERPLLGRP_PERBASE
CLK_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_S2FUSER1CLK_CNT <<+ CL
KMGR_PERPLLGRP_S2FUSER1CLK_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_DIV_USBCLK
<<+ CLKMGR_PERPLLGRP_DIV_USBCLK_OFFSET) |+ (CONFIG_HP
S_PERPLLGRP_DIV_SPIMCLK <<+ CLKMGR_PERPLLGRP_DIV_SPIMCLK_OFF
SET) |+ (CONFIG_HPS_PERPLLGRP_DIV_CAN0CLK <<+ CLKMGR_PERPLLGRP_D
IV_CAN0CLK_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_DIV_CAN1CLK <<+ CL
KMGR_PERPLLGRP_DIV_CAN1CLK_OFFSET),+ (CONFIG_HPS_PERPLLGRP_GPIODIV_GP
IODBCLK <<+ CLKMGR_PERPLLGRP_GPIODIV_GPIODBCLK_OFFSET),+ (C
ONFIG_HPS_PERPLLGRP_SRC_QSPI <<+ CLKMGR_PERPLLGRP_SRC_QSPI_OFFSET
) |+ (CONFIG_HPS_PERPLLGRP_SRC_NAND <<+ CLKMGR_PERPLLGRP_S
RC_NAND_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_SRC_SDMMC <<+ CL
KMGR_PERPLLGRP_SRC_SDMMC_OFFSET),++ /* sdram pll group */+ SD
R_VCO_BASE,+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_PHASE <<+ CL
KMGR_SDRPLLGRP_DDRDQSCLK_PHASE_OFFSET) |+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_
CNT <<+ CLKMGR_SDRPLLGRP_DDRDQSCLK_CNT_OFFSET),+ (CONFIG_HP
S_SDRPLLGRP_DDR2XDQSCLK_PHASE <<+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHA
SE_OFFSET) |+ (CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT <<+ CL
KMGR_SDRPLLGRP_DDR2XDQSCLK_CNT_OFFSET),+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_P
HASE <<+ CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_OFFSET) |+ (CONFIG_HP
S_SDRPLLGRP_DDRDQCLK_CNT <<+ CLKMGR_SDRPLLGRP_DDRDQCLK_CNT_OF
FSET),+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_PHASE <<+ CLKMGR_SDR
PLLGRP_S2FUSER2CLK_PHASE_OFFSET) |+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CL
K_CNT <<+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),++ /* altera
group */+ CONFIG_HPS_ALTERAGRP_MPUCLK,+};++/* Wrap SDRAM config */+static
const struct socfpga_sdram_config sdram_config = {+ .ctrl_cfg =+
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<+ SDR_CTRL
GRP_CTRLCFG_MEMTYPE_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_CT
RLCFG_MEMBL <<+ SDR_CTRLGRP_CTRLCFG_MEMBL_LSB)

	|+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<+			

SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB) |+ (CONFIG_HP
S_SDR_CTRLCFG_CTRLCFG_ECCEN <<+ SDR_CTRLGRP_CTRLCFG_ECCE
N_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_EC
CCORREN <<+ SDR_CTRLGRP_CTRLCFG_ECCCORREN_LSB)
|+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN <<+
SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB) |+ (CONFIG_HP
S_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<+ SDR_CTRLGRP_CTRL
CFG_STARVELIMIT_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_CT
RLCFG_DQSTRKEN <<+ SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB
) |+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<+

	SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),+	.dram_timing1 =+		(C

ONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<+ SDR_CTRL
GRP_DRAMTIMING1_TCWL_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DR
AMTIMING1_AL <<+ SDR_CTRLGRP_DRAMTIMING1_TAL_LSB)
|+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL <<+
SDR_CTRLGRP_DRAMTIMING1_TCL_LSB) |+ (CONFIG_HPS_SDR_CT
RLCFG_DRAMTIMING1_TRRD <<+ SDR_CTRLGRP_DRAMTIMING1_
TRRD_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW
<<+ SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<+
SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),+ .dram_timing2 =+ (C
ONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI <<+ SDR_CTRL
GRP_DRAMTIMING2_TREFI_LSB) |+ (CONFIG_HPS_SDR_CT
RLCFG_DRAMTIMING2_IF_TRCD <<+ SDR_CTRLGRP_DRAMTIMING2_
TRCD_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP
<<+ SDR_CTRLGRP_DRAMTIMING2_TRP_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<+
SDR_CTRLGRP_DRAMTIMING2_TWR_LSB) |+ (CONFIG_HPS_SDR_CT
RLCFG_DRAMTIMING2_IF_TWTR <<+ SDR_CTRLGRP_DRAMTIMING2_
TWTR_LSB),+ .dram_timing3 =+ (CONFIG_HPS_SDR_CTRLCFG_DR
AMTIMING3_TRTP <<+ SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB
) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS <<+

	SDR_CTRLGRP_DRAMTIMING3_TRAS_LSB)		|+		(CONFIG_HP

S_SDR_CTRLCFG_DRAMTIMING3_TRC <<+ SDR_CTRLGRP_DRAMTIMING3_
TRC_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD
<<+ SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<+
SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),+ .dram_timing4 =+ (C
ONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<+
SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB) |+ (CONFIG_HP
S_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<+ SDR_CTRLGRP_DRAM
TIMING4_PWRDOWNEXIT_LSB),+ .lowpwr_timing =+ (CONFIG_HP
S_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<+ SDR_CTRL
GRP_LOWPWRTIMING_AUTOPDCYCLES_LSB) |+ (CONFIG_HPS_SDR_CT
RLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<+ SDR_CTRLGRP_LOWP
WRTIMING_CLKDISABLECYCLES_LSB),+ .dram_odt =+ (CONFIG_HPS_SDR_CT
RLCFG_DRAMODT_READ <<+ SDR_CTRLGRP_DRAMODT_READ_LSB)

	|+		(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<+			

SDR_CTRLGRP_DRAMODT_WRITE_LSB),+ .extratime1 =+ (CONFIG_HPS_SDR_CT
RLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR <<+ SDR_CTRL
GRP_EXTRATIME1_RD_TO_WR_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_EX
TRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_BC <<+ SDR_CTRL
GRP_EXTRATIME1_RD_TO_WR_BC_LSB) |+(CONFIG_HPS_SDR_CTRLCFG_EXTRAT
IME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_DIFF_CHIP <<+ SDR_CTRL
GRP_EXTRATIME1_RD_TO_WR_DIFF_LSB),+ .dram_addrw =+ (C
ONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<+ SDR_CTRL
GRP_DRAMADDRW_COLBITS_LSB) |+ (CONFIG_HPS_SDR_CT
RLCFG_DRAMADDRW_ROWBITS <<+ SDR_CTRLGRP_DRAMADDRW_RO
WBITS_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_
BANKBITS <<+ SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB)
|+ ((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<+

	SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),+	.dram_if_width =+		(C

ONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<+ SDR_CTRL
GRP_DRAMIFWIDTH_IFWIDTH_LSB),+ .dram_dev_width =+ (CONFIG_HP
S_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<+ SDR_CTRLGRP_DRAM
DEVWIDTH_DEVWIDTH_LSB),+ .dram_intr =+ (CONFIG_HPS_SDR_CTRLCFG_DR
AMINTR_INTREN <<+ SDR_CTRLGRP_DRAMINTR_INTREN_LSB),+ .l
owpwr_eq =+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK
<<+ SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),+ .s
tatic_cfg =+ (CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<+

	SDR_CTRLGRP_STATICCFG_MEMBL_LSB)		|+		(CONFIG_HP

S_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<+ SDR_CTRLGRP_STAT
ICCFG_USEECCASDATA_LSB),+ .ctrl_width =+ (CONFIG_HPS_SDR_CT
RLCFG_CTRLWIDTH_CTRLWIDTH <<+ SDR_CTRLGRP_CTRLWIDTH_CT
RLWIDTH_LSB),+ .cport_width =+ (CONFIG_HPS_SDR_CTRLCFG_CP
ORTWIDTH_CPORTWIDTH <<+ SDR_CTRLGRP_CPORTWIDTH_CMDPORTWI
DTH_LSB),+ .cport_wmap =+ (CONFIG_HPS_SDR_CTRLCFG_CP
ORTWMAP_CPORTWMAP <<+ SDR_CTRLGRP_CPORTWMAP_CPORTWFIFO
MAP_LSB),+ .cport_rmap =+ (CONFIG_HPS_SDR_CTRLCFG_CP
ORTRMAP_CPORTRMAP <<+ SDR_CTRLGRP_CPORTRMAP_CPORTRFIFO
MAP_LSB),+ .rfifo_cmap =+ (CONFIG_HPS_SDR_CTRLCFG_RF
IFOCMAP_RFIFOCMAP <<+ SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORT
MAP_LSB),+ .wfifo_cmap =+ (CONFIG_HPS_SDR_CTRLCFG_WF
IFOCMAP_WFIFOCMAP <<+ SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORT
MAP_LSB),+ .cport_rdwr =+ (CONFIG_HPS_SDR_CTRLCFG_CP
ORTRDWR_CPORTRDWR <<+ SDR_CTRLGRP_CPORTRDWR_CPORTRDWR_
LSB),+ .port_cfg =+ (CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN
<<+ SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LSB),+ .fpgaport_
rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,+ .fifo_cfg =+ (C
ONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<+ SDR_CTRL
GRP_FIFOCFG_SYNCMODE_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_FI
FOCFG_INCSYNC <<+ SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),+ .m
p_priority =+ (CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY
<<+ SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),+ .m
p_weight0 =+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT
_31_0 <<+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_
0_LSB),+ .mp_weight1 =+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_
1_STATICWEIGHT_49_32 <<+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_
STATICWEIGHT_49_32_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGH
T_1_SUMOFWEIGHT_13_0 <<+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_
SUMOFWEIGHTS_13_0_LSB),+ .mp_weight2 =+ (CONFIG_HPS_SDR_CT
RLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 <<+ SDR_CTRLGRP_MPWE
IGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_14_LSB),+ .mp_weight3 =+ (C
ONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<+
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),+ .mp_pacing
0 =+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<+

		SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),+	.m
p_pacing1 =+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59
_32 <<+			SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD1_59_32
_LSB) |+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 <<+		
	SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD2_3_0_LSB),+	.mp_pacing2 =+		

(CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 <<+
SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOLD2_35_4_LSB),+ .mp_pacing3 =+
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<+
SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),+ .mp_threshold0 =+
(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<+
SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),+ .mp_thresh
old1 =+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYC
LES_63_32 <<+ SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRS
TCYCLES_63_32_LSB),+ .mp_threshold2 =+ (CONFIG_HPS_SDR_CT
RLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 <<+
SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LSB),+ .phy_ctrl0
= CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,+};++static const struct
socfpga_sdram_rw_mgr_config rw_mgr_config = {+ .activate_0_and_1
= RW_MGR(ACTIVATE_0_AND_1),+ .activate_0_and_1_wait1 =
RW_MGR(ACTIVATE_0_AND_1_WAIT1),+ .activate_0_and_1_wait2 =
RW_MGR(ACTIVATE_0_AND_1_WAIT2),+ .activate_1 =
RW_MGR(ACTIVATE_1),+ .clear_dqs_enable =
RW_MGR(CLEAR_DQS_ENABLE),+ .guaranteed_read =
RW_MGR(GUARANTEED_READ),+ .guaranteed_read_cont =
RW_MGR(GUARANTEED_READ_CONT),+ .guaranteed_write =
RW_MGR(GUARANTEED_WRITE),+ .guaranteed_write_wait0 =
RW_MGR(GUARANTEED_WRITE_WAIT0),+ .guaranteed_write_wait1 =
RW_MGR(GUARANTEED_WRITE_WAIT1),+ .guaranteed_write_wait2 =
RW_MGR(GUARANTEED_WRITE_WAIT2),+ .guaranteed_write_wait3 =
RW_MGR(GUARANTEED_WRITE_WAIT3),+ .idle =
RW_MGR(IDLE),+ .idle_loop1 = RW_MGR(IDLE_LOOP1),+ .i
dle_loop2 = RW_MGR(IDLE_LOOP2),+ .init_reset_0_cke_
0 = RW_MGR(INIT_RESET_0_CKE_0),+ .init_reset_1_cke_0
= RW_MGR(INIT_RESET_1_CKE_0),+ .lfsr_wr_rd_bank_0 =
RW_MGR(LFSR_WR_RD_BANK_0),+ .lfsr_wr_rd_bank_0_data =
RW_MGR(LFSR_WR_RD_BANK_0_DATA),+ .lfsr_wr_rd_bank_0_dqs =
RW_MGR(LFSR_WR_RD_BANK_0_DQS),+ .lfsr_wr_rd_bank_0_nop =
RW_MGR(LFSR_WR_RD_BANK_0_NOP),+ .lfsr_wr_rd_bank_0_wait =
RW_MGR(LFSR_WR_RD_BANK_0_WAIT),+ .lfsr_wr_rd_bank_0_wl_1 =
RW_MGR(LFSR_WR_RD_BANK_0_WL_1),+ .lfsr_wr_rd_dm_bank_0 =
RW_MGR(LFSR_WR_RD_DM_BANK_0),+ .lfsr_wr_rd_dm_bank_0_data =
RW_MGR(LFSR_WR_RD_DM_BANK_0_DATA),+ .lfsr_wr_rd_dm_bank_0_dqs =
RW_MGR(LFSR_WR_RD_DM_BANK_0_DQS),+ .lfsr_wr_rd_dm_bank_0_nop =
RW_MGR(LFSR_WR_RD_DM_BANK_0_NOP),+ .lfsr_wr_rd_dm_bank_0_wait =
RW_MGR(LFSR_WR_RD_DM_BANK_0_WAIT),+ .lfsr_wr_rd_dm_bank_0_wl_1 =
RW_MGR(LFSR_WR_RD_DM_BANK_0_WL_1),+ .mrs0_dll_reset
= RW_MGR(MRS0_DLL_RESET),+ .mrs0_dll_reset_mirr =
RW_MGR(MRS0_DLL_RESET_MIRR),+ .mrs0_user =
RW_MGR(MRS0_USER),+ .mrs0_user_mirr =
RW_MGR(MRS0_USER_MIRR),+ .mrs1 = RW_MGR(MRS1),+
.mrs1_mirr = RW_MGR(MRS1_MIRR),+ .mrs2

	= RW_MGR(MRS2),+	.mrs2_mirr			=
RW_MGR(MRS2_MIRR),+	.mrs3				= RW_MGR(MRS3),+	
.mrs3_mirr			= RW_MGR(MRS3_MIRR),+	.precharge_all		
	= RW_MGR(PRECHARGE_ALL),+	.read_b2b			=

RW_MGR(READ_B2B),+ .read_b2b_wait1 =
RW_MGR(READ_B2B_WAIT1),+ .read_b2b_wait2 =
RW_MGR(READ_B2B_WAIT2),+ .refresh_all =
RW_MGR(REFRESH_ALL),+ .rreturn = RW_MGR(RETURN),+

	.sgle_read			= RW_MGR(SGLE_READ),+	.zqcl		
		= RW_MGR(ZQCL),++	.true_mem_data_mask_width	=

RW_MGR_TRUE_MEM_DATA_MASK_WIDTH,+ .mem_address_mirroring =
RW_MGR_MEM_ADDRESS_MIRRORING,+ .mem_data_mask_width =
RW_MGR_MEM_DATA_MASK_WIDTH,+ .mem_data_width =
RW_MGR_MEM_DATA_WIDTH,+ .mem_dq_per_read_dqs =
RW_MGR_MEM_DQ_PER_READ_DQS,+ .mem_dq_per_write_dqs =
RW_MGR_MEM_DQ_PER_WRITE_DQS,+ .mem_if_read_dqs_width =
RW_MGR_MEM_IF_READ_DQS_WIDTH,+ .mem_if_write_dqs_width =
RW_MGR_MEM_IF_WRITE_DQS_WIDTH,+ .mem_number_of_cs_per_dimm =
RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM,+ .mem_number_of_ranks =
RW_MGR_MEM_NUMBER_OF_RANKS,+ .mem_virtual_groups_per_read_dqs =+
RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS,+ .mem_virtual_groups_per_write_dq
s =+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS,+};++static
const struct socfpga_sdram_io_config io_config = {+ .delay_per_dchai
n_tap = IO_DELAY_PER_DCHAIN_TAP,+ .delay_per_dqs_en_dchain_t
ap = IO_DELAY_PER_DQS_EN_DCHAIN_TAP,+ .delay_per_opa_tap_lo
= IO_DELAY_PER_OPA_TAP & 0xff,+ .delay_per_opa_tap_hi =
(IO_DELAY_PER_OPA_TAP << 8) & 0xff,+ .dll_chain_length =
IO_DLL_CHAIN_LENGTH,+ .dqdqs_out_phase_max =
IO_DQDQS_OUT_PHASE_MAX,+ .dqs_en_delay_max =
IO_DQS_EN_DELAY_MAX,+ .dqs_en_delay_offset =
IO_DQS_EN_DELAY_OFFSET,+ .dqs_en_phase_max =
IO_DQS_EN_PHASE_MAX,+ .dqs_in_delay_max =
IO_DQS_IN_DELAY_MAX,+ .dqs_in_reserve =
IO_DQS_IN_RESERVE,+ .dqs_out_reserve =
IO_DQS_OUT_RESERVE,+ .io_in_delay_max =
IO_IO_IN_DELAY_MAX,+ .io_out1_delay_max =
IO_IO_OUT1_DELAY_MAX,+ .io_out2_delay_max =
IO_IO_OUT2_DELAY_MAX,+ .shift_dqs_en_when_shift_dqs =
IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS,+};++static const struct
socfpga_sdram_misc_config misc_config = {+ .afi_rate_ratio

	= AFI_RATE_RATIO,+	.calib_lfifo_offset		=

CALIB_LFIFO_OFFSET,+ .calib_vfifo_offset =
CALIB_VFIFO_OFFSET,+ .enable_super_quick_calibration =
ENABLE_SUPER_QUICK_CALIBRATION,+ .max_latency_count_width =
MAX_LATENCY_COUNT_WIDTH,+ .read_valid_fifo_size =
READ_VALID_FIFO_SIZE,+ .reg_file_init_seq_signature_ll =
REG_FILE_INIT_SEQ_SIGNATURE & 0xff,+ .reg_file_init_seq_signature_lh
= (REG_FILE_INIT_SEQ_SIGNATURE >> 8) & 0xff,+ .reg_file_init_seq_signa
ture_hl = (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,+ .reg_file_
init_seq_signature_hh = (REG_FILE_INIT_SEQ_SIGNATURE >> 24) & 0xff,+
.tinit_cntr0_val = TINIT_CNTR0_VAL,+ .tinit_cntr1_val
= TINIT_CNTR1_VAL,+ .tinit_cntr2_val =
TINIT_CNTR2_VAL,+ .treset_cntr0_val = TRESET_CNTR0_VAL,+ .t
reset_cntr1_val = TRESET_CNTR1_VAL,+ .treset_cntr2_val
= TRESET_CNTR2_VAL,+};++static void print_hdr(void)+{+ printf(handoff_d
tsi_hdr);+}++static void print_clkmgr_base(void)+{+ const char
handoff_dtsi_clkmgr_base[] =+ "\n"+ "&osc1 {\n"+
" clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC1_HZ */+ "}
;\n"+ "\n"+ "&osc2 {\n"+ " clock-
frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC2_HZ */+ "};\n"+

	"\n"+		"&f2s_periph_ref_clk {\n"+		"	clock-
frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_PER_REF_HZ */+		"};\n"+	
	"\n"+		"&f2s_sdram_ref_clk {\n"+		"	clock-

frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_SDR_REF_HZ */+ "};\n";+

arch/arm/mach- renamed from arch/arm/mach-socfpga/create_handoff_gen5.c +1 -0
+	printf(handoff_dtsi_clkmgr_base, CONFIG_HPS_CLK_OSC1_HZ,+	       CON

FIG_HPS_CLK_OSC2_HZ, CONFIG_HPS_CLK_F2S_PER_REF_HZ,+ CONFIG_HP
S_CLK_F2S_SDR_REF_HZ);+}++/*+ * dtc stores u32 array big endian but we load them raw and expect them to be in+ * little endian format. To prevent this tool to depend on host endianess, do+ * the switch manually, not via
'htonl'.+ */+static u32 swap_bytes(u32 val)+{+ return (val << 24) |
((val & 0xFF00ul) << 8) |+ ((val & 0xFF0000ul) >> 8) | (val

Quoted 1 line
Quoted 1 line

24);+}++static void print_array_ulong(const unsigned long *arr, size_t

arr_size,+ size_t el_per_line, const char
*indent1,+ const char *name, const char
*indent_next)+{+ size_t i;++ printf("%s%s = <", indent1, name);+ fo
r (i = 0; i < arr_size; i++) {+ printf("0x%08x",
swap_bytes((u32)arr[i]));+ if (i + 1 < arr_size) {+

	if (i % el_per_line == (el_per_line - 1)) {+				pr
intf("\n%s", indent_next);+			} else {+			
	printf(" ");+			}+		}+	}+	printf(">;

\n");+}++#ifdef USE_QUARTUS_OUTPUT+static void print_array_sysmgrinit(const unsigned long *arr, size_t arr_size,+
const char *indent1, const char *name,+
const char *indent_next)+{+ size_t i;++ printf("%s%s = [",
indent1, name);+ for (i = 0; i < arr_size; i++) {+ printf("%0
2x", (u8)arr[i]);+ if (i + 1 < arr_size) {+
if (i % 8 == 7) {+ printf("\n%s",
indent_next);+ } else {+ pr
intf(" ");+ }+ }+ }+ printf("];
\n");+}+#define print_array_alt_u32 print_array_ulong+#else+#define print_array_sysmgrinit(arr, sz, ind1, n, ind2) print_array_u8(arr, sz, 8, ind1, n, ind2)+#define print_array_alt_u32 print_array_u32+#endif++static void print_array_u32(const u32 *arr, size_t arr_size,+
size_t el_per_line, const char *indent1,+ const
char *name, const char *indent_next)+{+ size_t i;++ printf("%s%s = <",
indent1, name);+ for (i = 0; i < arr_size; i++) {+ printf("0x
%08x", swap_bytes(arr[i]));+ if (i + 1 < arr_size) {+

	if (i % el_per_line == (el_per_line - 1)) {+				pr
intf("\n%s", indent_next);+			} else {+			
	printf(" ");+			}+		}+	}+	printf(">;

\n");+}++static void print_array_u8(const u8 *arr, size_t arr_size, size_t
el_per_line,+ const char *indent1, const char
*name,+ const char *indent_next)+{+ size_t
i;++ printf("%s%s = [", indent1, name);+ for (i = 0; i < arr_size;
i++) {+ printf("%02x", arr[i]);+ if (i + 1 <
arr_size) {+ if (i % el_per_line == (el_per_line -
1)) {+ printf("\n%s", indent_next);+
} else {+ printf(" ");+ }+
}+ }+ printf("];\n");+}+++static void print_clkmgr_cfg(void)+{+
const char handoff_dtsi_clkmgr_cfg_a[] =+ "\n"+ "&clkmgr
{\n";+ const char handoff_dtsi_clkmgr_cfg_b[] = "};\n";+ const char
clk_mgr_cfg_indent[] = "\t\t\t ";++ printf(handoff_dtsi_clkmgr_cfg_a
);+ print_array_u32((const u32 *)&cm_default, sizeof(cm_default)/4,
4, "\t",+ "altr,clk-mgr-cfg", clk_mgr_cfg_indent);+ pr
intf(handoff_dtsi_clkmgr_cfg_b);+}++static void print_sysmgr(void)+{+
const char handoff_dtsi_sysmgr_begin[] =+ "\n"+ "&
sysmgr {\n";+ const char handoff_dtsi_sysmgr_end[] = "};\n";+ co
nst char sysmgr_cfg_indent[] = "\t\t\t\t\t";+ size_t i;++ printf(han
doff_dtsi_sysmgr_begin);++ /* sys_mgr_init_table is an u8 table */+
print_array_sysmgrinit(sys_mgr_init_table,
ARRAY_SIZE(sys_mgr_init_table),+ "\t",
"altr,pinmux-cfg","\t\t\t ");+ /* ioscr scan chain table 0 */+ pr
int_array_ulong(iocsr_scan_chain0_table,+ ARRAY_SIZE(ioc
sr_scan_chain0_table), 4,+ "\t", "altr,iocsr-
scan-chain0-table",+ sysmgr_cfg_indent);+ /*
ioscr scan chain table 0 */+ print_array_ulong(iocsr_scan_chain1_tabl
e,+ ARRAY_SIZE(iocsr_scan_chain1_table), 4,+

	  "\t", "altr,iocsr-scan-chain1-table",+			  sysmgr_c

fg_indent);+ /* ioscr scan chain table 0 */+ print_array_ulong(
iocsr_scan_chain2_table,+ ARRAY_SIZE(iocsr_scan_chain2_t
able), 4,+ "\t", "altr,iocsr-scan-chain2-table",+
sysmgr_cfg_indent);+ /* ioscr scan chain table
0 */+ print_array_ulong(iocsr_scan_chain3_table,+
ARRAY_SIZE(iocsr_scan_chain3_table), 4,+ "\t",
"altr,iocsr-scan-chain3-table",+ sysmgr_cfg_indent);+
printf(handoff_dtsi_sysmgr_end);+}++static void print_sdram_cfg(void)+{+
const char handoff_dtsi_sdram_cfg_begin[] =+ "\n"+ "&
sdr {\n";+ const char handoff_dtsi_sdram_cfg_end[] = "};\n";++ pr
intf(handoff_dtsi_sdram_cfg_begin);+ print_array_u32((const u32
*)&sdram_config, sizeof(sdram_config)/4, 4,+ "\t",
"altr,sdr-cfg", "\t\t\t");+ print_array_u8((const u8
*)&rw_mgr_config, sizeof(rw_mgr_config), 8,+ "\t",
"altr,sdr-rw-mgr-cfg", "\t\t\t ");+ print_array_u8((const u8
*)&io_config, sizeof(io_config), 8,+ "\t", "altr,sdr-
io-cfg", "\t\t\t ");+ print_array_u8((const u8 *)&misc_config,
sizeof(misc_config), 8,+ "\t", "altr,sdr-misc-cfg",
"\t\t\t ");+ print_array_alt_u32(ac_rom_init,
ARRAY_SIZE(ac_rom_init), 4,+ "\t", "altr,sdr-ac-rom-
init", "\t\t\t\t");+ print_array_alt_u32(inst_rom_init,
ARRAY_SIZE(inst_rom_init), 4,+ "\t", "altr,sdr-inst-
rom-init", "\t\t\t\t ");+ printf(handoff_dtsi_sdram_cfg_end);+}++i
nt main(void)+{+ print_hdr();+ print_clkmgr_base();+ print_clkmgr_cfg()
;+ print_sysmgr();+ print_sdram_cfg();+}diff --git
a/arch/arm/mach-socfpga/qts-to-handoff.sh b/arch/arm/mach-socfpga/qts-to- handoff.shnew file mode 100755index 0000000000..b9032a5411--- /dev/null+++ b/arch/arm/mach-socfpga/qts-to-handoff.sh@@ -0,0 +1,83 @@+#!/bin/sh+# This script converts Quartus handoff files (in Quartus or U-Boot format)+# to a
handoff.dtsi file.+++usage() {+ MY_BASENAME=basename $0+ echo
"${MY_BASENAME} [soc_type] [input_qts_dir] [input_bsp_dir] [output_file]"+
echo " or"+ echo "${MY_BASENAME} 'u-boot' [uboot_qts_dir]
[output_file]"+ echo ""+ echo "Process QTS-generated headers into
handoff.dtsi:"+ echo ""+ echo " soc_type - Type of SoC,
either 'cyclone5' or 'arria5'."+ echo " input_qts_dir - Directory with
compiled Quartus project"+ echo " and containing
the Quartus project file (QPF)."+ echo " input_bsp_dir - Directory with
generated bsp containing"+ echo " the settings.bsp
file."+ echo " output_file - Full filename to store the handoff dtsi
file."+ echo " uboot_qts_dir - board/qts directory if input files are
in"+ echo " 'old-style' U-Boot format."+ echo
""+}++soc="$1"++HANDOFF_TEMPLATE="`dirname
$0`/create_handoff_gen5.c"++case "$soc" in+"cyclone5"|"arria5")+ if [
"$#" -ne 4 ] ; then+ usage+ exit 1+ fi+ in
_qts_dir="$2"+ in_bsp_dir="$3"+ output_file="$4"+ out_dir=`d
irname ${output_file}`++ if [ ! -d "${in_qts_dir}" -o ! -d
"${in_bsp_dir}" -o \+ ! -d "${out_dir}" -o -z "${soc}" ] ;
then+ usage+ exit 3+ fi++ if [ "$soc" =
"cyclone5" ] ; then+ CMDLINE_DEFINES="-DCYCLONE5"+ else+
CMDLINE_DEFINES="-DARRIA5"+ fi+ CMDLINE_DEFINES="${CMDLINE_DEFINES
} -DUSE_QUARTUS_OUTPUT -I${in_bsp_dir}/generated/"+ for d in
${in_qts_dir}/hps_isw_handoff/*/ ; do+ CMDLINE_DEFINES="${CMDLI
NE_DEFINES} -I$d"+ done+ ;;+"u-boot")+ if [ "$#" -ne 3 ] ; then+

	usage+		exit 1+	fi+	in_qts_dir="$2"+	output_fil

e="$3"+ out_dir=dirname ${output_file}++ if [ ! -d "${in_qts_dir}"

arch/arm/mach- renamed from arch/arm/mach-socfpga/create_handoff_gen5.c +2 -1
-o ! -d "${out_dir}" ] ; then+		usage+		exit 3+	fi
++	CMDLINE_DEFINES="-I${in_qts_dir}"+	;;+*)+	usage+	exit 1+	;;
+esac++# compile+gcc ${CMDLINE_DEFINES} ${HANDOFF_TEMPLATE} -o

${out_dir}/create_handoff_gen5+${out_dir}/create_handoff_gen5 > ${output_file}++# TODO: remove tmp file:+#rm $${out_dir}/create_handoff_gen5

#12 lore raw

RFC PATCH v2 8/18 socfpga: gen5: add new tool to create handoff dtsi files

Am 23.10.2019 um 18:03 schrieb Dalon L Westergreen:

Quoted 17 lines · Simon Goldschmidt
Quoted 5 lines

Dalon L Westergreen <[email protected] <mailto:[email protected]>> schrieb am Di., 22. Okt. 2019, 19:10:

Quoted 8 lines
Quoted 4 lines

I mentioned this before, it would be great to not rely on the generated files
and do this based purely on the handoff data generated during a quartus build. Did you look at the python source i pointed you to?

No, not yet. But I don't think that will be a problem. I sent this series mainly to discuss the dts format (boardspecific handoff dtsi vs genetic dtsi plus boardspecific header file).

Quoted 5 lines

The board specific dtsi does look cleaner, but i do like the simplicity of generating the header in arria10.

I could easily replicate what you do, generate the header, and use it to create the dtsi.

I'm not too fond myself of that tool I created, as it requires you to have a compiler. I just was too lazy write a script for that.

However, I would prefer having a script that does it. And if the sources are quartus output files instead of existing qts files, my tool doesn't work any more, anway.

So I think we should come up with a script (e.g. sh or py) that parses quartus output and creates a handoff dtsi (without a header). We'll only need something different for converting existing qts files then...

Regards,
Simon

Quoted 793 lines

--dalon

Quoted 790 lines

I still favor boardspecific handoff dtsi, but I would like to use the same style for all socfpga flavours.

Plus this tool is required to convert existing boards where we don't have the quartus project files at hand.

Regards,
Simon

Quoted 780 lines

--dalon

Quoted 776 lines · Simon Goldschmidt

This new tool converts handoff information from quartus to "*_handoff.dtsi" devicetree files. This is in preparation to move from ad-hoc code in arch that parses the 'qts' header files to drivers parsing the same information from devicetree.

Converting existing U-Boot 'qts' files is also supported.

Signed-off-by: Simon Goldschmidt <
simon.k.r.goldschmidt at gmail.com
<mailto:[email protected]>

Quoted 1 line

---

Changes in v2: None

  arch/arm/mach-socfpga/create_handoff_gen5.c | 660 ++++++++++++++++++++
  arch/arm/mach-socfpga/qts-to-handoff.sh     |  83 +++
  2 files changed, 743 insertions(+)

create mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh

arch/arm/mach-socfpga/create_handoff_gen5.c new file +660 -0
new file mode 100644
index 0000000000..6ec436719d
@@ -0,0 +1,660 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * This is a host-tool that needs to be compiled per board and prints the
+ * handoff.dtsi to stdout.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+/* Define kernel types */
+typedef uint8_t u8;
+typedef uint32_t u32;
+
+#ifdef USE_QUARTUS_OUTPUT
+#ifdef ARRIA5
+#include "iocsr_config_arria5.c"
+#include "pinmux_config_arria5.c"
+#else
+#include "iocsr_config_cyclone5.c"
+#include "pinmux_config_cyclone5.c"
+#endif
+#include "pll_config.h"
+#include "sdram/sdram_config.h"
+#include "sequencer_auto.h"
+#include "sequencer_defines.h"
+#include "sequencer_auto_ac_init.c"
+#include "sequencer_auto_inst_init.c"
+#define RW_MGR(x) __RW_MGR_##x
+#else
+#define RW_MGR(x) RW_MGR_##x
+#include <iocsr_config.h>
+#include <pinmux_config.h>
+#include <pll_config.h>
+#include <sdram_config.h>
+#endif
+
+#include "include/mach/clock_manager_gen5.h"
+#include "include/mach/sdram_gen5.h"
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
+#endif
+
+const char handoff_dtsi_hdr[] =
+	"// SPDX-License-Identifier: GPL-2.0\n"
+	"/*\n"
+	" *<auto-generated>\n"
+	" *	This code was generated by a tool based on\n"
+	" *	handoffs from both Qsys and Quartus.\n"
+	" *\n"
+	" *	Changes to this file may be lost if\n"
+	" *	the code is regenerated.\n"
+	" *</auto-generated>\n"
+	" */\n";
+
+/* Wrap PLL config */
+
+#define MAIN_VCO_BASE (					\
+	(CONFIG_HPS_MAINPLLGRP_VCO_DENOM <<		\
+		CLKMGR_MAINPLLGRP_VCO_DENOM_OFFSET) |	\
+	(CONFIG_HPS_MAINPLLGRP_VCO_NUMER <<		\
+		CLKMGR_MAINPLLGRP_VCO_NUMER_OFFSET)	\
+	)
+
+#define PERI_VCO_BASE (					\
+	(CONFIG_HPS_PERPLLGRP_VCO_PSRC <<		\
+		CLKMGR_PERPLLGRP_VCO_PSRC_OFFSET) |	\
+	(CONFIG_HPS_PERPLLGRP_VCO_DENOM <<		\
+		CLKMGR_PERPLLGRP_VCO_DENOM_OFFSET) |	\
+	(CONFIG_HPS_PERPLLGRP_VCO_NUMER <<		\
+		CLKMGR_PERPLLGRP_VCO_NUMER_OFFSET)	\
+	)
+
+#define SDR_VCO_BASE (					\
+	(CONFIG_HPS_SDRPLLGRP_VCO_SSRC <<		\
+		CLKMGR_SDRPLLGRP_VCO_SSRC_OFFSET) |	\
+	(CONFIG_HPS_SDRPLLGRP_VCO_DENOM <<		\
+		CLKMGR_SDRPLLGRP_VCO_DENOM_OFFSET) |	\
+	(CONFIG_HPS_SDRPLLGRP_VCO_NUMER <<		\
+		CLKMGR_SDRPLLGRP_VCO_NUMER_OFFSET)	\
+	)
+
+static const struct cm_config cm_default = {
+	/* main group */
+	MAIN_VCO_BASE,
+	(CONFIG_HPS_MAINPLLGRP_MPUCLK_CNT <<
+		CLKMGR_MAINPLLGRP_MPUCLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT <<
+		CLKMGR_MAINPLLGRP_MAINCLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_DBGATCLK_CNT <<
+		CLKMGR_MAINPLLGRP_DBGATCLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_MAINQSPICLK_CNT <<
+		CLKMGR_MAINPLLGRP_MAINQSPICLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_MAINNANDSDMMCCLK_CNT <<
+		CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CNT <<
+		CLKMGR_MAINPLLGRP_CFGS2FUSER0CLK_CNT_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L3MPCLK <<
+		CLKMGR_MAINPLLGRP_MAINDIV_L3MPCLK_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK <<
+		CLKMGR_MAINPLLGRP_MAINDIV_L3SPCLK_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L4MPCLK <<
+		CLKMGR_MAINPLLGRP_MAINDIV_L4MPCLK_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_MAINDIV_L4SPCLK <<
+		CLKMGR_MAINPLLGRP_MAINDIV_L4SPCLK_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGATCLK <<
+		CLKMGR_MAINPLLGRP_DBGDIV_DBGATCLK_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGCLK <<
+		CLKMGR_MAINPLLGRP_DBGDIV_DBGCLK_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK <<
+		CLKMGR_MAINPLLGRP_TRACEDIV_TRACECLK_OFFSET),
+	(CONFIG_HPS_MAINPLLGRP_L4SRC_L4MP <<
+		CLKMGR_MAINPLLGRP_L4SRC_L4MP_OFFSET) |
+	(CONFIG_HPS_MAINPLLGRP_L4SRC_L4SP <<
+		CLKMGR_MAINPLLGRP_L4SRC_L4SP_OFFSET),
+
+	/* peripheral group */
+	PERI_VCO_BASE,
+	(CONFIG_HPS_PERPLLGRP_EMAC0CLK_CNT <<
+		CLKMGR_PERPLLGRP_EMAC0CLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_EMAC1CLK_CNT <<
+		CLKMGR_PERPLLGRP_EMAC1CLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT <<
+		CLKMGR_PERPLLGRP_PERQSPICLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_PERNANDSDMMCCLK_CNT <<
+		CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_PERBASECLK_CNT <<
+		CLKMGR_PERPLLGRP_PERBASECLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_S2FUSER1CLK_CNT <<
+		CLKMGR_PERPLLGRP_S2FUSER1CLK_CNT_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_DIV_USBCLK <<
+		CLKMGR_PERPLLGRP_DIV_USBCLK_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_DIV_SPIMCLK <<
+		CLKMGR_PERPLLGRP_DIV_SPIMCLK_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_DIV_CAN0CLK <<
+		CLKMGR_PERPLLGRP_DIV_CAN0CLK_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_DIV_CAN1CLK <<
+		CLKMGR_PERPLLGRP_DIV_CAN1CLK_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_GPIODIV_GPIODBCLK <<
+		CLKMGR_PERPLLGRP_GPIODIV_GPIODBCLK_OFFSET),
+	(CONFIG_HPS_PERPLLGRP_SRC_QSPI <<
+		CLKMGR_PERPLLGRP_SRC_QSPI_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_SRC_NAND <<
+		CLKMGR_PERPLLGRP_SRC_NAND_OFFSET) |
+	(CONFIG_HPS_PERPLLGRP_SRC_SDMMC <<
+		CLKMGR_PERPLLGRP_SRC_SDMMC_OFFSET),
+
+	/* sdram pll group */
+	SDR_VCO_BASE,
+	(CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_PHASE <<
+		CLKMGR_SDRPLLGRP_DDRDQSCLK_PHASE_OFFSET) |
+	(CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_CNT <<
+		CLKMGR_SDRPLLGRP_DDRDQSCLK_CNT_OFFSET),
+	(CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_PHASE <<
+		CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_OFFSET) |
+	(CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT <<
+		CLKMGR_SDRPLLGRP_DDR2XDQSCLK_CNT_OFFSET),
+	(CONFIG_HPS_SDRPLLGRP_DDRDQCLK_PHASE <<
+		CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_OFFSET) |
+	(CONFIG_HPS_SDRPLLGRP_DDRDQCLK_CNT <<
+		CLKMGR_SDRPLLGRP_DDRDQCLK_CNT_OFFSET),
+	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_PHASE <<
+		CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
+	(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
+		CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
+
+	/* altera group */
+	CONFIG_HPS_ALTERAGRP_MPUCLK,
+};
+
+/* Wrap SDRAM config */
+static const struct socfpga_sdram_config sdram_config = {
+	.ctrl_cfg =
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<
+			SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<
+			SDR_CTRLGRP_CTRLCFG_MEMBL_LSB)			|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<
+			SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN <<
+			SDR_CTRLGRP_CTRLCFG_ECCEN_LSB)			|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN <<
+			SDR_CTRLGRP_CTRLCFG_ECCCORREN_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN <<
+			SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<
+			SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<
+			SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<
+			SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),
+	.dram_timing1 =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<
+			SDR_CTRLGRP_DRAMTIMING1_TCWL_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL <<
+			SDR_CTRLGRP_DRAMTIMING1_TAL_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL <<
+			SDR_CTRLGRP_DRAMTIMING1_TCL_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<
+			SDR_CTRLGRP_DRAMTIMING1_TRRD_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW <<
+			SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<
+			SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),
+	.dram_timing2 =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI <<
+			SDR_CTRLGRP_DRAMTIMING2_TREFI_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRCD <<
+			SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP <<
+			SDR_CTRLGRP_DRAMTIMING2_TRP_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<
+			SDR_CTRLGRP_DRAMTIMING2_TWR_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR <<
+			SDR_CTRLGRP_DRAMTIMING2_TWTR_LSB),
+	.dram_timing3 =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP <<
+			SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS <<
+			SDR_CTRLGRP_DRAMTIMING3_TRAS_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC <<
+			SDR_CTRLGRP_DRAMTIMING3_TRC_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<
+			SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<
+			SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),
+	.dram_timing4 =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<
+			SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB)	|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<
+			SDR_CTRLGRP_DRAMTIMING4_PWRDOWNEXIT_LSB),
+	.lowpwr_timing =
+		(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<
+			SDR_CTRLGRP_LOWPWRTIMING_AUTOPDCYCLES_LSB)	|
+		(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<
+			SDR_CTRLGRP_LOWPWRTIMING_CLKDISABLECYCLES_LSB),
+	.dram_odt =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ <<
+			SDR_CTRLGRP_DRAMODT_READ_LSB)			|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<
+			SDR_CTRLGRP_DRAMODT_WRITE_LSB),
+	.extratime1 =
+	(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR <<
+			SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_LSB)		|
+	(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_BC <<
+			SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_BC_LSB)		|
+(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_DIFF_CHIP <<
+			SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_DIFF_LSB),
+	.dram_addrw =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<
+			SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS <<
+			SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS <<
+			SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB)		|
+		((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<
+			SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),
+	.dram_if_width =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<
+			SDR_CTRLGRP_DRAMIFWIDTH_IFWIDTH_LSB),
+	.dram_dev_width =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<
+			SDR_CTRLGRP_DRAMDEVWIDTH_DEVWIDTH_LSB),
+	.dram_intr =
+		(CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN <<
+			SDR_CTRLGRP_DRAMINTR_INTREN_LSB),
+	.lowpwr_eq =
+		(CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK <<
+			SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),
+	.static_cfg =
+		(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<
+			SDR_CTRLGRP_STATICCFG_MEMBL_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<
+			SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),
+	.ctrl_width =
+		(CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<
+			SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),
+	.cport_width =
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<
+			SDR_CTRLGRP_CPORTWIDTH_CMDPORTWIDTH_LSB),
+	.cport_wmap =
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP <<
+			SDR_CTRLGRP_CPORTWMAP_CPORTWFIFOMAP_LSB),
+	.cport_rmap =
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP <<
+			SDR_CTRLGRP_CPORTRMAP_CPORTRFIFOMAP_LSB),
+	.rfifo_cmap =
+		(CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<
+			SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),
+	.wfifo_cmap =
+		(CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<
+			SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),
+	.cport_rdwr =
+		(CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<
+			SDR_CTRLGRP_CPORTRDWR_CPORTRDWR_LSB),
+	.port_cfg =
+		(CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN <<
+			SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LSB),
+	.fpgaport_rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,
+	.fifo_cfg =
+		(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<
+			SDR_CTRLGRP_FIFOCFG_SYNCMODE_LSB)		|
+		(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_INCSYNC <<
+			SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),
+	.mp_priority =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY <<
+			SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),
+	.mp_weight0 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_0_LSB),
+	.mp_weight1 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_32_LSB) |
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB),
+	.mp_weight2 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_14_LSB),
+	.mp_weight3 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<
+			SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),
+	.mp_pacing0 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),
+	.mp_pacing1 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59_32 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD1_59_32_LSB) |
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD2_3_0_LSB),
+	.mp_pacing2 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOLD2_35_4_LSB),
+	.mp_pacing3 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<
+			SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),
+	.mp_threshold0 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<
+			SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),
+	.mp_threshold1 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<
+			SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),
+	.mp_threshold2 =
+		(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 <<
+			SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LSB),
+	.phy_ctrl0 = CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,
+};
+
+static const struct socfpga_sdram_rw_mgr_config rw_mgr_config = {
+	.activate_0_and_1		= RW_MGR(ACTIVATE_0_AND_1),
+	.activate_0_and_1_wait1		= RW_MGR(ACTIVATE_0_AND_1_WAIT1),
+	.activate_0_and_1_wait2		= RW_MGR(ACTIVATE_0_AND_1_WAIT2),
+	.activate_1			= RW_MGR(ACTIVATE_1),
+	.clear_dqs_enable		= RW_MGR(CLEAR_DQS_ENABLE),
+	.guaranteed_read		= RW_MGR(GUARANTEED_READ),
+	.guaranteed_read_cont		= RW_MGR(GUARANTEED_READ_CONT),
+	.guaranteed_write		= RW_MGR(GUARANTEED_WRITE),
+	.guaranteed_write_wait0		= RW_MGR(GUARANTEED_WRITE_WAIT0),
+	.guaranteed_write_wait1		= RW_MGR(GUARANTEED_WRITE_WAIT1),
+	.guaranteed_write_wait2		= RW_MGR(GUARANTEED_WRITE_WAIT2),
+	.guaranteed_write_wait3		= RW_MGR(GUARANTEED_WRITE_WAIT3),
+	.idle				= RW_MGR(IDLE),
+	.idle_loop1			= RW_MGR(IDLE_LOOP1),
+	.idle_loop2			= RW_MGR(IDLE_LOOP2),
+	.init_reset_0_cke_0		= RW_MGR(INIT_RESET_0_CKE_0),
+	.init_reset_1_cke_0		= RW_MGR(INIT_RESET_1_CKE_0),
+	.lfsr_wr_rd_bank_0		= RW_MGR(LFSR_WR_RD_BANK_0),
+	.lfsr_wr_rd_bank_0_data		= RW_MGR(LFSR_WR_RD_BANK_0_DATA),
+	.lfsr_wr_rd_bank_0_dqs		= RW_MGR(LFSR_WR_RD_BANK_0_DQS),
+	.lfsr_wr_rd_bank_0_nop		= RW_MGR(LFSR_WR_RD_BANK_0_NOP),
+	.lfsr_wr_rd_bank_0_wait		= RW_MGR(LFSR_WR_RD_BANK_0_WAIT),
+	.lfsr_wr_rd_bank_0_wl_1		= RW_MGR(LFSR_WR_RD_BANK_0_WL_1),
+	.lfsr_wr_rd_dm_bank_0		= RW_MGR(LFSR_WR_RD_DM_BANK_0),
+	.lfsr_wr_rd_dm_bank_0_data	= RW_MGR(LFSR_WR_RD_DM_BANK_0_DATA),
+	.lfsr_wr_rd_dm_bank_0_dqs	= RW_MGR(LFSR_WR_RD_DM_BANK_0_DQS),
+	.lfsr_wr_rd_dm_bank_0_nop	= RW_MGR(LFSR_WR_RD_DM_BANK_0_NOP),
+	.lfsr_wr_rd_dm_bank_0_wait	= RW_MGR(LFSR_WR_RD_DM_BANK_0_WAIT),
+	.lfsr_wr_rd_dm_bank_0_wl_1	= RW_MGR(LFSR_WR_RD_DM_BANK_0_WL_1),
+	.mrs0_dll_reset			= RW_MGR(MRS0_DLL_RESET),
+	.mrs0_dll_reset_mirr		= RW_MGR(MRS0_DLL_RESET_MIRR),
+	.mrs0_user			= RW_MGR(MRS0_USER),
+	.mrs0_user_mirr			= RW_MGR(MRS0_USER_MIRR),
+	.mrs1				= RW_MGR(MRS1),
+	.mrs1_mirr			= RW_MGR(MRS1_MIRR),
+	.mrs2				= RW_MGR(MRS2),
+	.mrs2_mirr			= RW_MGR(MRS2_MIRR),
+	.mrs3				= RW_MGR(MRS3),
+	.mrs3_mirr			= RW_MGR(MRS3_MIRR),
+	.precharge_all			= RW_MGR(PRECHARGE_ALL),
+	.read_b2b			= RW_MGR(READ_B2B),
+	.read_b2b_wait1			= RW_MGR(READ_B2B_WAIT1),
+	.read_b2b_wait2			= RW_MGR(READ_B2B_WAIT2),
+	.refresh_all			= RW_MGR(REFRESH_ALL),
+	.rreturn			= RW_MGR(RETURN),
+	.sgle_read			= RW_MGR(SGLE_READ),
+	.zqcl				= RW_MGR(ZQCL),
+
+	.true_mem_data_mask_width	= RW_MGR_TRUE_MEM_DATA_MASK_WIDTH,
+	.mem_address_mirroring		= RW_MGR_MEM_ADDRESS_MIRRORING,
+	.mem_data_mask_width		= RW_MGR_MEM_DATA_MASK_WIDTH,
+	.mem_data_width			= RW_MGR_MEM_DATA_WIDTH,
+	.mem_dq_per_read_dqs		= RW_MGR_MEM_DQ_PER_READ_DQS,
+	.mem_dq_per_write_dqs		= RW_MGR_MEM_DQ_PER_WRITE_DQS,
+	.mem_if_read_dqs_width		= RW_MGR_MEM_IF_READ_DQS_WIDTH,
+	.mem_if_write_dqs_width		= RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
+	.mem_number_of_cs_per_dimm	= RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM,
+	.mem_number_of_ranks		= RW_MGR_MEM_NUMBER_OF_RANKS,
+	.mem_virtual_groups_per_read_dqs =
+		RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS,
+	.mem_virtual_groups_per_write_dqs =
+		RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS,
+};
+
+static const struct socfpga_sdram_io_config io_config = {
+	.delay_per_dchain_tap		= IO_DELAY_PER_DCHAIN_TAP,
+	.delay_per_dqs_en_dchain_tap	= IO_DELAY_PER_DQS_EN_DCHAIN_TAP,
+	.delay_per_opa_tap_lo		= IO_DELAY_PER_OPA_TAP & 0xff,
+	.delay_per_opa_tap_hi		= (IO_DELAY_PER_OPA_TAP << 8) & 0xff,
+	.dll_chain_length		= IO_DLL_CHAIN_LENGTH,
+	.dqdqs_out_phase_max		= IO_DQDQS_OUT_PHASE_MAX,
+	.dqs_en_delay_max		= IO_DQS_EN_DELAY_MAX,
+	.dqs_en_delay_offset		= IO_DQS_EN_DELAY_OFFSET,
+	.dqs_en_phase_max		= IO_DQS_EN_PHASE_MAX,
+	.dqs_in_delay_max		= IO_DQS_IN_DELAY_MAX,
+	.dqs_in_reserve			= IO_DQS_IN_RESERVE,
+	.dqs_out_reserve		= IO_DQS_OUT_RESERVE,
+	.io_in_delay_max		= IO_IO_IN_DELAY_MAX,
+	.io_out1_delay_max		= IO_IO_OUT1_DELAY_MAX,
+	.io_out2_delay_max		= IO_IO_OUT2_DELAY_MAX,
+	.shift_dqs_en_when_shift_dqs	= IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS,
+};
+
+static const struct socfpga_sdram_misc_config misc_config = {
+	.afi_rate_ratio			= AFI_RATE_RATIO,
+	.calib_lfifo_offset		= CALIB_LFIFO_OFFSET,
+	.calib_vfifo_offset		= CALIB_VFIFO_OFFSET,
+	.enable_super_quick_calibration	= ENABLE_SUPER_QUICK_CALIBRATION,
+	.max_latency_count_width	= MAX_LATENCY_COUNT_WIDTH,
+	.read_valid_fifo_size		= READ_VALID_FIFO_SIZE,
+	.reg_file_init_seq_signature_ll	= REG_FILE_INIT_SEQ_SIGNATURE & 0xff,
+	.reg_file_init_seq_signature_lh	= (REG_FILE_INIT_SEQ_SIGNATURE >> 8) & 0xff,
+	.reg_file_init_seq_signature_hl	= (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,
+	.reg_file_init_seq_signature_hh	= (REG_FILE_INIT_SEQ_SIGNATURE >> 24) & 0xff,
+	.tinit_cntr0_val		= TINIT_CNTR0_VAL,
+	.tinit_cntr1_val		= TINIT_CNTR1_VAL,
+	.tinit_cntr2_val		= TINIT_CNTR2_VAL,
+	.treset_cntr0_val		= TRESET_CNTR0_VAL,
+	.treset_cntr1_val		= TRESET_CNTR1_VAL,
+	.treset_cntr2_val		= TRESET_CNTR2_VAL,
+};
+
+static void print_hdr(void)
+{
+	printf(handoff_dtsi_hdr);
+}
+
+static void print_clkmgr_base(void)
+{
+	const char handoff_dtsi_clkmgr_base[] =
+		"\n"
+		"&osc1 {\n"
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC1_HZ */
+		"};\n"
+		"\n"
+		"&osc2 {\n"
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC2_HZ */
+		"};\n"
+		"\n"
+		"&f2s_periph_ref_clk {\n"
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_PER_REF_HZ */
+		"};\n"
+		"\n"
+		"&f2s_sdram_ref_clk {\n"
+		"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_SDR_REF_HZ */
+		"};\n";
+
+	printf(handoff_dtsi_clkmgr_base, CONFIG_HPS_CLK_OSC1_HZ,
+	       CONFIG_HPS_CLK_OSC2_HZ, CONFIG_HPS_CLK_F2S_PER_REF_HZ,
+	       CONFIG_HPS_CLK_F2S_SDR_REF_HZ);
+}
+
+/*
+ * dtc stores u32 array big endian but we load them raw and expect them to be in
+ * little endian format. To prevent this tool to depend on host endianess, do
+ * the switch manually, not via 'htonl'.
+ */
+static u32 swap_bytes(u32 val)
+{
+	return (val << 24) | ((val & 0xFF00ul) << 8) |
+		((val & 0xFF0000ul) >> 8) | (val >> 24);
+}
+
+static void print_array_ulong(const unsigned long *arr, size_t arr_size,
+			      size_t el_per_line, const char *indent1,
+			      const char *name, const char *indent_next)
+{
+	size_t i;
+
+	printf("%s%s = <", indent1, name);
+	for (i = 0; i < arr_size; i++) {
+		printf("0x%08x", swap_bytes((u32)arr[i]));
+		if (i + 1 < arr_size) {
+			if (i % el_per_line == (el_per_line - 1)) {
+				printf("\n%s", indent_next);
+			} else {
+				printf(" ");
+			}
+		}
+	}
+	printf(">;\n");
+}
+
+#ifdef USE_QUARTUS_OUTPUT
+static void print_array_sysmgrinit(const unsigned long *arr, size_t arr_size,
+				   const char *indent1, const char *name,
+				   const char *indent_next)
+{
+	size_t i;
+
+	printf("%s%s = [", indent1, name);
+	for (i = 0; i < arr_size; i++) {
+		printf("%02x", (u8)arr[i]);
+		if (i + 1 < arr_size) {
+			if (i % 8 == 7) {
+				printf("\n%s", indent_next);
+			} else {
+				printf(" ");
+			}
+		}
+	}
+	printf("];\n");
+}
+#define print_array_alt_u32 print_array_ulong
+#else
+#define print_array_sysmgrinit(arr, sz, ind1, n, ind2) print_array_u8(arr, sz, 8, ind1, n, ind2)
+#define print_array_alt_u32 print_array_u32
+#endif
+
+static void print_array_u32(const u32 *arr, size_t arr_size,
+			    size_t el_per_line, const char *indent1,
+			    const char *name, const char *indent_next)
+{
+	size_t i;
+
+	printf("%s%s = <", indent1, name);
+	for (i = 0; i < arr_size; i++) {
+		printf("0x%08x", swap_bytes(arr[i]));
+		if (i + 1 < arr_size) {
+			if (i % el_per_line == (el_per_line - 1)) {
+				printf("\n%s", indent_next);
+			} else {
+				printf(" ");
+			}
+		}
+	}
+	printf(">;\n");
+}
+
+static void print_array_u8(const u8 *arr, size_t arr_size, size_t el_per_line,
+			   const char *indent1, const char *name,
+			   const char *indent_next)
+{
+	size_t i;
+
+	printf("%s%s = [", indent1, name);
+	for (i = 0; i < arr_size; i++) {
+		printf("%02x", arr[i]);
+		if (i + 1 < arr_size) {
+			if (i % el_per_line == (el_per_line - 1)) {
+				printf("\n%s", indent_next);
+			} else {
+				printf(" ");
+			}
+		}
+	}
+	printf("];\n");
+}
+
+
+static void print_clkmgr_cfg(void)
+{
+	const char handoff_dtsi_clkmgr_cfg_a[] =
+		"\n"
+		"&clkmgr {\n";
+	const char handoff_dtsi_clkmgr_cfg_b[] = "};\n";
+	const char clk_mgr_cfg_indent[] = "\t\t\t    ";
+
+	printf(handoff_dtsi_clkmgr_cfg_a);
+	print_array_u32((const u32 *)&cm_default, sizeof(cm_default)/4, 4, "\t",
+			"altr,clk-mgr-cfg", clk_mgr_cfg_indent);
+	printf(handoff_dtsi_clkmgr_cfg_b);
+}
+
+static void print_sysmgr(void)
+{
+	const char handoff_dtsi_sysmgr_begin[] =
+		"\n"
+		"&sysmgr {\n";
+	const char handoff_dtsi_sysmgr_end[] = "};\n";
+	const char sysmgr_cfg_indent[] = "\t\t\t\t\t";
+	size_t i;
+
+	printf(handoff_dtsi_sysmgr_begin);
+
+	/* sys_mgr_init_table is an u8 table */
+	print_array_sysmgrinit(sys_mgr_init_table, ARRAY_SIZE(sys_mgr_init_table),
+			       "\t", "altr,pinmux-cfg","\t\t\t   ");
+	/* ioscr scan chain table 0 */
+	print_array_ulong(iocsr_scan_chain0_table,
+			  ARRAY_SIZE(iocsr_scan_chain0_table), 4,
+			  "\t", "altr,iocsr-scan-chain0-table",
+			  sysmgr_cfg_indent);
+	/* ioscr scan chain table 0 */
+	print_array_ulong(iocsr_scan_chain1_table,
+			  ARRAY_SIZE(iocsr_scan_chain1_table), 4,
+			  "\t", "altr,iocsr-scan-chain1-table",
+			  sysmgr_cfg_indent);
+	/* ioscr scan chain table 0 */
+	print_array_ulong(iocsr_scan_chain2_table,
+			  ARRAY_SIZE(iocsr_scan_chain2_table), 4,
+			  "\t", "altr,iocsr-scan-chain2-table",
+			  sysmgr_cfg_indent);
+	/* ioscr scan chain table 0 */
+	print_array_ulong(iocsr_scan_chain3_table,
+			  ARRAY_SIZE(iocsr_scan_chain3_table), 4,
+			  "\t", "altr,iocsr-scan-chain3-table",
+			  sysmgr_cfg_indent);
+	printf(handoff_dtsi_sysmgr_end);
+}
+
+static void print_sdram_cfg(void)
+{
+	const char handoff_dtsi_sdram_cfg_begin[] =
+		"\n"
+		"&sdr {\n";
+	const char handoff_dtsi_sdram_cfg_end[] = "};\n";
+
+	printf(handoff_dtsi_sdram_cfg_begin);
+	print_array_u32((const u32 *)&sdram_config, sizeof(sdram_config)/4, 4,
+			"\t", "altr,sdr-cfg", "\t\t\t");
+	print_array_u8((const u8 *)&rw_mgr_config, sizeof(rw_mgr_config), 8,
+			"\t", "altr,sdr-rw-mgr-cfg", "\t\t\t       ");
+	print_array_u8((const u8 *)&io_config, sizeof(io_config), 8,
+			"\t", "altr,sdr-io-cfg", "\t\t\t   ");
+	print_array_u8((const u8 *)&misc_config, sizeof(misc_config), 8,
+			"\t", "altr,sdr-misc-cfg", "\t\t\t     ");
+	print_array_alt_u32(ac_rom_init, ARRAY_SIZE(ac_rom_init), 4,
+			"\t", "altr,sdr-ac-rom-init", "\t\t\t\t");
+	print_array_alt_u32(inst_rom_init, ARRAY_SIZE(inst_rom_init), 4,
+			"\t", "altr,sdr-inst-rom-init", "\t\t\t\t  ");
+	printf(handoff_dtsi_sdram_cfg_end);
+}
+
+int main(void)
+{
+	print_hdr();
+	print_clkmgr_base();
+	print_clkmgr_cfg();
+	print_sysmgr();
+	print_sdram_cfg();
+}
arch/arm/mach-socfpga/qts-to-handoff.sh new file +83 -0
new file mode 100755
index 0000000000..b9032a5411
@@ -0,0 +1,83 @@
+#!/bin/sh
+# This script converts Quartus handoff files (in Quartus or U-Boot format)
+# to a handoff.dtsi file.
+
+
+usage() {
+	MY_BASENAME=`basename $0`
+	echo "${MY_BASENAME} [soc_type] [input_qts_dir] [input_bsp_dir] [output_file]"
+	echo " or"
+	echo "${MY_BASENAME} 'u-boot' [uboot_qts_dir] [output_file]"
+	echo ""
+	echo "Process QTS-generated headers into handoff.dtsi:"
+	echo ""
+	echo "  soc_type      - Type of SoC, either 'cyclone5' or 'arria5'."
+	echo "  input_qts_dir - Directory with compiled Quartus project"
+	echo "                  and containing the Quartus project file (QPF)."
+	echo "  input_bsp_dir - Directory with generated bsp containing"
+	echo "                  the settings.bsp file."
+	echo "  output_file   - Full filename to store the handoff dtsi file."
+	echo "  uboot_qts_dir - board/qts directory if input files are in"
+	echo "                  'old-style' U-Boot format."
+	echo ""
+}
+
+soc="$1"
+
+HANDOFF_TEMPLATE="`dirname $0`/create_handoff_gen5.c"
+
+case "$soc" in
+"cyclone5"|"arria5")
+	if [ "$#" -ne 4 ] ; then
+		usage
+		exit 1
+	fi
+	in_qts_dir="$2"
+	in_bsp_dir="$3"
+	output_file="$4"
+	out_dir=`dirname ${output_file}`
+
+	if [ ! -d "${in_qts_dir}" -o ! -d "${in_bsp_dir}" -o \
+		! -d "${out_dir}" -o -z "${soc}" ] ; then
+		usage
+		exit 3
+	fi
+
+	if [ "$soc" = "cyclone5" ] ; then
+		CMDLINE_DEFINES="-DCYCLONE5"
+	else
+		CMDLINE_DEFINES="-DARRIA5"
+	fi
+	CMDLINE_DEFINES="${CMDLINE_DEFINES} -DUSE_QUARTUS_OUTPUT -I${in_bsp_dir}/generated/"
+	for d in ${in_qts_dir}/hps_isw_handoff/*/ ; do
+		CMDLINE_DEFINES="${CMDLINE_DEFINES} -I$d"
+	done
+	;;
+"u-boot")
+	if [ "$#" -ne 3 ] ; then
+		usage
+		exit 1
+	fi
+	in_qts_dir="$2"
+	output_file="$3"
+	out_dir=`dirname ${output_file}`
+
+	if [ ! -d "${in_qts_dir}" -o ! -d "${out_dir}" ] ; then
+		usage
+		exit 3
+	fi
+
+	CMDLINE_DEFINES="-I${in_qts_dir}"
+	;;
+*)
+	usage
+	exit 1
+	;;
+esac
+
+# compile
+gcc ${CMDLINE_DEFINES} ${HANDOFF_TEMPLATE} -o ${out_dir}/create_handoff_gen5
+${out_dir}/create_handoff_gen5 > ${output_file}
+
+# TODO: remove tmp file:
+#rm $${out_dir}/create_handoff_gen5
#13 lore raw

RFC PATCH v2 8/18 socfpga: gen5: add new tool to create handoff dtsi files

Quoted 17 lines · Simon Goldschmidt

Am 23.10.2019 um 18:03 schrieb Dalon L Westergreen:

Quoted 7 lines · Simon Goldschmidt
Quoted 6 lines

Dalon L Westergreen <[email protected] <mailto:
dalon.westergreen at linux.intel.com>> schrieb am Di., 22. Okt. 2019, 19:10:

Quoted 3 lines

I mentioned this before, it would be great to not rely on the generated filesand do this based purely on the handoff data generated during a quartusbuild. Did you look at the python source i pointed you to?

Quoted 8 lines
Quoted 3 lines

No, not yet. But I don't think that will be a problem. I sent this series mainly to discuss the dts format (boardspecific handoff dtsi vs genetic dtsi plus boardspecific header file).

The board specific dtsi does look cleaner, but i do like the simplicity of generating the header in arria10.
I could easily replicate what you do, generate the header, and use it to create the dtsi.

Quoted 8 lines

I'm not too fond myself of that tool I created, as it requires you to have a compiler. I just was too lazy write a script for that.
However, I would prefer having a script that does it. And if the sources are quartus output files instead of existing qts files, my tool doesn't work any more, anway.
So I think we should come up with a script (e.g. sh or py) that parses quartus output and creates a handoff dtsi (without a header). We'll only need something different for converting existing qts files then...

In that case, i would stick with adding a .h file along with a common handoff dtsi as i didin the a10 filter script i sent the other week. I would suggest your source is perfectfor migrating existing c5/a5 platforms.
Is there a preference for python? It would fit nicely b/c we could re-use the codeI pointed out previously for binary parsing.
Dinh, Marek, Ley Foon, comments?
--dalon

Quoted 493 lines

Regards,Simon

Quoted 492 lines

--dalon

Quoted 491 lines

I still favor boardspecific handoff dtsi, but I would like to use the same style for all socfpga flavours.
Plus this tool is required to convert existing boards where we don't have the quartus project files at hand.
Regards,Simon

Quoted 486 lines

--dalon

Quoted 484 lines · Simon Goldschmidt

This new tool converts handoff information from quartus to "*_handoff.dtsi"devicetree files. This is in preparation to move from ad-hoc code in archthat parses the 'qts' header files to drivers parsing the same informationfrom devicetree.
Converting existing U-Boot 'qts' files is also supported.

<mailto:[email protected]>
---
Changes in v2: None

  arch/arm/mach-socfpga/create_handoff_gen5.c | 660

++++++++++++++++++++ arch/arm/mach-socfpga/qts-to-
handoff.sh | 83 +++ 2 files changed, 743 insertions(+) create
mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh

(quoted diff) +0 -0

b/arch/arm/mach-socfpga/create_handoff_gen5.cnew file mode 100644index 0000000000..6ec436719d--- /dev/null+++ b/arch/arm/mach- socfpga/create_handoff_gen5.c@@ -0,0 +1,660 @@+// SPDX-License-
Identifier: GPL-2.0+/*+ * This is a host-tool that needs to be compiled per board and prints the+ * handoff.dtsi to stdout.+ */++#include <stdio.h>+#include <stdint.h>++/* Define kernel types */+typedef uint8_t u8;+typedef uint32_t u32;++#ifdef USE_QUARTUS_OUTPUT+#ifdef ARRIA5+#include "iocsr_config_arria5.c"+#include "pinmux_config_arria5.c"+#else+#include "iocsr_config_cyclone5.c"+#include "pinmux_config_cyclone5.c"+#endif+#include "pll_config.h"+#include "sdram/sdram_config.h"+#include "sequencer_auto.h"+#include "sequencer_defines.h"+#include "sequencer_auto_ac_init.c"+#include "sequencer_auto_inst_init.c"+#define RW_MGR(x) __RW_MGR_##x+#else+#define RW_MGR(x) RW_MGR_##x+#include <iocsr_config.h>+#include <pinmux_config.h>+#include <pll_config.h>+#include <sdram_config.h>+#endif++#include "include/mach/clock_manager_gen5.h"+#include "include/mach/sdram_gen5.h"++#ifndef ARRAY_SIZE+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))+#endif++const char handoff_dtsi_hdr[] =+
"// SPDX-License-Identifier: GPL-2.0\n"+ "/*\n"+ " *<auto-
generated>\n"+ " * This code was generated by a tool
based on\n"+ " * handoffs from both Qsys and Quartus.\n"+
" *\n"+ " * Changes to this file may be lost if\n"+ " *
the code is regenerated.\n"+ " *</auto-generated>\n"+ " */\n";++/*
Wrap PLL config */++#define MAIN_VCO_BASE (
\+ (CONFIG_HPS_MAINPLLGRP_VCO_DENOM << \+
CLKMGR_MAINPLLGRP_VCO_DENOM_OFFSET) | \+ (CONFIG_HPS_MAINPLLGRP
_VCO_NUMER << \+ CLKMGR_MAINPLLGRP_VCO_NUMER_OF
FSET) \+ )++#define PERI_VCO_BASE (

	\+	(CONFIG_HPS_PERPLLGRP_VCO_PSRC <<		\+	
	CLKMGR_PERPLLGRP_VCO_PSRC_OFFSET) |	\+	(CONFIG_HPS_PE
RPLLGRP_VCO_DENOM <<		\+		CLKMGR_PERPLLGRP_VCO_D
ENOM_OFFSET) |	\+	(CONFIG_HPS_PERPLLGRP_VCO_NUMER <<	
	\+		CLKMGR_PERPLLGRP_VCO_NUMER_OFFSET)	\+	

)++#define SDR_VCO_BASE ( \+
(CONFIG_HPS_SDRPLLGRP_VCO_SSRC << \+ CLKMGR
_SDRPLLGRP_VCO_SSRC_OFFSET) | \+ (CONFIG_HPS_SDRPLLGRP_VCO_DENO
M << \+ CLKMGR_SDRPLLGRP_VCO_DENOM_OFFSET) |
\+ (CONFIG_HPS_SDRPLLGRP_VCO_NUMER << \+
CLKMGR_SDRPLLGRP_VCO_NUMER_OFFSET) \+ )++static const struct
cm_config cm_default = {+ /* main group */+ MAIN_VCO_BASE,+ (CONFI
G_HPS_MAINPLLGRP_MPUCLK_CNT <<+ CLKMGR_MAINPLLGRP_MPUCLK
_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT <<+
CLKMGR_MAINPLLGRP_MAINCLK_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_D
BGATCLK_CNT <<+ CLKMGR_MAINPLLGRP_DBGATCLK_CNT_OFFSET),+
(CONFIG_HPS_MAINPLLGRP_MAINQSPICLK_CNT <<+ CLKMGR
_MAINPLLGRP_MAINQSPICLK_CNT_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_MAINNANDS
DMMCCLK_CNT <<+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFF
SET),+ (CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CNT <<+
CLKMGR_MAINPLLGRP_CFGS2FUSER0CLK_CNT_OFFSET),+ (CONFIG_HPS_MAIN
PLLGRP_MAINDIV_L3MPCLK <<+ CLKMGR_MAINPLLGRP_MAINDIV_L3MPCL
K_OFFSET) |+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK <<+
CLKMGR_MAINPLLGRP_MAINDIV_L3SPCLK_OFFSET) |+ (CONFIG_HPS_MAINPLLGRP_M
AINDIV_L4MPCLK <<+ CLKMGR_MAINPLLGRP_MAINDIV_L4MPCLK_OFFSET
) |+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L4SPCLK <<+ CLKMGR
_MAINPLLGRP_MAINDIV_L4SPCLK_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_DBGDIV_DB
GATCLK <<+ CLKMGR_MAINPLLGRP_DBGDIV_DBGATCLK_OFFSET) |+
(CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGCLK <<+ CLKMGR_MAINPLLGR
P_DBGDIV_DBGCLK_OFFSET),+ (CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK
<<+ CLKMGR_MAINPLLGRP_TRACEDIV_TRACECLK_OFFSET),+ (CONFI
G_HPS_MAINPLLGRP_L4SRC_L4MP <<+ CLKMGR_MAINPLLGRP_L4SRC_
L4MP_OFFSET) |+ (CONFIG_HPS_MAINPLLGRP_L4SRC_L4SP <<+
CLKMGR_MAINPLLGRP_L4SRC_L4SP_OFFSET),++ /* peripheral group */+
PERI_VCO_BASE,+ (CONFIG_HPS_PERPLLGRP_EMAC0CLK_CNT <<+
CLKMGR_PERPLLGRP_EMAC0CLK_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_EM
AC1CLK_CNT <<+ CLKMGR_PERPLLGRP_EMAC1CLK_CNT_OFFSET),+
(CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT <<+ CLKMGR_PERPLLGRP
_PERQSPICLK_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_PERNANDSDMMCCLK_CN
T <<+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),+ (CONFI
G_HPS_PERPLLGRP_PERBASECLK_CNT <<+ CLKMGR_PERPLLGRP_PERBASE
CLK_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_S2FUSER1CLK_CNT <<+
CLKMGR_PERPLLGRP_S2FUSER1CLK_CNT_OFFSET),+ (CONFIG_HPS_PERPLLGRP_DI
V_USBCLK <<+ CLKMGR_PERPLLGRP_DIV_USBCLK_OFFSET) |+ (CONFI
G_HPS_PERPLLGRP_DIV_SPIMCLK <<+ CLKMGR_PERPLLGRP_DIV_SPI
MCLK_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_DIV_CAN0CLK <<+
CLKMGR_PERPLLGRP_DIV_CAN0CLK_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_DI
V_CAN1CLK <<+ CLKMGR_PERPLLGRP_DIV_CAN1CLK_OFFSET),+ (CONFI
G_HPS_PERPLLGRP_GPIODIV_GPIODBCLK <<+ CLKMGR_PERPLLGRP_GPIODIV
_GPIODBCLK_OFFSET),+ (CONFIG_HPS_PERPLLGRP_SRC_QSPI <<+
CLKMGR_PERPLLGRP_SRC_QSPI_OFFSET) |+ (CONFIG_HPS_PERPLLGRP_SRC_NAND
<<+ CLKMGR_PERPLLGRP_SRC_NAND_OFFSET) |+ (CONFIG_HPS_PE
RPLLGRP_SRC_SDMMC <<+ CLKMGR_PERPLLGRP_SRC_SDMMC_OFFSET),++
/* sdram pll group */+ SDR_VCO_BASE,+ (CONFIG_HPS_SDRPLLGRP_
DDRDQSCLK_PHASE <<+ CLKMGR_SDRPLLGRP_DDRDQSCLK_PHASE_OFFSET)
|+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_CNT <<+ CLKMGR_SDRPLLG
RP_DDRDQSCLK_CNT_OFFSET),+ (CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_PHASE
<<+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_OFFSET) |+ (CONFI
G_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT <<+ CLKMGR_SDRPLLGRP_DDR2XDQ
SCLK_CNT_OFFSET),+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_PHASE <<+
CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_OFFSET) |+ (CONFIG_HPS_SDRPLLGRP_DD
RDQCLK_CNT <<+ CLKMGR_SDRPLLGRP_DDRDQCLK_CNT_OFFSET),+
(CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_PHASE <<+ CLKMGR_SDRPLLGRP
_S2FUSER2CLK_PHASE_OFFSET) |+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT
<<+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),++ /*
altera group */+ CONFIG_HPS_ALTERAGRP_MPUCLK,+};++/* Wrap SDRAM
config */+static const struct socfpga_sdram_config sdram_config = {+
.ctrl_cfg =+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<+
SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<+ SDR_CTRL
GRP_CTRLCFG_MEMBL_LSB) |+ (CONFI
G_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<+ SDR_CTRL
GRP_CTRLCFG_ADDRORDER_LSB) |+ (CONFIG_HPS_SD
R_CTRLCFG_CTRLCFG_ECCEN <<+ SDR_CTRLGRP_CTRLCFG_ECCE
N_LSB) |+ (CONFIG_HPS_SDR_CTRLCF
G_CTRLCFG_ECCCORREN <<+ SDR_CTRLGRP_CTRLCFG_ECCC
ORREN_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCF
G_REORDEREN <<+ SDR_CTRLGRP_CTRLCFG_REORDEREN_LS
B) |+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVE
LIMIT <<+ SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB)

	|+		(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<+	
		SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB)		|+		

(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<+ SDR_CTRL
GRP_CTRLCFG_NODMPINS_LSB),+ .dram_timing1 =+ (CONFIG_HPS_SD
R_CTRLCFG_DRAMTIMING1_TCWL <<+ SDR_CTRLGRP_DRAM
TIMING1_TCWL_LSB) |+ (CONFIG_HPS_SDR_CTRLCF
G_DRAMTIMING1_AL <<+ SDR_CTRLGRP_DRAMTIMING1_TAL_LSB)

		|+		(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TC

L <<+ SDR_CTRLGRP_DRAMTIMING1_TCL_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<+
SDR_CTRLGRP_DRAMTIMING1_TRRD_LSB) |+ (CONFI
G_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW <<+ SDR_CTRL
GRP_DRAMTIMING1_TFAW_LSB) |+ (CONFIG_HPS_SD
R_CTRLCFG_DRAMTIMING1_TRFC <<+ SDR_CTRLGRP_DRAM
TIMING1_TRFC_LSB),+ .dram_timing2 =+ (CONFIG_HPS_SDR_CTRLCF
G_DRAMTIMING2_IF_TREFI <<+ SDR_CTRLGRP_DRAMTIMING2_
TREFI_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTI
MING2_IF_TRCD <<+ SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB
) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF
_TRP <<+ SDR_CTRLGRP_DRAMTIMING2_TRP_LSB)
|+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<+

	SDR_CTRLGRP_DRAMTIMING2_TWR_LSB)		|+		(CONFI

G_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR <<+ SDR_CTRL
GRP_DRAMTIMING2_TWTR_LSB),+ .dram_timing3 =+ (CONFIG_HPS_SD
R_CTRLCFG_DRAMTIMING3_TRTP <<+ SDR_CTRLGRP_DRAM
TIMING3_TRTP_LSB) |+ (CONFIG_HPS_SDR_CTRLCF
G_DRAMTIMING3_TRAS <<+ SDR_CTRLGRP_DRAMTIMING3_
TRAS_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTI
MING3_TRC <<+ SDR_CTRLGRP_DRAMTIMING3_TRC_LSB)
|+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<+

	SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB)		|+		(CONFI

G_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<+ SDR_CTRL
GRP_DRAMTIMING3_TCCD_LSB),+ .dram_timing4 =+ (CONFIG_HPS_SD
R_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<+ SDR_CTRL
GRP_DRAMTIMING4_SELFRFSHEXIT_LSB) |+ (CONFIG_HPS_SD
R_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<+ SDR_CTRLGRP_DRAM
TIMING4_PWRDOWNEXIT_LSB),+ .lowpwr_timing =+ (CONFIG_HPS_SD
R_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<+ SDR_CTRL
GRP_LOWPWRTIMING_AUTOPDCYCLES_LSB) |+ (CONFIG_HPS_SD
R_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<+ SDR_CTRL
GRP_LOWPWRTIMING_CLKDISABLECYCLES_LSB),+ .dram_odt =+
(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ <<+ SDR_CTRL
GRP_DRAMODT_READ_LSB) |+ (CONFIG_HPS_SD
R_CTRLCFG_DRAMODT_WRITE <<+ SDR_CTRLGRP_DRAMODT_WRIT
E_LSB),+ .extratime1 =+ (CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG
_EXTRA_CTL_CLK_RD_TO_WR <<+ SDR_CTRLGRP_EXTRATIME1_R
D_TO_WR_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG
_EXTRA_CTL_CLK_RD_TO_WR_BC <<+ SDR_CTRLGRP_EXTR
ATIME1_RD_TO_WR_BC_LSB) |+(CONFIG_HPS_SDR_CTRLCFG_EXTRAT
IME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_DIFF_CHIP <<+ SDR_CTRL
GRP_EXTRATIME1_RD_TO_WR_DIFF_LSB),+ .dram_addrw =+ (CONFI
G_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<+ SDR_CTRL
GRP_DRAMADDRW_COLBITS_LSB) |+ (CONFIG_HPS_SD
R_CTRLCFG_DRAMADDRW_ROWBITS <<+ SDR_CTRLGRP_DRAM
ADDRW_ROWBITS_LSB) |+ (CONFIG_HPS_SDR_CTRLCF
G_DRAMADDRW_BANKBITS <<+ SDR_CTRLGRP_DRAMADDRW_BA
NKBITS_LSB) |+ ((CONFIG_HPS_SDR_CTRLCFG_DRAMA
DDRW_CSBITS - 1) <<+ SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB
),+ .dram_if_width =+ (CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IF
WIDTH <<+ SDR_CTRLGRP_DRAMIFWIDTH_IFWIDTH_LSB),+
.dram_dev_width =+ (CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEV
WIDTH <<+ SDR_CTRLGRP_DRAMDEVWIDTH_DEVWIDTH_LSB),+
.dram_intr =+ (CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTRE
N <<+ SDR_CTRLGRP_DRAMINTR_INTREN_LSB),+ .lowpw
r_eq =+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK
<<+ SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),+ .stati
c_cfg =+ (CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<+
SDR_CTRLGRP_STATICCFG_MEMBL_LSB) |+
(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<+
SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),+ .ctrl_width =+
(CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<+
SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),+ .cport_width =+ (CONFI
G_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<+ SDR_CTRL
GRP_CPORTWIDTH_CMDPORTWIDTH_LSB),+ .cport_wmap =+ (CONFI
G_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP <<+ SDR_CTRL
GRP_CPORTWMAP_CPORTWFIFOMAP_LSB),+ .cport_rmap =+ (CONFI
G_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP <<+ SDR_CTRL
GRP_CPORTRMAP_CPORTRFIFOMAP_LSB),+ .rfifo_cmap =+ (CONFI
G_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<+ SDR_CTRL
GRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),+ .wfifo_cmap =+ (CONFI
G_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<+ SDR_CTRL
GRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),+ .cport_rdwr =+ (CONFI
G_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<+ SDR_CTRL
GRP_CPORTRDWR_CPORTRDWR_LSB),+ .port_cfg =+ (CONFI
G_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN <<+ SDR_CTRL
GRP_PORTCFG_AUTOPCHEN_LSB),+ .fpgaport_rst =
CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,+ .fifo_cfg =+ (CONFI
G_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<+ SDR_CTRL
GRP_FIFOCFG_SYNCMODE_LSB) |+ (CONFIG_HPS_SD
R_CTRLCFG_FIFOCFG_INCSYNC <<+ SDR_CTRLGRP_FIFOCFG_INCS
YNC_LSB),+ .mp_priority =+ (CONFIG_HPS_SDR_CTRLCFG_MPPRIO
RITY_USERPRIORITY <<+ SDR_CTRLGRP_MPPRIORITY_USERPRIOR
ITY_LSB),+ .mp_weight0 =+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEI
GHT_0_STATICWEIGHT_31_0 <<+ SDR_CTRLGRP_MPWEIGHT_MPW
EIGHT_0_STATICWEIGHT_31_0_LSB),+ .mp_weight1 =+ (CONFI
G_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 <<+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_32_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<+
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB),+ .mp_weig
ht2 =+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_
45_14 <<+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEI
GHTS_45_14_LSB),+ .mp_weight3 =+ (CONFIG_HPS_SDR_CTRLCF
G_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<+ SDR_CTRLGRP_MPWE
IGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),+ .mp_pacing0 =+
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<+
SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),+ .mp_paci
ng1 =+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59
_32 <<+ SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOL
D1_59_32_LSB) |+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRES
HOLD2_3_0 <<+ SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOL
D2_3_0_LSB),+ .mp_pacing2 =+ (CONFIG_HPS_SDR_CTRLCFG_MPPACI
NG_2_THRESHOLD2_35_4 <<+ SDR_CTRLGRP_MPPACING_MPP
ACING_2_THRESHOLD2_35_4_LSB),+ .mp_pacing3 =+ (CONFI
G_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<+
SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),+ .mp_threshold0
=+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYC
LES_31_0 <<+ SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRS
TCYCLES_31_0_LSB),+ .mp_threshold1 =+ (CONFIG_HPS_SDR_CTRLCF
G_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<+
SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),+ .mp_th
reshold2 =+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHO
LDRSTCYCLES_79_64 <<+ SDR_CTRLGRP_MPTHRESHOLDRST_2_THR
ESHOLDRSTCYCLES_79_64_LSB),+ .phy_ctrl0 =
CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,+};++static const struct
socfpga_sdram_rw_mgr_config rw_mgr_config = {+ .activate_0_and_
1 = RW_MGR(ACTIVATE_0_AND_1),+ .activate_0_and_1_wait
1 = RW_MGR(ACTIVATE_0_AND_1_WAIT1),+ .activate_0_an
d_1_wait2 = RW_MGR(ACTIVATE_0_AND_1_WAIT2),+ .activ
ate_1 = RW_MGR(ACTIVATE_1),+ .clear_dqs_enable
= RW_MGR(CLEAR_DQS_ENABLE),+ .guaranteed_read
= RW_MGR(GUARANTEED_READ),+ .guaranteed_read_cont =
RW_MGR(GUARANTEED_READ_CONT),+ .guaranteed_write =
RW_MGR(GUARANTEED_WRITE),+ .guaranteed_write_wait0 =
RW_MGR(GUARANTEED_WRITE_WAIT0),+ .guaranteed_write_wait1
= RW_MGR(GUARANTEED_WRITE_WAIT1),+ .guaranteed_write_wait2
= RW_MGR(GUARANTEED_WRITE_WAIT2),+ .guaranteed_write_wait3
= RW_MGR(GUARANTEED_WRITE_WAIT3),+ .idle
= RW_MGR(IDLE),+ .idle_loop1 =
RW_MGR(IDLE_LOOP1),+ .idle_loop2 =
RW_MGR(IDLE_LOOP2),+ .init_reset_0_cke_0 =
RW_MGR(INIT_RESET_0_CKE_0),+ .init_reset_1_cke_0 =
RW_MGR(INIT_RESET_1_CKE_0),+ .lfsr_wr_rd_bank_0 =
RW_MGR(LFSR_WR_RD_BANK_0),+ .lfsr_wr_rd_bank_0_data =
RW_MGR(LFSR_WR_RD_BANK_0_DATA),+ .lfsr_wr_rd_bank_0_dqs
= RW_MGR(LFSR_WR_RD_BANK_0_DQS),+ .lfsr_wr_rd_bank_0_nop
= RW_MGR(LFSR_WR_RD_BANK_0_NOP),+ .lfsr_wr_rd_bank_0_wait
= RW_MGR(LFSR_WR_RD_BANK_0_WAIT),+ .lfsr_wr_rd_bank_0_wl_1
= RW_MGR(LFSR_WR_RD_BANK_0_WL_1),+ .lfsr_wr_rd_dm_bank_0
= RW_MGR(LFSR_WR_RD_DM_BANK_0),+ .lfsr_wr_rd_dm_bank_0_data
= RW_MGR(LFSR_WR_RD_DM_BANK_0_DATA),+ .lfsr_wr_rd_dm_bank_0_dqs =
RW_MGR(LFSR_WR_RD_DM_BANK_0_DQS),+ .lfsr_wr_rd_dm_bank_0_nop =
RW_MGR(LFSR_WR_RD_DM_BANK_0_NOP),+ .lfsr_wr_rd_dm_bank_0_wait
= RW_MGR(LFSR_WR_RD_DM_BANK_0_WAIT),+ .lfsr_wr_rd_dm_bank_0_wl_1
= RW_MGR(LFSR_WR_RD_DM_BANK_0_WL_1),+ .mrs0_dll_reset
= RW_MGR(MRS0_DLL_RESET),+ .mrs0_dll_reset_mirr =
RW_MGR(MRS0_DLL_RESET_MIRR),+ .mrs0_user =
RW_MGR(MRS0_USER),+ .mrs0_user_mirr =
RW_MGR(MRS0_USER_MIRR),+ .mrs1 =
RW_MGR(MRS1),+ .mrs1_mirr =
RW_MGR(MRS1_MIRR),+ .mrs2 =
RW_MGR(MRS2),+ .mrs2_mirr =
RW_MGR(MRS2_MIRR),+ .mrs3 =
RW_MGR(MRS3),+ .mrs3_mirr =
RW_MGR(MRS3_MIRR),+ .precharge_all =
RW_MGR(PRECHARGE_ALL),+ .read_b2b =
RW_MGR(READ_B2B),+ .read_b2b_wait1 =
RW_MGR(READ_B2B_WAIT1),+ .read_b2b_wait2 =
RW_MGR(READ_B2B_WAIT2),+ .refresh_all =
RW_MGR(REFRESH_ALL),+ .rreturn = RW_MGR(RETURN),+
.sgle_read = RW_MGR(SGLE_READ),+ .zqcl

		= RW_MGR(ZQCL),++	.true_mem_data_mask_width	=

RW_MGR_TRUE_MEM_DATA_MASK_WIDTH,+ .mem_address_mirroring
= RW_MGR_MEM_ADDRESS_MIRRORING,+ .mem_data_mask_width
= RW_MGR_MEM_DATA_MASK_WIDTH,+ .mem_data_width
= RW_MGR_MEM_DATA_WIDTH,+ .mem_dq_per_read_dqs =
RW_MGR_MEM_DQ_PER_READ_DQS,+ .mem_dq_per_write_dqs =
RW_MGR_MEM_DQ_PER_WRITE_DQS,+ .mem_if_read_dqs_width =
RW_MGR_MEM_IF_READ_DQS_WIDTH,+ .mem_if_write_dqs_width
= RW_MGR_MEM_IF_WRITE_DQS_WIDTH,+ .mem_number_of_cs_per_dimm
= RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM,+ .mem_number_of_ranks
= RW_MGR_MEM_NUMBER_OF_RANKS,+ .mem_virtual_groups_per_read_dqs
=+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS,+ .mem_virtual_g
roups_per_write_dqs =+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_WR
ITE_DQS,+};++static const struct socfpga_sdram_io_config io_config =
{+ .delay_per_dchain_tap = IO_DELAY_PER_DCHAIN_TAP,+
.delay_per_dqs_en_dchain_tap = IO_DELAY_PER_DQS_EN_DCHAIN_TAP,+
.delay_per_opa_tap_lo = IO_DELAY_PER_OPA_TAP & 0xff,+ .delay
_per_opa_tap_hi = (IO_DELAY_PER_OPA_TAP << 8) & 0xff,+
.dll_chain_length = IO_DLL_CHAIN_LENGTH,+ .dqdqs_out_pha
se_max = IO_DQDQS_OUT_PHASE_MAX,+ .dqs_en_delay_
max = IO_DQS_EN_DELAY_MAX,+ .dqs_en_delay_offset
= IO_DQS_EN_DELAY_OFFSET,+ .dqs_en_phase_max =
IO_DQS_EN_PHASE_MAX,+ .dqs_in_delay_max =
IO_DQS_IN_DELAY_MAX,+ .dqs_in_reserve =
IO_DQS_IN_RESERVE,+ .dqs_out_reserve = IO_DQS_OUT_RESERVE,+

	.io_in_delay_max		= IO_IO_IN_DELAY_MAX,+	.io_ou
t1_delay_max		= IO_IO_OUT1_DELAY_MAX,+	.io_out2_delay_max	
	= IO_IO_OUT2_DELAY_MAX,+	.shift_dqs_en_when_shift_dqs	=
IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS,+};++static const struct
socfpga_sdram_misc_config misc_config = {+	.afi_rate_ratio		
	= AFI_RATE_RATIO,+	.calib_lfifo_offset		=

CALIB_LFIFO_OFFSET,+ .calib_vfifo_offset =
CALIB_VFIFO_OFFSET,+ .enable_super_quick_calibration =
ENABLE_SUPER_QUICK_CALIBRATION,+ .max_latency_count_width =
MAX_LATENCY_COUNT_WIDTH,+ .read_valid_fifo_size =
READ_VALID_FIFO_SIZE,+ .reg_file_init_seq_signature_ll =
REG_FILE_INIT_SEQ_SIGNATURE & 0xff,+ .reg_file_init_seq_signature_lh
= (REG_FILE_INIT_SEQ_SIGNATURE >> 8) & 0xff,+ .reg_file_init_seq_signa
ture_hl = (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,+ .reg_f
ile_init_seq_signature_hh = (REG_FILE_INIT_SEQ_SIGNATURE >> 24) &
0xff,+ .tinit_cntr0_val = TINIT_CNTR0_VAL,+ .tinit
_cntr1_val = TINIT_CNTR1_VAL,+ .tinit_cntr2_val

	= TINIT_CNTR2_VAL,+	.treset_cntr0_val		=

TRESET_CNTR0_VAL,+ .treset_cntr1_val = TRESET_CNTR1_VAL,+
.treset_cntr2_val = TRESET_CNTR2_VAL,+};++static void
print_hdr(void)+{+ printf(handoff_dtsi_hdr);+}++static void
print_clkmgr_base(void)+{+ const char handoff_dtsi_clkmgr_base[] =+

		"\n"+		"&osc1 {\n"+		"	clock-
frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC1_HZ */+		"};\n"+	
	"\n"+		"&osc2 {\n"+		"	clock-
frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC2_HZ */+		"};\n"+	
	"\n"+		"&f2s_periph_ref_clk {\n"+		"	
clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_PER_REF_HZ */+		
"};\n"+		"\n"+		"&f2s_sdram_ref_clk {\n"+	
	"	clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_SDR_REF_HZ

*/+ "};\n";++ printf(handoff_dtsi_clkmgr_base,
CONFIG_HPS_CLK_OSC1_HZ,+ CONFIG_HPS_CLK_OSC2_HZ,
CONFIG_HPS_CLK_F2S_PER_REF_HZ,+ CONFIG_HPS_CLK_F2S_SDR_RE
F_HZ);+}++/*+ * dtc stores u32 array big endian but we load them raw and expect them to be in+ * little endian format. To prevent this tool to depend on host endianess, do+ * the switch manually, not via
'htonl'.+ */+static u32 swap_bytes(u32 val)+{+ return (val <<
24) | ((val & 0xFF00ul) << 8) |+ ((val & 0xFF0000ul) >>
8) | (val >> 24);+}++static void print_array_ulong(const unsigned long
*arr, size_t arr_size,+ size_t
el_per_line, const char *indent1,+ const char
*name, const char *indent_next)+{+ size_t i;++ printf("%s%s =
<", indent1, name);+ for (i = 0; i < arr_size; i++) {+ printf
("0x%08x", swap_bytes((u32)arr[i]));+ if (i + 1 < arr_size) {+

			if (i % el_per_line == (el_per_line - 1)) {+	
			printf("\n%s", indent_next);+			
} else {+				printf(" ");+			

}+ }+ }+ printf(">;\n");+}++#ifdef
USE_QUARTUS_OUTPUT+static void print_array_sysmgrinit(const unsigned
long *arr, size_t arr_size,+ const char
*indent1, const char *name,+ const char
*indent_next)+{+ size_t i;++ printf("%s%s = [", indent1,
name);+ for (i = 0; i < arr_size; i++) {+ printf("%02x",
(u8)arr[i]);+ if (i + 1 < arr_size) {+ if (i
% 8 == 7) {+ printf("\n%s", indent_next);+

		} else {+				printf(" ");+		
	}+		}+	}+	printf("];\n");+}+#define

print_array_alt_u32 print_array_ulong+#else+#define print_array_sysmgrinit(arr, sz, ind1, n, ind2) print_array_u8(arr, sz, 8, ind1, n, ind2)+#define print_array_alt_u32 print_array_u32+#endif++static void print_array_u32(const u32 *arr,
size_t arr_size,+ size_t el_per_line, const
char *indent1,+ const char *name, const char
*indent_next)+{+ size_t i;++ printf("%s%s = <", indent1,
name);+ for (i = 0; i < arr_size; i++) {+ printf("0x%08x
", swap_bytes(arr[i]));+ if (i + 1 < arr_size) {+

	if (i % el_per_line == (el_per_line - 1)) {+			
	printf("\n%s", indent_next);+			} else {+	
			printf(" ");+			}+		
}+	}+	printf(">;\n");+}++static void print_array_u8(const u8

*arr, size_t arr_size, size_t el_per_line,+ const
char *indent1, const char *name,+ const char
*indent_next)+{+ size_t i;++ printf("%s%s = [", indent1,
name);+ for (i = 0; i < arr_size; i++) {+ printf("%02x",
arr[i]);+ if (i + 1 < arr_size) {+ if (i
% el_per_line == (el_per_line - 1)) {+
printf("\n%s", indent_next);+ } else {+

		printf(" ");+			}+		}+	
}+	printf("];\n");+}+++static void print_clkmgr_cfg(void)+{+	const

char handoff_dtsi_clkmgr_cfg_a[] =+ "\n"+ "&clkm
gr {\n";+ const char handoff_dtsi_clkmgr_cfg_b[] = "};\n";+ const
char clk_mgr_cfg_indent[] = "\t\t\t ";++ printf(handoff_dtsi_clkm
gr_cfg_a);+ print_array_u32((const u32 *)&cm_default,
sizeof(cm_default)/4, 4, "\t",+ "altr,clk-mgr-
cfg", clk_mgr_cfg_indent);+ printf(handoff_dtsi_clkmgr_cfg_b);+}++st
atic void print_sysmgr(void)+{+ const char
handoff_dtsi_sysmgr_begin[] =+ "\n"+ "&sysm
gr {\n";+ const char handoff_dtsi_sysmgr_end[] = "};\n";+ const
char sysmgr_cfg_indent[] = "\t\t\t\t\t";+ size_t i;++ printf
(handoff_dtsi_sysmgr_begin);++ /* sys_mgr_init_table is an u8
table */+ print_array_sysmgrinit(sys_mgr_init_table,
ARRAY_SIZE(sys_mgr_init_table),+ "\t",
"altr,pinmux-cfg","\t\t\t ");+ /* ioscr scan chain table 0 */+
print_array_ulong(iocsr_scan_chain0_table,+ ARRAY_
SIZE(iocsr_scan_chain0_table), 4,+ "\t",
"altr,iocsr-scan-chain0-table",+ sysmgr_cfg_ind
ent);+ /* ioscr scan chain table 0 */+ print_array_ulong(iocs
r_scan_chain1_table,+ ARRAY_SIZE(iocsr_scan_chain1_t
able), 4,+ "\t", "altr,iocsr-scan-chain1-table",+
sysmgr_cfg_indent);+ /* ioscr scan chain
table 0 */+ print_array_ulong(iocsr_scan_chain2_table,+

	  ARRAY_SIZE(iocsr_scan_chain2_table), 4,+			

"\t", "altr,iocsr-scan-chain2-table",+ sysmgr
_cfg_indent);+ /* ioscr scan chain table 0 */+ print_array_ul
ong(iocsr_scan_chain3_table,+ ARRAY_SIZE(iocsr_scan_
chain3_table), 4,+ "\t", "altr,iocsr-scan-chain3-
table",+ sysmgr_cfg_indent);+ printf(handoff
_dtsi_sysmgr_end);+}++static void print_sdram_cfg(void)+{+ const
char handoff_dtsi_sdram_cfg_begin[] =+ "\n"+
"&sdr {\n";+ const char handoff_dtsi_sdram_cfg_end[] = "};\n";++
printf(handoff_dtsi_sdram_cfg_begin);+ print_array_u32((const
u32 *)&sdram_config, sizeof(sdram_config)/4, 4,+
"\t", "altr,sdr-cfg", "\t\t\t");+ print_array_u8((const u8
*)&rw_mgr_config, sizeof(rw_mgr_config), 8,+ "\t",
"altr,sdr-rw-mgr-cfg", "\t\t\t ");+ print_array_u8((const u8
*)&io_config, sizeof(io_config), 8,+ "\t", "altr,sdr-
io-cfg", "\t\t\t ");+ print_array_u8((const u8 *)&misc_config,
sizeof(misc_config), 8,+ "\t", "altr,sdr-misc-
cfg", "\t\t\t ");+ print_array_alt_u32(ac_rom_init,
ARRAY_SIZE(ac_rom_init), 4,+ "\t", "altr,sdr-ac-rom-
init", "\t\t\t\t");+ print_array_alt_u32(inst_rom_init,
ARRAY_SIZE(inst_rom_init), 4,+ "\t", "altr,sdr-
inst-rom-init", "\t\t\t\t ");+ printf(handoff_dtsi_sdram_cfg_en
d);+}++int main(void)+{+ print_hdr();+ print_clkmgr_base();+
print_clkmgr_cfg();+ print_sysmgr();+ print_sdram_cfg();+}diff --git
a/arch/arm/mach-socfpga/qts-to-handoff.sh b/arch/arm/mach-socfpga/qts- to-handoff.shnew file mode 100755index 0000000000..b9032a5411--- /dev/null+++ b/arch/arm/mach-socfpga/qts-to-handoff.sh@@ -0,0 +1,83

@@+#!/bin/sh+# This script converts Quartus handoff files (in Quartus
or U-Boot format)+# to a handoff.dtsi file.+++usage() {+	MY_BASEN
AME=`basename $0`+	echo "${MY_BASENAME} [soc_type] [input_qts_dir]
[input_bsp_dir] [output_file]"+	echo " or"+	echo
"${MY_BASENAME} 'u-boot' [uboot_qts_dir] [output_file]"+	echo ""+
	echo "Process QTS-generated headers into handoff.dtsi:"+	
echo ""+	echo "  soc_type      - Type of SoC, either 'cyclone5'
or 'arria5'."+	echo "  input_qts_dir - Directory with compiled
Quartus project"+	echo "                  and containing the
Quartus project file (QPF)."+	echo "  input_bsp_dir - Directory with
generated bsp containing"+	echo "                  the settings.bsp
file."+	echo "  output_file   - Full filename to store the
handoff dtsi file."+	echo "  uboot_qts_dir - board/qts directory if
input files are in"+	echo "                  'old-style' U-Boot
format."+	echo ""+}++soc="$1"++HANDOFF_TEMPLATE="`dirname
$0`/create_handoff_gen5.c"++case "$soc" in+"cyclone5"|"arria5")+	
if [ "$#" -ne 4 ] ; then+		usage+		exit 1+	fi+	
in_qts_dir="$2"+	in_bsp_dir="$3"+	output_file="$4"+	out_di
r=`dirname ${output_file}`++	if [ ! -d "${in_qts_dir}" -o ! -d
"${in_bsp_dir}" -o \+		! -d "${out_dir}" -o -z "${soc}" ] ;
then+		usage+		exit 3+	fi++	if [ "$soc" =
"cyclone5" ] ; then+		CMDLINE_DEFINES="-DCYCLONE5"+	else+	
	CMDLINE_DEFINES="-DARRIA5"+	fi+	CMDLINE_DEFINES="${CMD
LINE_DEFINES} -DUSE_QUARTUS_OUTPUT -I${in_bsp_dir}/generated/"+	
for d in ${in_qts_dir}/hps_isw_handoff/*/ ; do+		CMDLINE_DEFINE
S="${CMDLINE_DEFINES} -I$d"+	done+	;;+"u-boot")+	if [ "$#" -ne
3 ] ; then+		usage+		exit 1+	fi+	in_qts_dir="$2
"+	output_file="$3"+	out_dir=`dirname ${output_file}`++	if [ !
-d "${in_qts_dir}" -o ! -d "${out_dir}" ] ; then+		usage+	
	exit 3+	fi++	CMDLINE_DEFINES="-I${in_qts_dir}"+	;;+*)+
	usage+	exit 1+	;;+esac++# compile+gcc ${CMDLINE_DEFINES}
${HANDOFF_TEMPLATE} -o
${out_dir}/create_handoff_gen5+${out_dir}/create_handoff_gen5 >
${output_file}++# TODO: remove tmp file:+#rm
$${out_dir}/create_handoff_gen5
#14 lore raw

RFC PATCH v2 8/18 socfpga: gen5: add new tool to create handoff dtsi files

Quoted 67 lines · Dalon L Westergreen

On Wed, 2019-10-23 at 21:22 +0200, Simon Goldschmidt wrote:

Am 23.10.2019 um 18:03 schrieb Dalon L Westergreen:

On Tue, 2019-10-22 at 19:13 +0200, Simon Goldschmidt wrote:

Dalon L Westergreen <

dalon.westergreen at linux.intel.com

<mailto:

dalon.westergreen at linux.intel.com

Quoted 1 line
Quoted 1 line

schrieb am Di., 22. Okt.

2019, 19:10:

I mentioned this before, it would be great to not rely on the

generated files

and do this based purely on the handoff data generated during a quartus

build. Did you look at the python source i pointed you to?

No, not yet. But I don't think that will be a problem. I sent this

series mainly to discuss the dts format (boardspecific handoff dtsi vs

genetic dtsi plus boardspecific header file).

The board specific dtsi does look cleaner, but i do like the simplicity

of generating the header in arria10.

I could easily replicate what you do, generate the header, and use it to

create the dtsi.

I'm not too fond myself of that tool I created, as it requires you to

have a compiler. I just was too lazy write a script for that.

However, I would prefer having a script that does it. And if the sources

are quartus output files instead of existing qts files, my tool doesn't

work any more, anway.

So I think we should come up with a script (e.g. sh or py) that parses

Quoted 8 lines

quartus output and creates a handoff dtsi (without a header). We'll only

need something different for converting existing qts files then...

In that case, i would stick with adding a .h file along with a common handoff dtsi as i did in the a10 filter script i sent the other week. I would suggest your source is perfect for migrating existing c5/a5 platforms.

Why can't we change that a10 script to create handoff dtsi files as well?

Quoted 3 lines

Is there a preference for python? It would fit nicely b/c we could re-use the code I pointed out previously for binary parsing.

Well, *my* preference would be to not depend on having gcc installed to convert from quartus output to dtsi. I just did that because C was easier to get started.

I'm not a big fan of python, but since it's used everywhere in U-Boot, I figured it should be ok? Having a standard shell script do the job would even lower the requirements of course.

Regards,
Simon

Quoted 1,589 lines

Dinh, Marek, Ley Foon, comments?

--dalon

Regards,

Simon

--dalon

I still favor boardspecific handoff dtsi, but I would like to use the

same style for all socfpga flavours.

Plus this tool is required to convert existing boards where we don't

have the quartus project files at hand.

Regards,

Simon

--dalon

On Tue, 2019-10-15 at 22:10 +0200, Simon Goldschmidt wrote:

This new tool converts handoff information from quartus to "*_handoff.dtsi"

devicetree files. This is in preparation to move from ad-hoc code in arch

that parses the 'qts' header files to drivers parsing the same information

from devicetree.

Converting existing U-Boot 'qts' files is also supported.

Signed-off-by Simon Goldschmidt <

simon.k.r.goldschmidt at gmail.com

<mailto:

simon.k.r.goldschmidt at gmail.com

Quoted 1 line

---

Changes in v2: None

  arch/arm/mach-socfpga/create_handoff_gen5.c | 660 ++++++++++++++++++++
  arch/arm/mach-socfpga/qts-to-handoff.sh     |  83 +++
  2 files changed, 743 insertions(+)

create mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c

create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh

arch/arm/mach-socfpga/create_handoff_gen5.c +0 -0

new file mode 100644

index 0000000000..6ec436719d

--- /dev/null

+++ b/arch/arm/mach-socfpga/create_handoff_gen5.c

arch/arm/mach-socfpga/create_handoff_gen5.c +660 -0
@@ -0,0 +1,660 @@
 
+// SPDX-License-Identifier: GPL-2.0
 
+/*
 
+ * This is a host-tool that needs to be compiled per board and prints the
 
+ * handoff.dtsi to stdout.
 
+ */
 
+
 
+#include <stdio.h>
 
+#include <stdint.h>
 
+
 
+/* Define kernel types */
 
+typedef uint8_t u8;
 
+typedef uint32_t u32;
 
+
 
+#ifdef USE_QUARTUS_OUTPUT
 
+#ifdef ARRIA5
 
+#include "iocsr_config_arria5.c"
 
+#include "pinmux_config_arria5.c"
 
+#else
 
+#include "iocsr_config_cyclone5.c"
 
+#include "pinmux_config_cyclone5.c"
 
+#endif
 
+#include "pll_config.h"
 
+#include "sdram/sdram_config.h"
 
+#include "sequencer_auto.h"
 
+#include "sequencer_defines.h"
 
+#include "sequencer_auto_ac_init.c"
 
+#include "sequencer_auto_inst_init.c"
 
+#define RW_MGR(x) __RW_MGR_##x
 
+#else
 
+#define RW_MGR(x) RW_MGR_##x
 
+#include <iocsr_config.h>
 
+#include <pinmux_config.h>
 
+#include <pll_config.h>
 
+#include <sdram_config.h>
 
+#endif
 
+
 
+#include "include/mach/clock_manager_gen5.h"
 
+#include "include/mach/sdram_gen5.h"
 
+
 
+#ifndef ARRAY_SIZE
 
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 
+#endif
 
+
 
+const char handoff_dtsi_hdr[] =
 
+ "// SPDX-License-Identifier: GPL-2.0\n"
 
+ "/*\n"
 
+ " *<auto-generated>\n"
 
+ " * This code was generated by a tool based on\n"
 
+ " * handoffs from both Qsys and Quartus.\n"
 
+ " *\n"
 
+ " * Changes to this file may be lost if\n"
 
+ " * the code is regenerated.\n"
 
+ " *</auto-generated>\n"
 
+ " */\n";
 
+
 
+/* Wrap PLL config */
 
+
 
+#define MAIN_VCO_BASE ( \
 
+ (CONFIG_HPS_MAINPLLGRP_VCO_DENOM << \
 
+ CLKMGR_MAINPLLGRP_VCO_DENOM_OFFSET) | \
 
+ (CONFIG_HPS_MAINPLLGRP_VCO_NUMER << \
 
+ CLKMGR_MAINPLLGRP_VCO_NUMER_OFFSET) \
 
+ )
 
+
 
+#define PERI_VCO_BASE ( \
 
+ (CONFIG_HPS_PERPLLGRP_VCO_PSRC << \
 
+ CLKMGR_PERPLLGRP_VCO_PSRC_OFFSET) | \
 
+ (CONFIG_HPS_PERPLLGRP_VCO_DENOM << \
 
+ CLKMGR_PERPLLGRP_VCO_DENOM_OFFSET) | \
 
+ (CONFIG_HPS_PERPLLGRP_VCO_NUMER << \
 
+ CLKMGR_PERPLLGRP_VCO_NUMER_OFFSET) \
 
+ )
 
+
 
+#define SDR_VCO_BASE ( \
 
+ (CONFIG_HPS_SDRPLLGRP_VCO_SSRC << \
 
+ CLKMGR_SDRPLLGRP_VCO_SSRC_OFFSET) | \
 
+ (CONFIG_HPS_SDRPLLGRP_VCO_DENOM << \
 
+ CLKMGR_SDRPLLGRP_VCO_DENOM_OFFSET) | \
 
+ (CONFIG_HPS_SDRPLLGRP_VCO_NUMER << \
 
+ CLKMGR_SDRPLLGRP_VCO_NUMER_OFFSET) \
 
+ )
 
+
 
+static const struct cm_config cm_default = {
 
+ /* main group */
 
+ MAIN_VCO_BASE,
 
+ (CONFIG_HPS_MAINPLLGRP_MPUCLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_MPUCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_MAINCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_DBGATCLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_DBGATCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_MAINQSPICLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_MAINQSPICLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_MAINNANDSDMMCCLK_CNT <<
 
+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_CFGS2FUSER0CLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L3MPCLK <<
 
+ CLKMGR_MAINPLLGRP_MAINDIV_L3MPCLK_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK <<
 
+ CLKMGR_MAINPLLGRP_MAINDIV_L3SPCLK_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L4MPCLK <<
 
+ CLKMGR_MAINPLLGRP_MAINDIV_L4MPCLK_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L4SPCLK <<
 
+ CLKMGR_MAINPLLGRP_MAINDIV_L4SPCLK_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGATCLK <<
 
+ CLKMGR_MAINPLLGRP_DBGDIV_DBGATCLK_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGCLK <<
 
+ CLKMGR_MAINPLLGRP_DBGDIV_DBGCLK_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK <<
 
+ CLKMGR_MAINPLLGRP_TRACEDIV_TRACECLK_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_L4SRC_L4MP <<
 
+ CLKMGR_MAINPLLGRP_L4SRC_L4MP_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_L4SRC_L4SP <<
 
+ CLKMGR_MAINPLLGRP_L4SRC_L4SP_OFFSET),
 
+
 
+ /* peripheral group */
 
+ PERI_VCO_BASE,
 
+ (CONFIG_HPS_PERPLLGRP_EMAC0CLK_CNT <<
 
+ CLKMGR_PERPLLGRP_EMAC0CLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_EMAC1CLK_CNT <<
 
+ CLKMGR_PERPLLGRP_EMAC1CLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT <<
 
+ CLKMGR_PERPLLGRP_PERQSPICLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_PERNANDSDMMCCLK_CNT <<
 
+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_PERBASECLK_CNT <<
 
+ CLKMGR_PERPLLGRP_PERBASECLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_S2FUSER1CLK_CNT <<
 
+ CLKMGR_PERPLLGRP_S2FUSER1CLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_DIV_USBCLK <<
 
+ CLKMGR_PERPLLGRP_DIV_USBCLK_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_DIV_SPIMCLK <<
 
+ CLKMGR_PERPLLGRP_DIV_SPIMCLK_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_DIV_CAN0CLK <<
 
+ CLKMGR_PERPLLGRP_DIV_CAN0CLK_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_DIV_CAN1CLK <<
 
+ CLKMGR_PERPLLGRP_DIV_CAN1CLK_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_GPIODIV_GPIODBCLK <<
 
+ CLKMGR_PERPLLGRP_GPIODIV_GPIODBCLK_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_SRC_QSPI <<
 
+ CLKMGR_PERPLLGRP_SRC_QSPI_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_SRC_NAND <<
 
+ CLKMGR_PERPLLGRP_SRC_NAND_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_SRC_SDMMC <<
 
+ CLKMGR_PERPLLGRP_SRC_SDMMC_OFFSET),
 
+
 
+ /* sdram pll group */
 
+ SDR_VCO_BASE,
 
+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_PHASE <<
 
+ CLKMGR_SDRPLLGRP_DDRDQSCLK_PHASE_OFFSET) |
 
+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_CNT <<
 
+ CLKMGR_SDRPLLGRP_DDRDQSCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_PHASE <<
 
+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_OFFSET) |
 
+ (CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT <<
 
+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_PHASE <<
 
+ CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_OFFSET) |
 
+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_CNT <<
 
+ CLKMGR_SDRPLLGRP_DDRDQCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_PHASE <<
 
+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
 
+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
 
+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
 
+
 
+ /* altera group */
 
+ CONFIG_HPS_ALTERAGRP_MPUCLK,
 
+};
 
+
 
+/* Wrap SDRAM config */
 
+static const struct socfpga_sdram_config sdram_config = {
 
+ .ctrl_cfg =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<
 
+ SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<
 
+ SDR_CTRLGRP_CTRLCFG_MEMBL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<
 
+ SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN <<
 
+ SDR_CTRLGRP_CTRLCFG_ECCEN_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN <<
 
+ SDR_CTRLGRP_CTRLCFG_ECCCORREN_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN <<
 
+ SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<
 
+ SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<
 
+ SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<
 
+ SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),
 
+ .dram_timing1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TCWL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TAL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TCL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TRRD_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),
 
+ .dram_timing2 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TREFI_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRCD <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TRP_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TWR_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TWTR_LSB),
 
+ .dram_timing3 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TRAS_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TRC_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),
 
+ .dram_timing4 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<
 
+ SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<
 
+ SDR_CTRLGRP_DRAMTIMING4_PWRDOWNEXIT_LSB),
 
+ .lowpwr_timing =
 
+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<
 
+ SDR_CTRLGRP_LOWPWRTIMING_AUTOPDCYCLES_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<
 
+ SDR_CTRLGRP_LOWPWRTIMING_CLKDISABLECYCLES_LSB),
 
+ .dram_odt =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ <<
 
+ SDR_CTRLGRP_DRAMODT_READ_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<
 
+ SDR_CTRLGRP_DRAMODT_WRITE_LSB),
 
+ .extratime1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR <<
 
+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_BC <<
 
+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_BC_LSB) |
 
+(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_DIFF_CHIP <<
 
+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_DIFF_LSB),
 
+ .dram_addrw =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<
 
+ SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS <<
 
+ SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS <<
 
+ SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB) |
 
+ ((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<
 
+ SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),
 
+ .dram_if_width =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<
 
+ SDR_CTRLGRP_DRAMIFWIDTH_IFWIDTH_LSB),
 
+ .dram_dev_width =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<
 
+ SDR_CTRLGRP_DRAMDEVWIDTH_DEVWIDTH_LSB),
 
+ .dram_intr =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN <<
 
+ SDR_CTRLGRP_DRAMINTR_INTREN_LSB),
 
+ .lowpwr_eq =
 
+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK <<
 
+ SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),
 
+ .static_cfg =
 
+ (CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<
 
+ SDR_CTRLGRP_STATICCFG_MEMBL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<
 
+ SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),
 
+ .ctrl_width =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<
 
+ SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),
 
+ .cport_width =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<
 
+ SDR_CTRLGRP_CPORTWIDTH_CMDPORTWIDTH_LSB),
 
+ .cport_wmap =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP <<
 
+ SDR_CTRLGRP_CPORTWMAP_CPORTWFIFOMAP_LSB),
 
+ .cport_rmap =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP <<
 
+ SDR_CTRLGRP_CPORTRMAP_CPORTRFIFOMAP_LSB),
 
+ .rfifo_cmap =
 
+ (CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<
 
+ SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),
 
+ .wfifo_cmap =
 
+ (CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<
 
+ SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),
 
+ .cport_rdwr =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<
 
+ SDR_CTRLGRP_CPORTRDWR_CPORTRDWR_LSB),
 
+ .port_cfg =
 
+ (CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN <<
 
+ SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LSB),
 
+ .fpgaport_rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,
 
+ .fifo_cfg =
 
+ (CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<
 
+ SDR_CTRLGRP_FIFOCFG_SYNCMODE_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_INCSYNC <<
 
+ SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),
 
+ .mp_priority =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY <<
 
+ SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),
 
+ .mp_weight0 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_0_LSB),
 
+ .mp_weight1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_32_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB),
 
+ .mp_weight2 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_14_LSB),
 
+ .mp_weight3 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),
 
+ .mp_pacing0 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),
 
+ .mp_pacing1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59_32 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD1_59_32_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD2_3_0_LSB),
 
+ .mp_pacing2 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOLD2_35_4_LSB),
 
+ .mp_pacing3 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),
 
+ .mp_threshold0 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<
 
+ SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),
 
+ .mp_threshold1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<
 
+ SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),
 
+ .mp_threshold2 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 <<
 
+ SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LSB),
 
+ .phy_ctrl0 = CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,
 
+};
 
+
 
+static const struct socfpga_sdram_rw_mgr_config rw_mgr_config = {
 
+ .activate_0_and_1 = RW_MGR(ACTIVATE_0_AND_1),
 
+ .activate_0_and_1_wait1 = RW_MGR(ACTIVATE_0_AND_1_WAIT1),
 
+ .activate_0_and_1_wait2 = RW_MGR(ACTIVATE_0_AND_1_WAIT2),
 
+ .activate_1 = RW_MGR(ACTIVATE_1),
 
+ .clear_dqs_enable = RW_MGR(CLEAR_DQS_ENABLE),
 
+ .guaranteed_read = RW_MGR(GUARANTEED_READ),
 
+ .guaranteed_read_cont = RW_MGR(GUARANTEED_READ_CONT),
 
+ .guaranteed_write = RW_MGR(GUARANTEED_WRITE),
 
+ .guaranteed_write_wait0 = RW_MGR(GUARANTEED_WRITE_WAIT0),
 
+ .guaranteed_write_wait1 = RW_MGR(GUARANTEED_WRITE_WAIT1),
 
+ .guaranteed_write_wait2 = RW_MGR(GUARANTEED_WRITE_WAIT2),
 
+ .guaranteed_write_wait3 = RW_MGR(GUARANTEED_WRITE_WAIT3),
 
+ .idle = RW_MGR(IDLE),
 
+ .idle_loop1 = RW_MGR(IDLE_LOOP1),
 
+ .idle_loop2 = RW_MGR(IDLE_LOOP2),
 
+ .init_reset_0_cke_0 = RW_MGR(INIT_RESET_0_CKE_0),
 
+ .init_reset_1_cke_0 = RW_MGR(INIT_RESET_1_CKE_0),
 
+ .lfsr_wr_rd_bank_0 = RW_MGR(LFSR_WR_RD_BANK_0),
 
+ .lfsr_wr_rd_bank_0_data = RW_MGR(LFSR_WR_RD_BANK_0_DATA),
 
+ .lfsr_wr_rd_bank_0_dqs = RW_MGR(LFSR_WR_RD_BANK_0_DQS),
 
+ .lfsr_wr_rd_bank_0_nop = RW_MGR(LFSR_WR_RD_BANK_0_NOP),
 
+ .lfsr_wr_rd_bank_0_wait = RW_MGR(LFSR_WR_RD_BANK_0_WAIT),
 
+ .lfsr_wr_rd_bank_0_wl_1 = RW_MGR(LFSR_WR_RD_BANK_0_WL_1),
 
+ .lfsr_wr_rd_dm_bank_0 = RW_MGR(LFSR_WR_RD_DM_BANK_0),
 
+ .lfsr_wr_rd_dm_bank_0_data = RW_MGR(LFSR_WR_RD_DM_BANK_0_DATA),
 
+ .lfsr_wr_rd_dm_bank_0_dqs = RW_MGR(LFSR_WR_RD_DM_BANK_0_DQS),
 
+ .lfsr_wr_rd_dm_bank_0_nop = RW_MGR(LFSR_WR_RD_DM_BANK_0_NOP),
 
+ .lfsr_wr_rd_dm_bank_0_wait = RW_MGR(LFSR_WR_RD_DM_BANK_0_WAIT),
 
+ .lfsr_wr_rd_dm_bank_0_wl_1 = RW_MGR(LFSR_WR_RD_DM_BANK_0_WL_1),
 
+ .mrs0_dll_reset = RW_MGR(MRS0_DLL_RESET),
 
+ .mrs0_dll_reset_mirr = RW_MGR(MRS0_DLL_RESET_MIRR),
 
+ .mrs0_user = RW_MGR(MRS0_USER),
 
+ .mrs0_user_mirr = RW_MGR(MRS0_USER_MIRR),
 
+ .mrs1 = RW_MGR(MRS1),
 
+ .mrs1_mirr = RW_MGR(MRS1_MIRR),
 
+ .mrs2 = RW_MGR(MRS2),
 
+ .mrs2_mirr = RW_MGR(MRS2_MIRR),
 
+ .mrs3 = RW_MGR(MRS3),
 
+ .mrs3_mirr = RW_MGR(MRS3_MIRR),
 
+ .precharge_all = RW_MGR(PRECHARGE_ALL),
 
+ .read_b2b = RW_MGR(READ_B2B),
 
+ .read_b2b_wait1 = RW_MGR(READ_B2B_WAIT1),
 
+ .read_b2b_wait2 = RW_MGR(READ_B2B_WAIT2),
 
+ .refresh_all = RW_MGR(REFRESH_ALL),
 
+ .rreturn = RW_MGR(RETURN),
 
+ .sgle_read = RW_MGR(SGLE_READ),
 
+ .zqcl = RW_MGR(ZQCL),
 
+
 
+ .true_mem_data_mask_width = RW_MGR_TRUE_MEM_DATA_MASK_WIDTH,
 
+ .mem_address_mirroring = RW_MGR_MEM_ADDRESS_MIRRORING,
 
+ .mem_data_mask_width = RW_MGR_MEM_DATA_MASK_WIDTH,
 
+ .mem_data_width = RW_MGR_MEM_DATA_WIDTH,
 
+ .mem_dq_per_read_dqs = RW_MGR_MEM_DQ_PER_READ_DQS,
 
+ .mem_dq_per_write_dqs = RW_MGR_MEM_DQ_PER_WRITE_DQS,
 
+ .mem_if_read_dqs_width = RW_MGR_MEM_IF_READ_DQS_WIDTH,
 
+ .mem_if_write_dqs_width = RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
 
+ .mem_number_of_cs_per_dimm = RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM,
 
+ .mem_number_of_ranks = RW_MGR_MEM_NUMBER_OF_RANKS,
 
+ .mem_virtual_groups_per_read_dqs =
 
+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS,
 
+ .mem_virtual_groups_per_write_dqs =
 
+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS,
 
+};
 
+
 
+static const struct socfpga_sdram_io_config io_config = {
 
+ .delay_per_dchain_tap = IO_DELAY_PER_DCHAIN_TAP,
 
+ .delay_per_dqs_en_dchain_tap = IO_DELAY_PER_DQS_EN_DCHAIN_TAP,
 
+ .delay_per_opa_tap_lo = IO_DELAY_PER_OPA_TAP & 0xff,
 
+ .delay_per_opa_tap_hi = (IO_DELAY_PER_OPA_TAP << 8) & 0xff,
 
+ .dll_chain_length = IO_DLL_CHAIN_LENGTH,
 
+ .dqdqs_out_phase_max = IO_DQDQS_OUT_PHASE_MAX,
 
+ .dqs_en_delay_max = IO_DQS_EN_DELAY_MAX,
 
+ .dqs_en_delay_offset = IO_DQS_EN_DELAY_OFFSET,
 
+ .dqs_en_phase_max = IO_DQS_EN_PHASE_MAX,
 
+ .dqs_in_delay_max = IO_DQS_IN_DELAY_MAX,
 
+ .dqs_in_reserve = IO_DQS_IN_RESERVE,
 
+ .dqs_out_reserve = IO_DQS_OUT_RESERVE,
 
+ .io_in_delay_max = IO_IO_IN_DELAY_MAX,
 
+ .io_out1_delay_max = IO_IO_OUT1_DELAY_MAX,
 
+ .io_out2_delay_max = IO_IO_OUT2_DELAY_MAX,
 
+ .shift_dqs_en_when_shift_dqs = IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS,
 
+};
 
+
 
+static const struct socfpga_sdram_misc_config misc_config = {
 
+ .afi_rate_ratio = AFI_RATE_RATIO,
 
+ .calib_lfifo_offset = CALIB_LFIFO_OFFSET,
 
+ .calib_vfifo_offset = CALIB_VFIFO_OFFSET,
 
+ .enable_super_quick_calibration = ENABLE_SUPER_QUICK_CALIBRATION,
 
+ .max_latency_count_width = MAX_LATENCY_COUNT_WIDTH,
 
+ .read_valid_fifo_size = READ_VALID_FIFO_SIZE,
 
+ .reg_file_init_seq_signature_ll = REG_FILE_INIT_SEQ_SIGNATURE & 0xff,
 
+ .reg_file_init_seq_signature_lh = (REG_FILE_INIT_SEQ_SIGNATURE >> 8) & 0xff,
 
+ .reg_file_init_seq_signature_hl = (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,
 
+ .reg_file_init_seq_signature_hh = (REG_FILE_INIT_SEQ_SIGNATURE >> 24) & 0xff,
 
+ .tinit_cntr0_val = TINIT_CNTR0_VAL,
 
+ .tinit_cntr1_val = TINIT_CNTR1_VAL,
 
+ .tinit_cntr2_val = TINIT_CNTR2_VAL,
 
+ .treset_cntr0_val = TRESET_CNTR0_VAL,
 
+ .treset_cntr1_val = TRESET_CNTR1_VAL,
 
+ .treset_cntr2_val = TRESET_CNTR2_VAL,
 
+};
 
+
 
+static void print_hdr(void)
 
+{
 
+ printf(handoff_dtsi_hdr);
 
+}
 
+
 
+static void print_clkmgr_base(void)
 
+{
 
+ const char handoff_dtsi_clkmgr_base[] =
 
+ "\n"
 
+ "&osc1 {\n"
 
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC1_HZ */
 
+ "};\n"
 
+ "\n"
 
+ "&osc2 {\n"
 
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC2_HZ */
 
+ "};\n"
 
+ "\n"
 
+ "&f2s_periph_ref_clk {\n"
 
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_PER_REF_HZ */
 
+ "};\n"
 
+ "\n"
 
+ "&f2s_sdram_ref_clk {\n"
 
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_SDR_REF_HZ */
 
+ "};\n";
 
+
 
+ printf(handoff_dtsi_clkmgr_base, CONFIG_HPS_CLK_OSC1_HZ,
 
+       CONFIG_HPS_CLK_OSC2_HZ, CONFIG_HPS_CLK_F2S_PER_REF_HZ,
 
+       CONFIG_HPS_CLK_F2S_SDR_REF_HZ);
 
+}
 
+
 
+/*
 
+ * dtc stores u32 array big endian but we load them raw and expect them to be in
 
+ * little endian format. To prevent this tool to depend on host endianess, do
 
+ * the switch manually, not via 'htonl'.
 
+ */
 
+static u32 swap_bytes(u32 val)
 
+{
 
+ return (val << 24) | ((val & 0xFF00ul) << 8) |
 
+ ((val & 0xFF0000ul) >> 8) | (val >> 24);
 
+}
 
+
 
+static void print_array_ulong(const unsigned long *arr, size_t arr_size,
 
+      size_t el_per_line, const char *indent1,
 
+      const char *name, const char *indent_next)
 
+{
 
+ size_t i;
 
+
 
+ printf("%s%s = <", indent1, name);
 
+ for (i = 0; i < arr_size; i++) {
 
+ printf("0x%08x", swap_bytes((u32)arr[i]));
 
+ if (i + 1 < arr_size) {
 
+ if (i % el_per_line == (el_per_line - 1)) {
 
+ printf("\n%s", indent_next);
 
+ } else {
 
+ printf(" ");
 
+ }
 
+ }
 
+ }
 
+ printf(">;\n");
 
+}
 
+
 
+#ifdef USE_QUARTUS_OUTPUT
 
+static void print_array_sysmgrinit(const unsigned long *arr, size_t arr_size,
 
+   const char *indent1, const char *name,
 
+   const char *indent_next)
 
+{
 
+ size_t i;
 
+
 
+ printf("%s%s = [", indent1, name);
 
+ for (i = 0; i < arr_size; i++) {
 
+ printf("%02x", (u8)arr[i]);
 
+ if (i + 1 < arr_size) {
 
+ if (i % 8 == 7) {
 
+ printf("\n%s", indent_next);
 
+ } else {
 
+ printf(" ");
 
+ }
 
+ }
 
+ }
 
+ printf("];\n");
 
+}
 
+#define print_array_alt_u32 print_array_ulong
 
+#else
 
+#define print_array_sysmgrinit(arr, sz, ind1, n, ind2) print_array_u8(arr, sz, 8, ind1, n, ind2)
 
+#define print_array_alt_u32 print_array_u32
 
+#endif
 
+
 
+static void print_array_u32(const u32 *arr, size_t arr_size,
 
+    size_t el_per_line, const char *indent1,
 
+    const char *name, const char *indent_next)
 
+{
 
+ size_t i;
 
+
 
+ printf("%s%s = <", indent1, name);
 
+ for (i = 0; i < arr_size; i++) {
 
+ printf("0x%08x", swap_bytes(arr[i]));
 
+ if (i + 1 < arr_size) {
 
+ if (i % el_per_line == (el_per_line - 1)) {
 
+ printf("\n%s", indent_next);
 
+ } else {
 
+ printf(" ");
 
+ }
 
+ }
 
+ }
 
+ printf(">;\n");
 
+}
 
+
 
+static void print_array_u8(const u8 *arr, size_t arr_size, size_t el_per_line,
 
+   const char *indent1, const char *name,
 
+   const char *indent_next)
 
+{
 
+ size_t i;
 
+
 
+ printf("%s%s = [", indent1, name);
 
+ for (i = 0; i < arr_size; i++) {
 
+ printf("%02x", arr[i]);
 
+ if (i + 1 < arr_size) {
 
+ if (i % el_per_line == (el_per_line - 1)) {
 
+ printf("\n%s", indent_next);
 
+ } else {
 
+ printf(" ");
 
+ }
 
+ }
 
+ }
 
+ printf("];\n");
 
+}
 
+
 
+
 
+static void print_clkmgr_cfg(void)
 
+{
 
+ const char handoff_dtsi_clkmgr_cfg_a[] =
 
+ "\n"
 
+ "&clkmgr {\n";
 
+ const char handoff_dtsi_clkmgr_cfg_b[] = "};\n";
 
+ const char clk_mgr_cfg_indent[] = "\t\t\t    ";
 
+
 
+ printf(handoff_dtsi_clkmgr_cfg_a);
 
+ print_array_u32((const u32 *)&cm_default, sizeof(cm_default)/4, 4, "\t",
 
+ "altr,clk-mgr-cfg", clk_mgr_cfg_indent);
 
+ printf(handoff_dtsi_clkmgr_cfg_b);
 
+}
 
+
 
+static void print_sysmgr(void)
 
+{
 
+ const char handoff_dtsi_sysmgr_begin[] =
 
+ "\n"
 
+ "&sysmgr {\n";
 
+ const char handoff_dtsi_sysmgr_end[] = "};\n";
 
+ const char sysmgr_cfg_indent[] = "\t\t\t\t\t";
 
+ size_t i;
 
+
 
+ printf(handoff_dtsi_sysmgr_begin);
 
+
 
+ /* sys_mgr_init_table is an u8 table */
 
+ print_array_sysmgrinit(sys_mgr_init_table, ARRAY_SIZE(sys_mgr_init_table),
 
+       "\t", "altr,pinmux-cfg","\t\t\t   ");
 
+ /* ioscr scan chain table 0 */
 
+ print_array_ulong(iocsr_scan_chain0_table,
 
+  ARRAY_SIZE(iocsr_scan_chain0_table), 4,
 
+  "\t", "altr,iocsr-scan-chain0-table",
 
+  sysmgr_cfg_indent);
 
+ /* ioscr scan chain table 0 */
 
+ print_array_ulong(iocsr_scan_chain1_table,
 
+  ARRAY_SIZE(iocsr_scan_chain1_table), 4,
 
+  "\t", "altr,iocsr-scan-chain1-table",
 
+  sysmgr_cfg_indent);
 
+ /* ioscr scan chain table 0 */
 
+ print_array_ulong(iocsr_scan_chain2_table,
 
+  ARRAY_SIZE(iocsr_scan_chain2_table), 4,
 
+  "\t", "altr,iocsr-scan-chain2-table",
 
+  sysmgr_cfg_indent);
 
+ /* ioscr scan chain table 0 */
 
+ print_array_ulong(iocsr_scan_chain3_table,
 
+  ARRAY_SIZE(iocsr_scan_chain3_table), 4,
 
+  "\t", "altr,iocsr-scan-chain3-table",
 
+  sysmgr_cfg_indent);
 
+ printf(handoff_dtsi_sysmgr_end);
 
+}
 
+
 
+static void print_sdram_cfg(void)
 
+{
 
+ const char handoff_dtsi_sdram_cfg_begin[] =
 
+ "\n"
 
+ "&sdr {\n";
 
+ const char handoff_dtsi_sdram_cfg_end[] = "};\n";
 
+
 
+ printf(handoff_dtsi_sdram_cfg_begin);
 
+ print_array_u32((const u32 *)&sdram_config, sizeof(sdram_config)/4, 4,
 
+ "\t", "altr,sdr-cfg", "\t\t\t");
 
+ print_array_u8((const u8 *)&rw_mgr_config, sizeof(rw_mgr_config), 8,
 
+ "\t", "altr,sdr-rw-mgr-cfg", "\t\t\t       ");
 
+ print_array_u8((const u8 *)&io_config, sizeof(io_config), 8,
 
+ "\t", "altr,sdr-io-cfg", "\t\t\t   ");
 
+ print_array_u8((const u8 *)&misc_config, sizeof(misc_config), 8,
 
+ "\t", "altr,sdr-misc-cfg", "\t\t\t     ");
 
+ print_array_alt_u32(ac_rom_init, ARRAY_SIZE(ac_rom_init), 4,
 
+ "\t", "altr,sdr-ac-rom-init", "\t\t\t\t");
 
+ print_array_alt_u32(inst_rom_init, ARRAY_SIZE(inst_rom_init), 4,
 
+ "\t", "altr,sdr-inst-rom-init", "\t\t\t\t  ");
 
+ printf(handoff_dtsi_sdram_cfg_end);
 
+}
 
+
 
+int main(void)
 
+{
 
+ print_hdr();
 
+ print_clkmgr_base();
 
+ print_clkmgr_cfg();
 
+ print_sysmgr();
 
+ print_sdram_cfg();
 
+}
arch/arm/mach-socfpga/qts-to-handoff.sh +0 -0

new file mode 100755

index 0000000000..b9032a5411

--- /dev/null

+++ b/arch/arm/mach-socfpga/qts-to-handoff.sh

arch/arm/mach-socfpga/qts-to-handoff.sh +83 -0
@@ -0,0 +1,83 @@
 
+#!/bin/sh
 
+# This script converts Quartus handoff files (in Quartus or U-Boot format)
 
+# to a handoff.dtsi file.
 
+
 
+
 
+usage() {
 
+ MY_BASENAME=`basename $0`
 
+ echo "${MY_BASENAME} [soc_type] [input_qts_dir] [input_bsp_dir] [output_file]"
 
+ echo " or"
 
+ echo "${MY_BASENAME} 'u-boot' [uboot_qts_dir] [output_file]"
 
+ echo ""
 
+ echo "Process QTS-generated headers into handoff.dtsi:"
 
+ echo ""
 
+ echo "  soc_type      - Type of SoC, either 'cyclone5' or 'arria5'."
 
+ echo "  input_qts_dir - Directory with compiled Quartus project"
 
+ echo "                  and containing the Quartus project file (QPF)."
 
+ echo "  input_bsp_dir - Directory with generated bsp containing"
 
+ echo "                  the settings.bsp file."
 
+ echo "  output_file   - Full filename to store the handoff dtsi file."
 
+ echo "  uboot_qts_dir - board/qts directory if input files are in"
 
+ echo "                  'old-style' U-Boot format."
 
+ echo ""
 
+}
 
+
 
+soc="$1"
 
+
 
+HANDOFF_TEMPLATE="`dirname $0`/create_handoff_gen5.c"
 
+
 
+case "$soc" in
 
+"cyclone5"|"arria5")
 
+ if [ "$#" -ne 4 ] ; then
 
+ usage
 
+ exit 1
 
+ fi
 
+ in_qts_dir="$2"
 
+ in_bsp_dir="$3"
 
+ output_file="$4"
 
+ out_dir=`dirname ${output_file}`
 
+
 
+ if [ ! -d "${in_qts_dir}" -o ! -d "${in_bsp_dir}" -o \
 
+ ! -d "${out_dir}" -o -z "${soc}" ] ; then
 
+ usage
 
+ exit 3
 
+ fi
 
+
 
+ if [ "$soc" = "cyclone5" ] ; then
 
+ CMDLINE_DEFINES="-DCYCLONE5"
 
+ else
 
+ CMDLINE_DEFINES="-DARRIA5"
 
+ fi
 
+ CMDLINE_DEFINES="${CMDLINE_DEFINES} -DUSE_QUARTUS_OUTPUT -I${in_bsp_dir}/generated/"
 
+ for d in ${in_qts_dir}/hps_isw_handoff/*/ ; do
 
+ CMDLINE_DEFINES="${CMDLINE_DEFINES} -I$d"
 
+ done
 
+ ;;
 
+"u-boot")
 
+ if [ "$#" -ne 3 ] ; then
 
+ usage
 
+ exit 1
 
+ fi
 
+ in_qts_dir="$2"
 
+ output_file="$3"
 
+ out_dir=`dirname ${output_file}`
 
+
 
+ if [ ! -d "${in_qts_dir}" -o ! -d "${out_dir}" ] ; then
 
+ usage
 
+ exit 3
 
+ fi
 
+
 
+ CMDLINE_DEFINES="-I${in_qts_dir}"
 
+ ;;
 
+*)
 
+ usage
 
+ exit 1
 
+ ;;
 
+esac
 
+
 
+# compile
 
+gcc ${CMDLINE_DEFINES} ${HANDOFF_TEMPLATE} -o ${out_dir}/create_handoff_gen5
 
+${out_dir}/create_handoff_gen5 > ${output_file}
 
+
 
+# TODO: remove tmp file:
 
+#rm $${out_dir}/create_handoff_gen5
#15 lore raw

RFC PATCH v2 8/18 socfpga: gen5: add new tool to create handoff dtsi files

Quoted 47 lines · Simon Goldschmidt
Quoted 45 lines · Dalon L Westergreen

On Wed, 2019-10-23 at 21:22 +0200, Simon Goldschmidt wrote:
Am 23.10.2019 um 18:03 schrieb Dalon L Westergreen:

On Tue, 2019-10-22 at 19:13 +0200, Simon Goldschmidt wrote:

Dalon L Westergreen <
dalon.westergreen at linux.intel.com

<mailto:
dalon.westergreen at linux.intel.com

Quoted 1 line
Quoted 1 line

schrieb am Di., 22. Okt.

2019, 19:10:
I mentioned this before, it would be great to not rely on the generated files
and do this based purely on the handoff data generated during a quartus build. Did you look at the python source i pointed you to?

No, not yet. But I don't think that will be a problem. I sent this series mainly to discuss the dts format (boardspecific handoff dtsi vs genetic dtsi plus boardspecific header file).

The board specific dtsi does look cleaner, but i do like the simplicity of generating the header in arria10.

I could easily replicate what you do, generate the header, and use it to create the dtsi.

I'm not too fond myself of that tool I created, as it requires you to have a compiler. I just was too lazy write a script for that.

However, I would prefer having a script that does it. And if the sources are quartus output files instead of existing qts files, my tool doesn't work any more, anway.

So I think we should come up with a script (e.g. sh or py) that parses quartus output and creates a handoff dtsi (without a header). We'll only need something different for converting existing qts files then...

Quoted 5 lines
Quoted 3 lines

In that case, i would stick with adding a .h file along with a common handoff dtsi as i didin the a10 filter script i sent the other week. I would suggest your source is perfectfor migrating existing c5/a5 platforms.

Why can't we change that a10 script to create handoff dtsi files as well?

I just dont like building the dtsi in source, the code to create a header is simpler and cleaner. Froma files perspective, 1 dtsi + a header for each board, or a dtsi for each board, not sure there is muchdifference either way. but using headers keeps the utility simpler.
--dalon

Quoted 827 lines
Quoted 2 lines

Is there a preference for python? It would fit nicely b/c we could re-use the codeI pointed out previously for binary parsing.

Well, *my* preference would be to not depend on having gcc installed to convertfrom quartus output to dtsi. I just did that because C was easier toget started.
I'm not a big fan of python, but since it's used everywhere in U-Boot, Ifigured it should be ok? Having a standard shell script do the job would evenlower the requirements of course.
Regards,Simon

Quoted 817 lines

Dinh, Marek, Ley Foon, comments?
--dalon

Regards,
Simon

--dalon

I still favor boardspecific handoff dtsi, but I would like to use the same style for all socfpga flavours.

Plus this tool is required to convert existing boards where we don't have the quartus project files at hand.

Regards,
Simon

--dalon

On Tue, 2019-10-15 at 22:10 +0200, Simon Goldschmidt wrote:
This new tool converts handoff information from quartus to "*_handoff.dtsi" devicetree files. This is in preparation to move from ad-hoc code in arch that parses the 'qts' header files to drivers parsing the same information from devicetree.

Converting existing U-Boot 'qts' files is also supported.

Signed-off-by: Simon Goldschmidt <
simon.k.r.goldschmidt at gmail.com

<mailto:
simon.k.r.goldschmidt at gmail.com

---

Changes in v2: None

  arch/arm/mach-socfpga/create_handoff_gen5.c | 660 ++++++++++++++++++++
  arch/arm/mach-socfpga/qts-to-handoff.sh     |  83 +++
  2 files changed, 743 insertions(+)

create mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh

arch/arm/mach- renamed from arch/arm/mach-socfpga/create_handoff_gen5.c +0 -0

socfpga/create_handoff_gen5.c
new file mode 100644
index 0000000000..6ec436719d

arch/arm/mach-socfpga/create_handoff_gen5.c new file +440 -0
@@ -0,0 +1,660 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * This is a host-tool that needs to be compiled per board and prints the
+ * handoff.dtsi to stdout.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+/* Define kernel types */
+typedef uint8_t u8;
+typedef uint32_t u32;
+
+#ifdef USE_QUARTUS_OUTPUT
+#ifdef ARRIA5
+#include "iocsr_config_arria5.c"
+#include "pinmux_config_arria5.c"
+#else
+#include "iocsr_config_cyclone5.c"
+#include "pinmux_config_cyclone5.c"
+#endif
+#include "pll_config.h"
+#include "sdram/sdram_config.h"
+#include "sequencer_auto.h"
+#include "sequencer_defines.h"
+#include "sequencer_auto_ac_init.c"
+#include "sequencer_auto_inst_init.c"
+#define RW_MGR(x) __RW_MGR_##x
+#else
+#define RW_MGR(x) RW_MGR_##x
+#include <iocsr_config.h>
+#include <pinmux_config.h>
+#include <pll_config.h>
+#include <sdram_config.h>
+#endif
+
+#include "include/mach/clock_manager_gen5.h"
+#include "include/mach/sdram_gen5.h"
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
+#endif
+
+const char handoff_dtsi_hdr[] =
+ "// SPDX-License-Identifier: GPL-2.0\n"
+ "/*\n"
+ " *<auto-generated>\n"
+ " * This code was generated by a tool based on\n"
+ " * handoffs from both Qsys and Quartus.\n"
+ " *\n"
+ " * Changes to this file may be lost if\n"
+ " * the code is regenerated.\n"
+ " *</auto-generated>\n"
+ " */\n";
+
+/* Wrap PLL config */
+
+#define MAIN_VCO_BASE ( \
+ (CONFIG_HPS_MAINPLLGRP_VCO_DENOM << \
+ CLKMGR_MAINPLLGRP_VCO_DENOM_OFFSET) | \
+ (CONFIG_HPS_MAINPLLGRP_VCO_NUMER << \
+ CLKMGR_MAINPLLGRP_VCO_NUMER_OFFSET) \
+ )
+
+#define PERI_VCO_BASE ( \
+ (CONFIG_HPS_PERPLLGRP_VCO_PSRC << \
+ CLKMGR_PERPLLGRP_VCO_PSRC_OFFSET) | \
+ (CONFIG_HPS_PERPLLGRP_VCO_DENOM << \
+ CLKMGR_PERPLLGRP_VCO_DENOM_OFFSET) | \
+ (CONFIG_HPS_PERPLLGRP_VCO_NUMER << \
+ CLKMGR_PERPLLGRP_VCO_NUMER_OFFSET) \
+ )
+
+#define SDR_VCO_BASE ( \
+ (CONFIG_HPS_SDRPLLGRP_VCO_SSRC << \
+ CLKMGR_SDRPLLGRP_VCO_SSRC_OFFSET) | \
+ (CONFIG_HPS_SDRPLLGRP_VCO_DENOM << \
+ CLKMGR_SDRPLLGRP_VCO_DENOM_OFFSET) | \
+ (CONFIG_HPS_SDRPLLGRP_VCO_NUMER << \
+ CLKMGR_SDRPLLGRP_VCO_NUMER_OFFSET) \
+ )
+
+static const struct cm_config cm_default = {
+ /* main group */
+ MAIN_VCO_BASE,
+ (CONFIG_HPS_MAINPLLGRP_MPUCLK_CNT <<
+ CLKMGR_MAINPLLGRP_MPUCLK_CNT_OFFSET),
+ (CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT <<
+ CLKMGR_MAINPLLGRP_MAINCLK_CNT_OFFSET),
+ (CONFIG_HPS_MAINPLLGRP_DBGATCLK_CNT <<
+ CLKMGR_MAINPLLGRP_DBGATCLK_CNT_OFFSET),
+ (CONFIG_HPS_MAINPLLGRP_MAINQSPICLK_CNT <<
+ CLKMGR_MAINPLLGRP_MAINQSPICLK_CNT_OFFSET),
+ (CONFIG_HPS_MAINPLLGRP_MAINNANDSDMMCCLK_CNT <<
+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
+ (CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CNT <<
+ CLKMGR_MAINPLLGRP_CFGS2FUSER0CLK_CNT_OFFSET),
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L3MPCLK <<
+ CLKMGR_MAINPLLGRP_MAINDIV_L3MPCLK_OFFSET) |
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK <<
+ CLKMGR_MAINPLLGRP_MAINDIV_L3SPCLK_OFFSET) |
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L4MPCLK <<
+ CLKMGR_MAINPLLGRP_MAINDIV_L4MPCLK_OFFSET) |
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L4SPCLK <<
+ CLKMGR_MAINPLLGRP_MAINDIV_L4SPCLK_OFFSET),
+ (CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGATCLK <<
+ CLKMGR_MAINPLLGRP_DBGDIV_DBGATCLK_OFFSET) |
+ (CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGCLK <<
+ CLKMGR_MAINPLLGRP_DBGDIV_DBGCLK_OFFSET),
+ (CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK <<
+ CLKMGR_MAINPLLGRP_TRACEDIV_TRACECLK_OFFSET),
+ (CONFIG_HPS_MAINPLLGRP_L4SRC_L4MP <<
+ CLKMGR_MAINPLLGRP_L4SRC_L4MP_OFFSET) |
+ (CONFIG_HPS_MAINPLLGRP_L4SRC_L4SP <<
+ CLKMGR_MAINPLLGRP_L4SRC_L4SP_OFFSET),
+
+ /* peripheral group */
+ PERI_VCO_BASE,
+ (CONFIG_HPS_PERPLLGRP_EMAC0CLK_CNT <<
+ CLKMGR_PERPLLGRP_EMAC0CLK_CNT_OFFSET),
+ (CONFIG_HPS_PERPLLGRP_EMAC1CLK_CNT <<
+ CLKMGR_PERPLLGRP_EMAC1CLK_CNT_OFFSET),
+ (CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT <<
+ CLKMGR_PERPLLGRP_PERQSPICLK_CNT_OFFSET),
+ (CONFIG_HPS_PERPLLGRP_PERNANDSDMMCCLK_CNT <<
+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
+ (CONFIG_HPS_PERPLLGRP_PERBASECLK_CNT <<
+ CLKMGR_PERPLLGRP_PERBASECLK_CNT_OFFSET),
+ (CONFIG_HPS_PERPLLGRP_S2FUSER1CLK_CNT <<
+ CLKMGR_PERPLLGRP_S2FUSER1CLK_CNT_OFFSET),
+ (CONFIG_HPS_PERPLLGRP_DIV_USBCLK <<
+ CLKMGR_PERPLLGRP_DIV_USBCLK_OFFSET) |
+ (CONFIG_HPS_PERPLLGRP_DIV_SPIMCLK <<
+ CLKMGR_PERPLLGRP_DIV_SPIMCLK_OFFSET) |
+ (CONFIG_HPS_PERPLLGRP_DIV_CAN0CLK <<
+ CLKMGR_PERPLLGRP_DIV_CAN0CLK_OFFSET) |
+ (CONFIG_HPS_PERPLLGRP_DIV_CAN1CLK <<
+ CLKMGR_PERPLLGRP_DIV_CAN1CLK_OFFSET),
+ (CONFIG_HPS_PERPLLGRP_GPIODIV_GPIODBCLK <<
+ CLKMGR_PERPLLGRP_GPIODIV_GPIODBCLK_OFFSET),
+ (CONFIG_HPS_PERPLLGRP_SRC_QSPI <<
+ CLKMGR_PERPLLGRP_SRC_QSPI_OFFSET) |
+ (CONFIG_HPS_PERPLLGRP_SRC_NAND <<
+ CLKMGR_PERPLLGRP_SRC_NAND_OFFSET) |
+ (CONFIG_HPS_PERPLLGRP_SRC_SDMMC <<
+ CLKMGR_PERPLLGRP_SRC_SDMMC_OFFSET),
+
+ /* sdram pll group */
+ SDR_VCO_BASE,
+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_PHASE <<
+ CLKMGR_SDRPLLGRP_DDRDQSCLK_PHASE_OFFSET) |
+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_CNT <<
+ CLKMGR_SDRPLLGRP_DDRDQSCLK_CNT_OFFSET),
+ (CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_PHASE <<
+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_OFFSET) |
+ (CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT <<
+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_CNT_OFFSET),
+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_PHASE <<
+ CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_OFFSET) |
+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_CNT <<
+ CLKMGR_SDRPLLGRP_DDRDQCLK_CNT_OFFSET),
+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_PHASE <<
+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
+
+ /* altera group */
+ CONFIG_HPS_ALTERAGRP_MPUCLK,
+};
+
+/* Wrap SDRAM config */
+static const struct socfpga_sdram_config sdram_config = {
+ .ctrl_cfg =
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<
+ SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<
+ SDR_CTRLGRP_CTRLCFG_MEMBL_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<
+ SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN <<
+ SDR_CTRLGRP_CTRLCFG_ECCEN_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN <<
+ SDR_CTRLGRP_CTRLCFG_ECCCORREN_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN <<
+ SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<
+ SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<
+ SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<
+ SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),
+ .dram_timing1 =
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<
+ SDR_CTRLGRP_DRAMTIMING1_TCWL_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL <<
+ SDR_CTRLGRP_DRAMTIMING1_TAL_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL <<
+ SDR_CTRLGRP_DRAMTIMING1_TCL_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<
+ SDR_CTRLGRP_DRAMTIMING1_TRRD_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW <<
+ SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<
+ SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),
+ .dram_timing2 =
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI <<
+ SDR_CTRLGRP_DRAMTIMING2_TREFI_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRCD <<
+ SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP <<
+ SDR_CTRLGRP_DRAMTIMING2_TRP_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<
+ SDR_CTRLGRP_DRAMTIMING2_TWR_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR <<
+ SDR_CTRLGRP_DRAMTIMING2_TWTR_LSB),
+ .dram_timing3 =
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP <<
+ SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS <<
+ SDR_CTRLGRP_DRAMTIMING3_TRAS_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC <<
+ SDR_CTRLGRP_DRAMTIMING3_TRC_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<
+ SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<
+ SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),
+ .dram_timing4 =
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<
+ SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<
+ SDR_CTRLGRP_DRAMTIMING4_PWRDOWNEXIT_LSB),
+ .lowpwr_timing =
+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<
+ SDR_CTRLGRP_LOWPWRTIMING_AUTOPDCYCLES_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<
+ SDR_CTRLGRP_LOWPWRTIMING_CLKDISABLECYCLES_LSB),
+ .dram_odt =
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ <<
+ SDR_CTRLGRP_DRAMODT_READ_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<
+ SDR_CTRLGRP_DRAMODT_WRITE_LSB),
+ .extratime1 =
+ (CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR <<
+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_BC <<
+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_BC_LSB) |
+(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_DIFF_CHIP <<
+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_DIFF_LSB),
+ .dram_addrw =
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<
+ SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS <<
+ SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS <<
+ SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB) |
+ ((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<
+ SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),
+ .dram_if_width =
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<
+ SDR_CTRLGRP_DRAMIFWIDTH_IFWIDTH_LSB),
+ .dram_dev_width =
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<
+ SDR_CTRLGRP_DRAMDEVWIDTH_DEVWIDTH_LSB),
+ .dram_intr =
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN <<
+ SDR_CTRLGRP_DRAMINTR_INTREN_LSB),
+ .lowpwr_eq =
+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK <<
+ SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),
+ .static_cfg =
+ (CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<
+ SDR_CTRLGRP_STATICCFG_MEMBL_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<
+ SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),
+ .ctrl_width =
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<
+ SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),
+ .cport_width =
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<
+ SDR_CTRLGRP_CPORTWIDTH_CMDPORTWIDTH_LSB),
+ .cport_wmap =
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP <<
+ SDR_CTRLGRP_CPORTWMAP_CPORTWFIFOMAP_LSB),
+ .cport_rmap =
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP <<
+ SDR_CTRLGRP_CPORTRMAP_CPORTRFIFOMAP_LSB),
+ .rfifo_cmap =
+ (CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<
+ SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),
+ .wfifo_cmap =
+ (CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<
+ SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),
+ .cport_rdwr =
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<
+ SDR_CTRLGRP_CPORTRDWR_CPORTRDWR_LSB),
+ .port_cfg =
+ (CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN <<
+ SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LSB),
+ .fpgaport_rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,
+ .fifo_cfg =
+ (CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<
+ SDR_CTRLGRP_FIFOCFG_SYNCMODE_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_INCSYNC <<
+ SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),
+ .mp_priority =
+ (CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY <<
+ SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),
+ .mp_weight0 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0 <<
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_0_LSB),
+ .mp_weight1 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 <<
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_32_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB),
+ .mp_weight2 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 <<
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_14_LSB),
+ .mp_weight3 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),
+ .mp_pacing0 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<
+ SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),
+ .mp_pacing1 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59_32 <<
+ SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD1_59_32_LSB) |
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 <<
+ SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD2_3_0_LSB),
+ .mp_pacing2 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 <<
+ SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOLD2_35_4_LSB),
+ .mp_pacing3 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<
+ SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),
+ .mp_threshold0 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<
+ SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),
+ .mp_threshold1 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<
+ SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),
+ .mp_threshold2 =
+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 <<
+ SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LSB),
+ .phy_ctrl0 = CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,
+};
+
+static const struct socfpga_sdram_rw_mgr_config rw_mgr_config = {
+ .activate_0_and_1 = RW_MGR(ACTIVATE_0_AND_1),
+ .activate_0_and_1_wait1 = RW_MGR(ACTIVATE_0_AND_1_WAIT1),
+ .activate_0_and_1_wait2 = RW_MGR(ACTIVATE_0_AND_1_WAIT2),
+ .activate_1 = RW_MGR(ACTIVATE_1),
+ .clear_dqs_enable = RW_MGR(CLEAR_DQS_ENABLE),
+ .guaranteed_read = RW_MGR(GUARANTEED_READ),
+ .guaranteed_read_cont = RW_MGR(GUARANTEED_READ_CONT),
+ .guaranteed_write = RW_MGR(GUARANTEED_WRITE),
+ .guaranteed_write_wait0 = RW_MGR(GUARANTEED_WRITE_WAIT0),
+ .guaranteed_write_wait1 = RW_MGR(GUARANTEED_WRITE_WAIT1),
+ .guaranteed_write_wait2 = RW_MGR(GUARANTEED_WRITE_WAIT2),
+ .guaranteed_write_wait3 = RW_MGR(GUARANTEED_WRITE_WAIT3),
+ .idle = RW_MGR(IDLE),
+ .idle_loop1 = RW_MGR(IDLE_LOOP1),
+ .idle_loop2 = RW_MGR(IDLE_LOOP2),
+ .init_reset_0_cke_0 = RW_MGR(INIT_RESET_0_CKE_0),
+ .init_reset_1_cke_0 = RW_MGR(INIT_RESET_1_CKE_0),
+ .lfsr_wr_rd_bank_0 = RW_MGR(LFSR_WR_RD_BANK_0),
+ .lfsr_wr_rd_bank_0_data = RW_MGR(LFSR_WR_RD_BANK_0_DATA),
+ .lfsr_wr_rd_bank_0_dqs = RW_MGR(LFSR_WR_RD_BANK_0_DQS),
+ .lfsr_wr_rd_bank_0_nop = RW_MGR(LFSR_WR_RD_BANK_0_NOP),
+ .lfsr_wr_rd_bank_0_wait = RW_MGR(LFSR_WR_RD_BANK_0_WAIT),
+ .lfsr_wr_rd_bank_0_wl_1 = RW_MGR(LFSR_WR_RD_BANK_0_WL_1),
+ .lfsr_wr_rd_dm_bank_0 = RW_MGR(LFSR_WR_RD_DM_BANK_0),
+ .lfsr_wr_rd_dm_bank_0_data = RW_MGR(LFSR_WR_RD_DM_BANK_0_DATA),
+ .lfsr_wr_rd_dm_bank_0_dqs = RW_MGR(LFSR_WR_RD_DM_BANK_0_DQS),
+ .lfsr_wr_rd_dm_bank_0_nop = RW_MGR(LFSR_WR_RD_DM_BANK_0_NOP),
+ .lfsr_wr_rd_dm_bank_0_wait = RW_MGR(LFSR_WR_RD_DM_BANK_0_WAIT),
+ .lfsr_wr_rd_dm_bank_0_wl_1 = RW_MGR(LFSR_WR_RD_DM_BANK_0_WL_1),
+ .mrs0_dll_reset = RW_MGR(MRS0_DLL_RESET),
+ .mrs0_dll_reset_mirr = RW_MGR(MRS0_DLL_RESET_MIRR),
+ .mrs0_user = RW_MGR(MRS0_USER),
+ .mrs0_user_mirr = RW_MGR(MRS0_USER_MIRR),
+ .mrs1 = RW_MGR(MRS1),
+ .mrs1_mirr = RW_MGR(MRS1_MIRR),
+ .mrs2 = RW_MGR(MRS2),
+ .mrs2_mirr = RW_MGR(MRS2_MIRR),
+ .mrs3 = RW_MGR(MRS3),
+ .mrs3_mirr = RW_MGR(MRS3_MIRR),
+ .precharge_all = RW_MGR(PRECHARGE_ALL),
+ .read_b2b = RW_MGR(READ_B2B),
+ .read_b2b_wait1 = RW_MGR(READ_B2B_WAIT1),
+ .read_b2b_wait2 = RW_MGR(READ_B2B_WAIT2),
+ .refresh_all = RW_MGR(REFRESH_ALL),
+ .rreturn = RW_MGR(RETURN),
+ .sgle_read = RW_MGR(SGLE_READ),
+ .zqcl = RW_MGR(ZQCL),
+
+ .true_mem_data_mask_width = RW_MGR_TRUE_MEM_DATA_MASK_WIDTH,
+ .mem_address_mirroring = RW_MGR_MEM_ADDRESS_MIRRORING,
+ .mem_data_mask_width = RW_MGR_MEM_DATA_MASK_WIDTH,
+ .mem_data_width = RW_MGR_MEM_DATA_WIDTH,
+ .mem_dq_per_read_dqs = RW_MGR_MEM_DQ_PER_READ_DQS,
+ .mem_dq_per_write_dqs = RW_MGR_MEM_DQ_PER_WRITE_DQS,
+ .mem_if_read_dqs_width = RW_MGR_MEM_IF_READ_DQS_WIDTH,
+ .mem_if_write_dqs_width = RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
+ .mem_number_of_cs_per_dimm = RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM,
+ .mem_number_of_ranks = RW_MGR_MEM_NUMBER_OF_RANKS,
+ .mem_virtual_groups_per_read_dqs =
+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS,
+ .mem_virtual_groups_per_write_dqs =
+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS,
+};
+
+static const struct socfpga_sdram_io_config io_config = {
+ .delay_per_dchain_tap = IO_DELAY_PER_DCHAIN_TAP,
+ .delay_per_dqs_en_dchain_tap = IO_DELAY_PER_DQS_EN_DCHAIN_TAP,
+ .delay_per_opa_tap_lo = IO_DELAY_PER_OPA_TAP & 0xff,
+ .delay_per_opa_tap_hi = (IO_DELAY_PER_OPA_TAP << 8) & 0xff,
+ .dll_chain_length = IO_DLL_CHAIN_LENGTH,
+ .dqdqs_out_phase_max = IO_DQDQS_OUT_PHASE_MAX,
+ .dqs_en_delay_max = IO_DQS_EN_DELAY_MAX,
+ .dqs_en_delay_offset = IO_DQS_EN_DELAY_OFFSET,
+ .dqs_en_phase_max = IO_DQS_EN_PHASE_MAX,
+ .dqs_in_delay_max = IO_DQS_IN_DELAY_MAX,
+ .dqs_in_reserve = IO_DQS_IN_RESERVE,
+ .dqs_out_reserve = IO_DQS_OUT_RESERVE,
+ .io_in_delay_max = IO_IO_IN_DELAY_MAX,
+ .io_out1_delay_max = IO_IO_OUT1_DELAY_MAX,
+ .io_out2_delay_max = IO_IO_OUT2_DELAY_MAX,
+ .shift_dqs_en_when_shift_dqs = IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS,
+};
+
+static const struct socfpga_sdram_misc_config misc_config = {
+ .afi_rate_ratio = AFI_RATE_RATIO,
+ .calib_lfifo_offset = CALIB_LFIFO_OFFSET,
+ .calib_vfifo_offset = CALIB_VFIFO_OFFSET,
+ .enable_super_quick_calibration = ENABLE_SUPER_QUICK_CALIBRATION,
+ .max_latency_count_width = MAX_LATENCY_COUNT_WIDTH,
+ .read_valid_fifo_size = READ_VALID_FIFO_SIZE,
+ .reg_file_init_seq_signature_ll = REG_FILE_INIT_SEQ_SIGNATURE & 0xff,
+ .reg_file_init_seq_signature_lh = (REG_FILE_INIT_SEQ_SIGNATURE >> 8) &

0xff,
+ .reg_file_init_seq_signature_hl = (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,
+ .reg_file_init_seq_signature_hh = (REG_FILE_INIT_SEQ_SIGNATURE >> 24) & 0xff,
+ .tinit_cntr0_val = TINIT_CNTR0_VAL,
+ .tinit_cntr1_val = TINIT_CNTR1_VAL,
+ .tinit_cntr2_val = TINIT_CNTR2_VAL,
+ .treset_cntr0_val = TRESET_CNTR0_VAL,
+ .treset_cntr1_val = TRESET_CNTR1_VAL,
+ .treset_cntr2_val = TRESET_CNTR2_VAL,

arch/arm/mach-socfpga/create_handoff_gen5.c new file +34 -0
+};
+
+static void print_hdr(void)
+{
+ printf(handoff_dtsi_hdr);
+}
+
+static void print_clkmgr_base(void)
+{
+ const char handoff_dtsi_clkmgr_base[] =
+ "\n"
+ "&osc1 {\n"
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC1_HZ */
+ "};\n"
+ "\n"
+ "&osc2 {\n"
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC2_HZ */
+ "};\n"
+ "\n"
+ "&f2s_periph_ref_clk {\n"
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_PER_REF_HZ */
+ "};\n"
+ "\n"
+ "&f2s_sdram_ref_clk {\n"
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_SDR_REF_HZ */
+ "};\n";
+
+ printf(handoff_dtsi_clkmgr_base, CONFIG_HPS_CLK_OSC1_HZ,
+       CONFIG_HPS_CLK_OSC2_HZ, CONFIG_HPS_CLK_F2S_PER_REF_HZ,
+       CONFIG_HPS_CLK_F2S_SDR_REF_HZ);
+}
+
+/*
+ * dtc stores u32 array big endian but we load them raw and expect them to

be in
+ * little endian format. To prevent this tool to depend on host endianess, do
+ * the switch manually, not via 'htonl'.
+ */

arch/arm/mach-socfpga/create_handoff_gen5.c new file +28 -0
+static u32 swap_bytes(u32 val)
+{
+ return (val << 24) | ((val & 0xFF00ul) << 8) |
+ ((val & 0xFF0000ul) >> 8) | (val >> 24);
+}
+
+static void print_array_ulong(const unsigned long *arr, size_t arr_size,
+      size_t el_per_line, const char *indent1,
+      const char *name, const char *indent_next)
+{
+ size_t i;
+
+ printf("%s%s = <", indent1, name);
+ for (i = 0; i < arr_size; i++) {
+ printf("0x%08x", swap_bytes((u32)arr[i]));
+ if (i + 1 < arr_size) {
+ if (i % el_per_line == (el_per_line - 1)) {
+ printf("\n%s", indent_next);
+ } else {
+ printf(" ");
+ }
+ }
+ }
+ printf(">;\n");
+}
+
+#ifdef USE_QUARTUS_OUTPUT
+static void print_array_sysmgrinit(const unsigned long *arr, size_t

arr_size,

arch/arm/mach-socfpga/create_handoff_gen5.c new file +21 -0
+   const char *indent1, const char *name,
+   const char *indent_next)
+{
+ size_t i;
+
+ printf("%s%s = [", indent1, name);
+ for (i = 0; i < arr_size; i++) {
+ printf("%02x", (u8)arr[i]);
+ if (i + 1 < arr_size) {
+ if (i % 8 == 7) {
+ printf("\n%s", indent_next);
+ } else {
+ printf(" ");
+ }
+ }
+ }
+ printf("];\n");
+}
+#define print_array_alt_u32 print_array_ulong
+#else
+#define print_array_sysmgrinit(arr, sz, ind1, n, ind2) print_array_u8(arr,

sz, 8, ind1, n, ind2)

arch/arm/mach-socfpga/create_handoff_gen5.c new file +24 -0
+#define print_array_alt_u32 print_array_u32
+#endif
+
+static void print_array_u32(const u32 *arr, size_t arr_size,
+    size_t el_per_line, const char *indent1,
+    const char *name, const char *indent_next)
+{
+ size_t i;
+
+ printf("%s%s = <", indent1, name);
+ for (i = 0; i < arr_size; i++) {
+ printf("0x%08x", swap_bytes(arr[i]));
+ if (i + 1 < arr_size) {
+ if (i % el_per_line == (el_per_line - 1)) {
+ printf("\n%s", indent_next);
+ } else {
+ printf(" ");
+ }
+ }
+ }
+ printf(">;\n");
+}
+
+static void print_array_u8(const u8 *arr, size_t arr_size, size_t

el_per_line,

arch/arm/mach-socfpga/create_handoff_gen5.c new file +102 -0
+   const char *indent1, const char *name,
+   const char *indent_next)
+{
+ size_t i;
+
+ printf("%s%s = [", indent1, name);
+ for (i = 0; i < arr_size; i++) {
+ printf("%02x", arr[i]);
+ if (i + 1 < arr_size) {
+ if (i % el_per_line == (el_per_line - 1)) {
+ printf("\n%s", indent_next);
+ } else {
+ printf(" ");
+ }
+ }
+ }
+ printf("];\n");
+}
+
+
+static void print_clkmgr_cfg(void)
+{
+ const char handoff_dtsi_clkmgr_cfg_a[] =
+ "\n"
+ "&clkmgr {\n";
+ const char handoff_dtsi_clkmgr_cfg_b[] = "};\n";
+ const char clk_mgr_cfg_indent[] = "\t\t\t    ";
+
+ printf(handoff_dtsi_clkmgr_cfg_a);
+ print_array_u32((const u32 *)&cm_default, sizeof(cm_default)/4, 4, "\t",
+ "altr,clk-mgr-cfg", clk_mgr_cfg_indent);
+ printf(handoff_dtsi_clkmgr_cfg_b);
+}
+
+static void print_sysmgr(void)
+{
+ const char handoff_dtsi_sysmgr_begin[] =
+ "\n"
+ "&sysmgr {\n";
+ const char handoff_dtsi_sysmgr_end[] = "};\n";
+ const char sysmgr_cfg_indent[] = "\t\t\t\t\t";
+ size_t i;
+
+ printf(handoff_dtsi_sysmgr_begin);
+
+ /* sys_mgr_init_table is an u8 table */
+ print_array_sysmgrinit(sys_mgr_init_table, ARRAY_SIZE(sys_mgr_init_table),
+       "\t", "altr,pinmux-cfg","\t\t\t   ");
+ /* ioscr scan chain table 0 */
+ print_array_ulong(iocsr_scan_chain0_table,
+  ARRAY_SIZE(iocsr_scan_chain0_table), 4,
+  "\t", "altr,iocsr-scan-chain0-table",
+  sysmgr_cfg_indent);
+ /* ioscr scan chain table 0 */
+ print_array_ulong(iocsr_scan_chain1_table,
+  ARRAY_SIZE(iocsr_scan_chain1_table), 4,
+  "\t", "altr,iocsr-scan-chain1-table",
+  sysmgr_cfg_indent);
+ /* ioscr scan chain table 0 */
+ print_array_ulong(iocsr_scan_chain2_table,
+  ARRAY_SIZE(iocsr_scan_chain2_table), 4,
+  "\t", "altr,iocsr-scan-chain2-table",
+  sysmgr_cfg_indent);
+ /* ioscr scan chain table 0 */
+ print_array_ulong(iocsr_scan_chain3_table,
+  ARRAY_SIZE(iocsr_scan_chain3_table), 4,
+  "\t", "altr,iocsr-scan-chain3-table",
+  sysmgr_cfg_indent);
+ printf(handoff_dtsi_sysmgr_end);
+}
+
+static void print_sdram_cfg(void)
+{
+ const char handoff_dtsi_sdram_cfg_begin[] =
+ "\n"
+ "&sdr {\n";
+ const char handoff_dtsi_sdram_cfg_end[] = "};\n";
+
+ printf(handoff_dtsi_sdram_cfg_begin);
+ print_array_u32((const u32 *)&sdram_config, sizeof(sdram_config)/4, 4,
+ "\t", "altr,sdr-cfg", "\t\t\t");
+ print_array_u8((const u8 *)&rw_mgr_config, sizeof(rw_mgr_config), 8,
+ "\t", "altr,sdr-rw-mgr-cfg", "\t\t\t       ");
+ print_array_u8((const u8 *)&io_config, sizeof(io_config), 8,
+ "\t", "altr,sdr-io-cfg", "\t\t\t   ");
+ print_array_u8((const u8 *)&misc_config, sizeof(misc_config), 8,
+ "\t", "altr,sdr-misc-cfg", "\t\t\t     ");
+ print_array_alt_u32(ac_rom_init, ARRAY_SIZE(ac_rom_init), 4,
+ "\t", "altr,sdr-ac-rom-init", "\t\t\t\t");
+ print_array_alt_u32(inst_rom_init, ARRAY_SIZE(inst_rom_init), 4,
+ "\t", "altr,sdr-inst-rom-init", "\t\t\t\t  ");
+ printf(handoff_dtsi_sdram_cfg_end);
+}
+
+int main(void)
+{
+ print_hdr();
+ print_clkmgr_base();
+ print_clkmgr_cfg();
+ print_sysmgr();
+ print_sdram_cfg();
+}
arch/arm/mach- renamed from arch/arm/mach-socfpga/qts-to-handoff.sh +0 -0

socfpga/qts-to-handoff.sh
new file mode 100755
index 0000000000..b9032a5411

arch/arm/mach-socfpga/qts-to-handoff.sh new file +8 -0
@@ -0,0 +1,83 @@
+#!/bin/sh
+# This script converts Quartus handoff files (in Quartus or U-Boot format)
+# to a handoff.dtsi file.
+
+
+usage() {
+ MY_BASENAME=`basename $0`
+ echo "${MY_BASENAME} [soc_type] [input_qts_dir] [input_bsp_dir]

[output_file]"
+ echo " or"
+ echo "${MY_BASENAME} 'u-boot' [uboot_qts_dir] [output_file]"
+ echo ""
+ echo "Process QTS-generated headers into handoff.dtsi:"
+ echo ""
+ echo " soc_type - Type of SoC, either 'cyclone5' or 'arria5'."
+ echo " input_qts_dir - Directory with compiled Quartus project"
+ echo " and containing the Quartus project file (QPF)."
+ echo " input_bsp_dir - Directory with generated bsp containing"
+ echo " the settings.bsp file."
+ echo " output_file - Full filename to store the handoff dtsi file."
+ echo " uboot_qts_dir - board/qts directory if input files are in"
+ echo " 'old-style' U-Boot format."
+ echo ""

arch/arm/mach-socfpga/qts-to-handoff.sh new file +57 -1
+}
+
+soc="$1"
+
+HANDOFF_TEMPLATE="`dirname $0`/create_handoff_gen5.c"
+
+case "$soc" in
+"cyclone5"|"arria5")
+ if [ "$#" -ne 4 ] ; then
+ usage
+ exit 1
+ fi
+ in_qts_dir="$2"
+ in_bsp_dir="$3"
+ output_file="$4"
+ out_dir=`dirname ${output_file}`
+
+ if [ ! -d "${in_qts_dir}" -o ! -d "${in_bsp_dir}" -o \
+ ! -d "${out_dir}" -o -z "${soc}" ] ; then
+ usage
+ exit 3
+ fi
+
+ if [ "$soc" = "cyclone5" ] ; then
+ CMDLINE_DEFINES="-DCYCLONE5"
+ else
+ CMDLINE_DEFINES="-DARRIA5"
+ fi
+ CMDLINE_DEFINES="${CMDLINE_DEFINES} -DUSE_QUARTUS_OUTPUT
-I${in_bsp_dir}/generated/"
+ for d in ${in_qts_dir}/hps_isw_handoff/*/ ; do
+ CMDLINE_DEFINES="${CMDLINE_DEFINES} -I$d"
+ done
+ ;;
+"u-boot")
+ if [ "$#" -ne 3 ] ; then
+ usage
+ exit 1
+ fi
+ in_qts_dir="$2"
+ output_file="$3"
+ out_dir=`dirname ${output_file}`
+
+ if [ ! -d "${in_qts_dir}" -o ! -d "${out_dir}" ] ; then
+ usage
+ exit 3
+ fi
+
+ CMDLINE_DEFINES="-I${in_qts_dir}"
+ ;;
+*)
+ usage
+ exit 1
+ ;;
+esac
+
+# compile
+gcc ${CMDLINE_DEFINES} ${HANDOFF_TEMPLATE} -o

${out_dir}/create_handoff_gen5
+${out_dir}/create_handoff_gen5 > ${output_file}

arch/arm/mach-socfpga/qts-to-handoff.sh new file +3 -0
+
+# TODO: remove tmp file:
+#rm $${out_dir}/create_handoff_gen5
#16 lore raw

RFC PATCH v2 8/18 socfpga: gen5: add new tool to create handoff dtsi files

Am 24.10.2019 um 19:29 schrieb Dalon L Westergreen:

Quoted 88 lines · Simon Goldschmidt
Quoted 85 lines

On Thu, Oct 24, 2019 at 4:25 PM Dalon L Westergreen <
dalon.westergreen at linux.intel.com
<mailto:[email protected]>

Quoted 80 lines

wrote:

On Wed, 2019-10-23 at 21:22 +0200, Simon Goldschmidt wrote:

Am 23.10.2019 um 18:03 schrieb Dalon L Westergreen:

On Tue, 2019-10-22 at 19:13 +0200, Simon Goldschmidt wrote:

Dalon L Westergreen <

dalon.westergreen at linux.intel.com
<mailto:[email protected]>

<mailto:

dalon.westergreen at linux.intel.com
<mailto:[email protected]>

Quoted 1 line
Quoted 1 line

schrieb am Di., 22. Okt.

2019, 19:10:

I mentioned this before, it would be great to not rely on the

generated files

and do this based purely on the handoff data generated during a quartus

build. Did you look at the python source i pointed you to?

No, not yet. But I don't think that will be a problem. I sent this

series mainly to discuss the dts format (boardspecific handoff dtsi vs

genetic dtsi plus boardspecific header file).

The board specific dtsi does look cleaner, but i do like the simplicity

of generating the header in arria10.

I could easily replicate what you do, generate the header, and use it to

create the dtsi.

I'm not too fond myself of that tool I created, as it requires you to

have a compiler. I just was too lazy write a script for that.

However, I would prefer having a script that does it. And if the sources

are quartus output files instead of existing qts files, my tool doesn't

work any more, anway.

So I think we should come up with a script (e.g. sh or py) that parses

quartus output and creates a handoff dtsi (without a header). We'll only

need something different for converting existing qts files then...

In that case, i would stick with adding a .h file along with a common handoff dtsi as i did in the a10 filter script i sent the other week. I would suggest your source is perfect for migrating existing c5/a5 platforms.

Quoted 7 lines
Quoted 1 line

Why can't we change that a10 script to create handoff dtsi files as well?

I just dont like building the dtsi in source, the code to create a header is simpler and cleaner. From
a files perspective, 1 dtsi + a header for each board, or a dtsi for each board, not sure there is much
difference either way. but using headers keeps the utility simpler.

Well, you're right that writing the conversion tool is probably simpler when creating a header file compared to a dtsi. On the other hand, it only has to be written once, so it should not be too much of an issue?

However, looking at arch/arm/dts, socfpga would be the first mach to add board specific header files. I don't know if it's acceptable to do it like that? I'm not the gatekeeper here :-)

Regards,
Simon

Quoted 1,612 lines

--dalon

Quoted 1,609 lines
Quoted 4 lines

Is there a preference for python? It would fit nicely b/c we could re-use the code I pointed out previously for binary parsing.

Well, *my* preference would be to not depend on having gcc installed to convert from quartus output to dtsi. I just did that because C was easier to get started.

I'm not a big fan of python, but since it's used everywhere in U-Boot, I figured it should be ok? Having a standard shell script do the job would even lower the requirements of course.

Regards,
Simon

Quoted 1,593 lines

Dinh, Marek, Ley Foon, comments?

--dalon

Regards,

Simon

--dalon

I still favor boardspecific handoff dtsi, but I would like to use the

same style for all socfpga flavours.

Plus this tool is required to convert existing boards where we don't

have the quartus project files at hand.

Regards,

Simon

--dalon

On Tue, 2019-10-15 at 22:10 +0200, Simon Goldschmidt wrote:

This new tool converts handoff information from quartus to "*_handoff.dtsi"

devicetree files. This is in preparation to move from ad-hoc code in arch

that parses the 'qts' header files to drivers parsing the same information

from devicetree.

Converting existing U-Boot 'qts' files is also supported.

Signed-off-by Simon Goldschmidt <

simon.k.r.goldschmidt at gmail.com
<mailto:[email protected]>

<mailto:

simon.k.r.goldschmidt at gmail.com
<mailto:[email protected]>

Quoted 1 line

---

Changes in v2: None

   arch/arm/mach-socfpga/create_handoff_gen5.c | 660 ++++++++++++++++++++
   arch/arm/mach-socfpga/qts-to-handoff.sh     |  83 +++
   2 files changed, 743 insertions(+)

create mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c

create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh

arch/arm/mach-socfpga/create_handoff_gen5.c +0 -0

new file mode 100644

index 0000000000..6ec436719d

--- /dev/null

+++ b/arch/arm/mach-socfpga/create_handoff_gen5.c

arch/arm/mach-socfpga/create_handoff_gen5.c +660 -0
@@ -0,0 +1,660 @@
 
+// SPDX-License-Identifier: GPL-2.0
 
+/*
 
+ * This is a host-tool that needs to be compiled per board and prints the
 
+ * handoff.dtsi to stdout.
 
+ */
 
+
 
+#include <stdio.h>
 
+#include <stdint.h>
 
+
 
+/* Define kernel types */
 
+typedef uint8_t u8;
 
+typedef uint32_t u32;
 
+
 
+#ifdef USE_QUARTUS_OUTPUT
 
+#ifdef ARRIA5
 
+#include "iocsr_config_arria5.c"
 
+#include "pinmux_config_arria5.c"
 
+#else
 
+#include "iocsr_config_cyclone5.c"
 
+#include "pinmux_config_cyclone5.c"
 
+#endif
 
+#include "pll_config.h"
 
+#include "sdram/sdram_config.h"
 
+#include "sequencer_auto.h"
 
+#include "sequencer_defines.h"
 
+#include "sequencer_auto_ac_init.c"
 
+#include "sequencer_auto_inst_init.c"
 
+#define RW_MGR(x) __RW_MGR_##x
 
+#else
 
+#define RW_MGR(x) RW_MGR_##x
 
+#include <iocsr_config.h>
 
+#include <pinmux_config.h>
 
+#include <pll_config.h>
 
+#include <sdram_config.h>
 
+#endif
 
+
 
+#include "include/mach/clock_manager_gen5.h"
 
+#include "include/mach/sdram_gen5.h"
 
+
 
+#ifndef ARRAY_SIZE
 
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 
+#endif
 
+
 
+const char handoff_dtsi_hdr[] =
 
+ "// SPDX-License-Identifier: GPL-2.0\n"
 
+ "/*\n"
 
+ " *<auto-generated>\n"
 
+ " * This code was generated by a tool based on\n"
 
+ " * handoffs from both Qsys and Quartus.\n"
 
+ " *\n"
 
+ " * Changes to this file may be lost if\n"
 
+ " * the code is regenerated.\n"
 
+ " *</auto-generated>\n"
 
+ " */\n";
 
+
 
+/* Wrap PLL config */
 
+
 
+#define MAIN_VCO_BASE ( \
 
+ (CONFIG_HPS_MAINPLLGRP_VCO_DENOM << \
 
+ CLKMGR_MAINPLLGRP_VCO_DENOM_OFFSET) | \
 
+ (CONFIG_HPS_MAINPLLGRP_VCO_NUMER << \
 
+ CLKMGR_MAINPLLGRP_VCO_NUMER_OFFSET) \
 
+ )
 
+
 
+#define PERI_VCO_BASE ( \
 
+ (CONFIG_HPS_PERPLLGRP_VCO_PSRC << \
 
+ CLKMGR_PERPLLGRP_VCO_PSRC_OFFSET) | \
 
+ (CONFIG_HPS_PERPLLGRP_VCO_DENOM << \
 
+ CLKMGR_PERPLLGRP_VCO_DENOM_OFFSET) | \
 
+ (CONFIG_HPS_PERPLLGRP_VCO_NUMER << \
 
+ CLKMGR_PERPLLGRP_VCO_NUMER_OFFSET) \
 
+ )
 
+
 
+#define SDR_VCO_BASE ( \
 
+ (CONFIG_HPS_SDRPLLGRP_VCO_SSRC << \
 
+ CLKMGR_SDRPLLGRP_VCO_SSRC_OFFSET) | \
 
+ (CONFIG_HPS_SDRPLLGRP_VCO_DENOM << \
 
+ CLKMGR_SDRPLLGRP_VCO_DENOM_OFFSET) | \
 
+ (CONFIG_HPS_SDRPLLGRP_VCO_NUMER << \
 
+ CLKMGR_SDRPLLGRP_VCO_NUMER_OFFSET) \
 
+ )
 
+
 
+static const struct cm_config cm_default = {
 
+ /* main group */
 
+ MAIN_VCO_BASE,
 
+ (CONFIG_HPS_MAINPLLGRP_MPUCLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_MPUCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_MAINCLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_MAINCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_DBGATCLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_DBGATCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_MAINQSPICLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_MAINQSPICLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_MAINNANDSDMMCCLK_CNT <<
 
+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_CFGS2FUSER0CLK_CNT <<
 
+ CLKMGR_MAINPLLGRP_CFGS2FUSER0CLK_CNT_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L3MPCLK <<
 
+ CLKMGR_MAINPLLGRP_MAINDIV_L3MPCLK_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L3SPCLK <<
 
+ CLKMGR_MAINPLLGRP_MAINDIV_L3SPCLK_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L4MPCLK <<
 
+ CLKMGR_MAINPLLGRP_MAINDIV_L4MPCLK_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_MAINDIV_L4SPCLK <<
 
+ CLKMGR_MAINPLLGRP_MAINDIV_L4SPCLK_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGATCLK <<
 
+ CLKMGR_MAINPLLGRP_DBGDIV_DBGATCLK_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_DBGDIV_DBGCLK <<
 
+ CLKMGR_MAINPLLGRP_DBGDIV_DBGCLK_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_TRACEDIV_TRACECLK <<
 
+ CLKMGR_MAINPLLGRP_TRACEDIV_TRACECLK_OFFSET),
 
+ (CONFIG_HPS_MAINPLLGRP_L4SRC_L4MP <<
 
+ CLKMGR_MAINPLLGRP_L4SRC_L4MP_OFFSET) |
 
+ (CONFIG_HPS_MAINPLLGRP_L4SRC_L4SP <<
 
+ CLKMGR_MAINPLLGRP_L4SRC_L4SP_OFFSET),
 
+
 
+ /* peripheral group */
 
+ PERI_VCO_BASE,
 
+ (CONFIG_HPS_PERPLLGRP_EMAC0CLK_CNT <<
 
+ CLKMGR_PERPLLGRP_EMAC0CLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_EMAC1CLK_CNT <<
 
+ CLKMGR_PERPLLGRP_EMAC1CLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_PERQSPICLK_CNT <<
 
+ CLKMGR_PERPLLGRP_PERQSPICLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_PERNANDSDMMCCLK_CNT <<
 
+ CLKMGR_PERPLLGRP_PERNANDSDMMCCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_PERBASECLK_CNT <<
 
+ CLKMGR_PERPLLGRP_PERBASECLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_S2FUSER1CLK_CNT <<
 
+ CLKMGR_PERPLLGRP_S2FUSER1CLK_CNT_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_DIV_USBCLK <<
 
+ CLKMGR_PERPLLGRP_DIV_USBCLK_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_DIV_SPIMCLK <<
 
+ CLKMGR_PERPLLGRP_DIV_SPIMCLK_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_DIV_CAN0CLK <<
 
+ CLKMGR_PERPLLGRP_DIV_CAN0CLK_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_DIV_CAN1CLK <<
 
+ CLKMGR_PERPLLGRP_DIV_CAN1CLK_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_GPIODIV_GPIODBCLK <<
 
+ CLKMGR_PERPLLGRP_GPIODIV_GPIODBCLK_OFFSET),
 
+ (CONFIG_HPS_PERPLLGRP_SRC_QSPI <<
 
+ CLKMGR_PERPLLGRP_SRC_QSPI_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_SRC_NAND <<
 
+ CLKMGR_PERPLLGRP_SRC_NAND_OFFSET) |
 
+ (CONFIG_HPS_PERPLLGRP_SRC_SDMMC <<
 
+ CLKMGR_PERPLLGRP_SRC_SDMMC_OFFSET),
 
+
 
+ /* sdram pll group */
 
+ SDR_VCO_BASE,
 
+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_PHASE <<
 
+ CLKMGR_SDRPLLGRP_DDRDQSCLK_PHASE_OFFSET) |
 
+ (CONFIG_HPS_SDRPLLGRP_DDRDQSCLK_CNT <<
 
+ CLKMGR_SDRPLLGRP_DDRDQSCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_PHASE <<
 
+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_OFFSET) |
 
+ (CONFIG_HPS_SDRPLLGRP_DDR2XDQSCLK_CNT <<
 
+ CLKMGR_SDRPLLGRP_DDR2XDQSCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_PHASE <<
 
+ CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_OFFSET) |
 
+ (CONFIG_HPS_SDRPLLGRP_DDRDQCLK_CNT <<
 
+ CLKMGR_SDRPLLGRP_DDRDQCLK_CNT_OFFSET),
 
+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_PHASE <<
 
+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_OFFSET) |
 
+ (CONFIG_HPS_SDRPLLGRP_S2FUSER2CLK_CNT <<
 
+ CLKMGR_SDRPLLGRP_S2FUSER2CLK_CNT_OFFSET),
 
+
 
+ /* altera group */
 
+ CONFIG_HPS_ALTERAGRP_MPUCLK,
 
+};
 
+
 
+/* Wrap SDRAM config */
 
+static const struct socfpga_sdram_config sdram_config = {
 
+ .ctrl_cfg =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<
 
+ SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<
 
+ SDR_CTRLGRP_CTRLCFG_MEMBL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<
 
+ SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN <<
 
+ SDR_CTRLGRP_CTRLCFG_ECCEN_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN <<
 
+ SDR_CTRLGRP_CTRLCFG_ECCCORREN_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN <<
 
+ SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<
 
+ SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<
 
+ SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<
 
+ SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),
 
+ .dram_timing1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TCWL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TAL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TCL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TRRD_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<
 
+ SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),
 
+ .dram_timing2 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TREFI_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRCD <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TRP_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TWR_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR <<
 
+ SDR_CTRLGRP_DRAMTIMING2_TWTR_LSB),
 
+ .dram_timing3 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TRAS_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TRC_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<
 
+ SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),
 
+ .dram_timing4 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<
 
+ SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<
 
+ SDR_CTRLGRP_DRAMTIMING4_PWRDOWNEXIT_LSB),
 
+ .lowpwr_timing =
 
+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<
 
+ SDR_CTRLGRP_LOWPWRTIMING_AUTOPDCYCLES_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<
 
+ SDR_CTRLGRP_LOWPWRTIMING_CLKDISABLECYCLES_LSB),
 
+ .dram_odt =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ <<
 
+ SDR_CTRLGRP_DRAMODT_READ_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<
 
+ SDR_CTRLGRP_DRAMODT_WRITE_LSB),
 
+ .extratime1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR <<
 
+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_BC <<
 
+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_BC_LSB) |
 
+(CONFIG_HPS_SDR_CTRLCFG_EXTRATIME1_CFG_EXTRA_CTL_CLK_RD_TO_WR_DIFF_CHIP <<
 
+ SDR_CTRLGRP_EXTRATIME1_RD_TO_WR_DIFF_LSB),
 
+ .dram_addrw =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<
 
+ SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS <<
 
+ SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS <<
 
+ SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB) |
 
+ ((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<
 
+ SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),
 
+ .dram_if_width =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<
 
+ SDR_CTRLGRP_DRAMIFWIDTH_IFWIDTH_LSB),
 
+ .dram_dev_width =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<
 
+ SDR_CTRLGRP_DRAMDEVWIDTH_DEVWIDTH_LSB),
 
+ .dram_intr =
 
+ (CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN <<
 
+ SDR_CTRLGRP_DRAMINTR_INTREN_LSB),
 
+ .lowpwr_eq =
 
+ (CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK <<
 
+ SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),
 
+ .static_cfg =
 
+ (CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<
 
+ SDR_CTRLGRP_STATICCFG_MEMBL_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<
 
+ SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),
 
+ .ctrl_width =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<
 
+ SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),
 
+ .cport_width =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<
 
+ SDR_CTRLGRP_CPORTWIDTH_CMDPORTWIDTH_LSB),
 
+ .cport_wmap =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP <<
 
+ SDR_CTRLGRP_CPORTWMAP_CPORTWFIFOMAP_LSB),
 
+ .cport_rmap =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP <<
 
+ SDR_CTRLGRP_CPORTRMAP_CPORTRFIFOMAP_LSB),
 
+ .rfifo_cmap =
 
+ (CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<
 
+ SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),
 
+ .wfifo_cmap =
 
+ (CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<
 
+ SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),
 
+ .cport_rdwr =
 
+ (CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<
 
+ SDR_CTRLGRP_CPORTRDWR_CPORTRDWR_LSB),
 
+ .port_cfg =
 
+ (CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN <<
 
+ SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LSB),
 
+ .fpgaport_rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,
 
+ .fifo_cfg =
 
+ (CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<
 
+ SDR_CTRLGRP_FIFOCFG_SYNCMODE_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_INCSYNC <<
 
+ SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),
 
+ .mp_priority =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY <<
 
+ SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),
 
+ .mp_weight0 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_0_LSB),
 
+ .mp_weight1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_32_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB),
 
+ .mp_weight2 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_14_LSB),
 
+ .mp_weight3 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<
 
+ SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),
 
+ .mp_pacing0 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),
 
+ .mp_pacing1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59_32 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD1_59_32_LSB) |
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD2_3_0_LSB),
 
+ .mp_pacing2 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOLD2_35_4_LSB),
 
+ .mp_pacing3 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<
 
+ SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),
 
+ .mp_threshold0 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<
 
+ SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),
 
+ .mp_threshold1 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<
 
+ SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),
 
+ .mp_threshold2 =
 
+ (CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 <<
 
+ SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LSB),
 
+ .phy_ctrl0 = CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,
 
+};
 
+
 
+static const struct socfpga_sdram_rw_mgr_config rw_mgr_config = {
 
+ .activate_0_and_1 = RW_MGR(ACTIVATE_0_AND_1),
 
+ .activate_0_and_1_wait1 = RW_MGR(ACTIVATE_0_AND_1_WAIT1),
 
+ .activate_0_and_1_wait2 = RW_MGR(ACTIVATE_0_AND_1_WAIT2),
 
+ .activate_1 = RW_MGR(ACTIVATE_1),
 
+ .clear_dqs_enable = RW_MGR(CLEAR_DQS_ENABLE),
 
+ .guaranteed_read = RW_MGR(GUARANTEED_READ),
 
+ .guaranteed_read_cont = RW_MGR(GUARANTEED_READ_CONT),
 
+ .guaranteed_write = RW_MGR(GUARANTEED_WRITE),
 
+ .guaranteed_write_wait0 = RW_MGR(GUARANTEED_WRITE_WAIT0),
 
+ .guaranteed_write_wait1 = RW_MGR(GUARANTEED_WRITE_WAIT1),
 
+ .guaranteed_write_wait2 = RW_MGR(GUARANTEED_WRITE_WAIT2),
 
+ .guaranteed_write_wait3 = RW_MGR(GUARANTEED_WRITE_WAIT3),
 
+ .idle = RW_MGR(IDLE),
 
+ .idle_loop1 = RW_MGR(IDLE_LOOP1),
 
+ .idle_loop2 = RW_MGR(IDLE_LOOP2),
 
+ .init_reset_0_cke_0 = RW_MGR(INIT_RESET_0_CKE_0),
 
+ .init_reset_1_cke_0 = RW_MGR(INIT_RESET_1_CKE_0),
 
+ .lfsr_wr_rd_bank_0 = RW_MGR(LFSR_WR_RD_BANK_0),
 
+ .lfsr_wr_rd_bank_0_data = RW_MGR(LFSR_WR_RD_BANK_0_DATA),
 
+ .lfsr_wr_rd_bank_0_dqs = RW_MGR(LFSR_WR_RD_BANK_0_DQS),
 
+ .lfsr_wr_rd_bank_0_nop = RW_MGR(LFSR_WR_RD_BANK_0_NOP),
 
+ .lfsr_wr_rd_bank_0_wait = RW_MGR(LFSR_WR_RD_BANK_0_WAIT),
 
+ .lfsr_wr_rd_bank_0_wl_1 = RW_MGR(LFSR_WR_RD_BANK_0_WL_1),
 
+ .lfsr_wr_rd_dm_bank_0 = RW_MGR(LFSR_WR_RD_DM_BANK_0),
 
+ .lfsr_wr_rd_dm_bank_0_data = RW_MGR(LFSR_WR_RD_DM_BANK_0_DATA),
 
+ .lfsr_wr_rd_dm_bank_0_dqs = RW_MGR(LFSR_WR_RD_DM_BANK_0_DQS),
 
+ .lfsr_wr_rd_dm_bank_0_nop = RW_MGR(LFSR_WR_RD_DM_BANK_0_NOP),
 
+ .lfsr_wr_rd_dm_bank_0_wait = RW_MGR(LFSR_WR_RD_DM_BANK_0_WAIT),
 
+ .lfsr_wr_rd_dm_bank_0_wl_1 = RW_MGR(LFSR_WR_RD_DM_BANK_0_WL_1),
 
+ .mrs0_dll_reset = RW_MGR(MRS0_DLL_RESET),
 
+ .mrs0_dll_reset_mirr = RW_MGR(MRS0_DLL_RESET_MIRR),
 
+ .mrs0_user = RW_MGR(MRS0_USER),
 
+ .mrs0_user_mirr = RW_MGR(MRS0_USER_MIRR),
 
+ .mrs1 = RW_MGR(MRS1),
 
+ .mrs1_mirr = RW_MGR(MRS1_MIRR),
 
+ .mrs2 = RW_MGR(MRS2),
 
+ .mrs2_mirr = RW_MGR(MRS2_MIRR),
 
+ .mrs3 = RW_MGR(MRS3),
 
+ .mrs3_mirr = RW_MGR(MRS3_MIRR),
 
+ .precharge_all = RW_MGR(PRECHARGE_ALL),
 
+ .read_b2b = RW_MGR(READ_B2B),
 
+ .read_b2b_wait1 = RW_MGR(READ_B2B_WAIT1),
 
+ .read_b2b_wait2 = RW_MGR(READ_B2B_WAIT2),
 
+ .refresh_all = RW_MGR(REFRESH_ALL),
 
+ .rreturn = RW_MGR(RETURN),
 
+ .sgle_read = RW_MGR(SGLE_READ),
 
+ .zqcl = RW_MGR(ZQCL),
 
+
 
+ .true_mem_data_mask_width = RW_MGR_TRUE_MEM_DATA_MASK_WIDTH,
 
+ .mem_address_mirroring = RW_MGR_MEM_ADDRESS_MIRRORING,
 
+ .mem_data_mask_width = RW_MGR_MEM_DATA_MASK_WIDTH,
 
+ .mem_data_width = RW_MGR_MEM_DATA_WIDTH,
 
+ .mem_dq_per_read_dqs = RW_MGR_MEM_DQ_PER_READ_DQS,
 
+ .mem_dq_per_write_dqs = RW_MGR_MEM_DQ_PER_WRITE_DQS,
 
+ .mem_if_read_dqs_width = RW_MGR_MEM_IF_READ_DQS_WIDTH,
 
+ .mem_if_write_dqs_width = RW_MGR_MEM_IF_WRITE_DQS_WIDTH,
 
+ .mem_number_of_cs_per_dimm = RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM,
 
+ .mem_number_of_ranks = RW_MGR_MEM_NUMBER_OF_RANKS,
 
+ .mem_virtual_groups_per_read_dqs =
 
+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS,
 
+ .mem_virtual_groups_per_write_dqs =
 
+ RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS,
 
+};
 
+
 
+static const struct socfpga_sdram_io_config io_config = {
 
+ .delay_per_dchain_tap = IO_DELAY_PER_DCHAIN_TAP,
 
+ .delay_per_dqs_en_dchain_tap = IO_DELAY_PER_DQS_EN_DCHAIN_TAP,
 
+ .delay_per_opa_tap_lo = IO_DELAY_PER_OPA_TAP & 0xff,
 
+ .delay_per_opa_tap_hi = (IO_DELAY_PER_OPA_TAP << 8) & 0xff,
 
+ .dll_chain_length = IO_DLL_CHAIN_LENGTH,
 
+ .dqdqs_out_phase_max = IO_DQDQS_OUT_PHASE_MAX,
 
+ .dqs_en_delay_max = IO_DQS_EN_DELAY_MAX,
 
+ .dqs_en_delay_offset = IO_DQS_EN_DELAY_OFFSET,
 
+ .dqs_en_phase_max = IO_DQS_EN_PHASE_MAX,
 
+ .dqs_in_delay_max = IO_DQS_IN_DELAY_MAX,
 
+ .dqs_in_reserve = IO_DQS_IN_RESERVE,
 
+ .dqs_out_reserve = IO_DQS_OUT_RESERVE,
 
+ .io_in_delay_max = IO_IO_IN_DELAY_MAX,
 
+ .io_out1_delay_max = IO_IO_OUT1_DELAY_MAX,
 
+ .io_out2_delay_max = IO_IO_OUT2_DELAY_MAX,
 
+ .shift_dqs_en_when_shift_dqs = IO_SHIFT_DQS_EN_WHEN_SHIFT_DQS,
 
+};
 
+
 
+static const struct socfpga_sdram_misc_config misc_config = {
 
+ .afi_rate_ratio = AFI_RATE_RATIO,
 
+ .calib_lfifo_offset = CALIB_LFIFO_OFFSET,
 
+ .calib_vfifo_offset = CALIB_VFIFO_OFFSET,
 
+ .enable_super_quick_calibration = ENABLE_SUPER_QUICK_CALIBRATION,
 
+ .max_latency_count_width = MAX_LATENCY_COUNT_WIDTH,
 
+ .read_valid_fifo_size = READ_VALID_FIFO_SIZE,
 
+ .reg_file_init_seq_signature_ll = REG_FILE_INIT_SEQ_SIGNATURE & 0xff,
 
+ .reg_file_init_seq_signature_lh = (REG_FILE_INIT_SEQ_SIGNATURE >> 8) & 0xff,
 
+ .reg_file_init_seq_signature_hl = (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,
 
+ .reg_file_init_seq_signature_hh = (REG_FILE_INIT_SEQ_SIGNATURE >> 24) & 0xff,
 
+ .tinit_cntr0_val = TINIT_CNTR0_VAL,
 
+ .tinit_cntr1_val = TINIT_CNTR1_VAL,
 
+ .tinit_cntr2_val = TINIT_CNTR2_VAL,
 
+ .treset_cntr0_val = TRESET_CNTR0_VAL,
 
+ .treset_cntr1_val = TRESET_CNTR1_VAL,
 
+ .treset_cntr2_val = TRESET_CNTR2_VAL,
 
+};
 
+
 
+static void print_hdr(void)
 
+{
 
+ printf(handoff_dtsi_hdr);
 
+}
 
+
 
+static void print_clkmgr_base(void)
 
+{
 
+ const char handoff_dtsi_clkmgr_base[] =
 
+ "\n"
 
+ "&osc1 {\n"
 
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC1_HZ */
 
+ "};\n"
 
+ "\n"
 
+ "&osc2 {\n"
 
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_OSC2_HZ */
 
+ "};\n"
 
+ "\n"
 
+ "&f2s_periph_ref_clk {\n"
 
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_PER_REF_HZ */
 
+ "};\n"
 
+ "\n"
 
+ "&f2s_sdram_ref_clk {\n"
 
+ " clock-frequency = <%d>;\n" /* CONFIG_HPS_CLK_F2S_SDR_REF_HZ */
 
+ "};\n";
 
+
 
+ printf(handoff_dtsi_clkmgr_base, CONFIG_HPS_CLK_OSC1_HZ,
 
+       CONFIG_HPS_CLK_OSC2_HZ, CONFIG_HPS_CLK_F2S_PER_REF_HZ,
 
+       CONFIG_HPS_CLK_F2S_SDR_REF_HZ);
 
+}
 
+
 
+/*
 
+ * dtc stores u32 array big endian but we load them raw and expect them to be in
 
+ * little endian format. To prevent this tool to depend on host endianess, do
 
+ * the switch manually, not via 'htonl'.
 
+ */
 
+static u32 swap_bytes(u32 val)
 
+{
 
+ return (val << 24) | ((val & 0xFF00ul) << 8) |
 
+ ((val & 0xFF0000ul) >> 8) | (val >> 24);
 
+}
 
+
 
+static void print_array_ulong(const unsigned long *arr, size_t arr_size,
 
+      size_t el_per_line, const char *indent1,
 
+      const char *name, const char *indent_next)
 
+{
 
+ size_t i;
 
+
 
+ printf("%s%s = <", indent1, name);
 
+ for (i = 0; i < arr_size; i++) {
 
+ printf("0x%08x", swap_bytes((u32)arr[i]));
 
+ if (i + 1 < arr_size) {
 
+ if (i % el_per_line == (el_per_line - 1)) {
 
+ printf("\n%s", indent_next);
 
+ } else {
 
+ printf(" ");
 
+ }
 
+ }
 
+ }
 
+ printf(">;\n");
 
+}
 
+
 
+#ifdef USE_QUARTUS_OUTPUT
 
+static void print_array_sysmgrinit(const unsigned long *arr, size_t arr_size,
 
+   const char *indent1, const char *name,
 
+   const char *indent_next)
 
+{
 
+ size_t i;
 
+
 
+ printf("%s%s = [", indent1, name);
 
+ for (i = 0; i < arr_size; i++) {
 
+ printf("%02x", (u8)arr[i]);
 
+ if (i + 1 < arr_size) {
 
+ if (i % 8 == 7) {
 
+ printf("\n%s", indent_next);
 
+ } else {
 
+ printf(" ");
 
+ }
 
+ }
 
+ }
 
+ printf("];\n");
 
+}
 
+#define print_array_alt_u32 print_array_ulong
 
+#else
 
+#define print_array_sysmgrinit(arr, sz, ind1, n, ind2) print_array_u8(arr, sz, 8, ind1, n, ind2)
 
+#define print_array_alt_u32 print_array_u32
 
+#endif
 
+
 
+static void print_array_u32(const u32 *arr, size_t arr_size,
 
+    size_t el_per_line, const char *indent1,
 
+    const char *name, const char *indent_next)
 
+{
 
+ size_t i;
 
+
 
+ printf("%s%s = <", indent1, name);
 
+ for (i = 0; i < arr_size; i++) {
 
+ printf("0x%08x", swap_bytes(arr[i]));
 
+ if (i + 1 < arr_size) {
 
+ if (i % el_per_line == (el_per_line - 1)) {
 
+ printf("\n%s", indent_next);
 
+ } else {
 
+ printf(" ");
 
+ }
 
+ }
 
+ }
 
+ printf(">;\n");
 
+}
 
+
 
+static void print_array_u8(const u8 *arr, size_t arr_size, size_t el_per_line,
 
+   const char *indent1, const char *name,
 
+   const char *indent_next)
 
+{
 
+ size_t i;
 
+
 
+ printf("%s%s = [", indent1, name);
 
+ for (i = 0; i < arr_size; i++) {
 
+ printf("%02x", arr[i]);
 
+ if (i + 1 < arr_size) {
 
+ if (i % el_per_line == (el_per_line - 1)) {
 
+ printf("\n%s", indent_next);
 
+ } else {
 
+ printf(" ");
 
+ }
 
+ }
 
+ }
 
+ printf("];\n");
 
+}
 
+
 
+
 
+static void print_clkmgr_cfg(void)
 
+{
 
+ const char handoff_dtsi_clkmgr_cfg_a[] =
 
+ "\n"
 
+ "&clkmgr {\n";
 
+ const char handoff_dtsi_clkmgr_cfg_b[] = "};\n";
 
+ const char clk_mgr_cfg_indent[] = "\t\t\t    ";
 
+
 
+ printf(handoff_dtsi_clkmgr_cfg_a);
 
+ print_array_u32((const u32 *)&cm_default, sizeof(cm_default)/4, 4, "\t",
 
+ "altr,clk-mgr-cfg", clk_mgr_cfg_indent);
 
+ printf(handoff_dtsi_clkmgr_cfg_b);
 
+}
 
+
 
+static void print_sysmgr(void)
 
+{
 
+ const char handoff_dtsi_sysmgr_begin[] =
 
+ "\n"
 
+ "&sysmgr {\n";
 
+ const char handoff_dtsi_sysmgr_end[] = "};\n";
 
+ const char sysmgr_cfg_indent[] = "\t\t\t\t\t";
 
+ size_t i;
 
+
 
+ printf(handoff_dtsi_sysmgr_begin);
 
+
 
+ /* sys_mgr_init_table is an u8 table */
 
+ print_array_sysmgrinit(sys_mgr_init_table, ARRAY_SIZE(sys_mgr_init_table),
 
+       "\t", "altr,pinmux-cfg","\t\t\t   ");
 
+ /* ioscr scan chain table 0 */
 
+ print_array_ulong(iocsr_scan_chain0_table,
 
+  ARRAY_SIZE(iocsr_scan_chain0_table), 4,
 
+  "\t", "altr,iocsr-scan-chain0-table",
 
+  sysmgr_cfg_indent);
 
+ /* ioscr scan chain table 0 */
 
+ print_array_ulong(iocsr_scan_chain1_table,
 
+  ARRAY_SIZE(iocsr_scan_chain1_table), 4,
 
+  "\t", "altr,iocsr-scan-chain1-table",
 
+  sysmgr_cfg_indent);
 
+ /* ioscr scan chain table 0 */
 
+ print_array_ulong(iocsr_scan_chain2_table,
 
+  ARRAY_SIZE(iocsr_scan_chain2_table), 4,
 
+  "\t", "altr,iocsr-scan-chain2-table",
 
+  sysmgr_cfg_indent);
 
+ /* ioscr scan chain table 0 */
 
+ print_array_ulong(iocsr_scan_chain3_table,
 
+  ARRAY_SIZE(iocsr_scan_chain3_table), 4,
 
+  "\t", "altr,iocsr-scan-chain3-table",
 
+  sysmgr_cfg_indent);
 
+ printf(handoff_dtsi_sysmgr_end);
 
+}
 
+
 
+static void print_sdram_cfg(void)
 
+{
 
+ const char handoff_dtsi_sdram_cfg_begin[] =
 
+ "\n"
 
+ "&sdr {\n";
 
+ const char handoff_dtsi_sdram_cfg_end[] = "};\n";
 
+
 
+ printf(handoff_dtsi_sdram_cfg_begin);
 
+ print_array_u32((const u32 *)&sdram_config, sizeof(sdram_config)/4, 4,
 
+ "\t", "altr,sdr-cfg", "\t\t\t");
 
+ print_array_u8((const u8 *)&rw_mgr_config, sizeof(rw_mgr_config), 8,
 
+ "\t", "altr,sdr-rw-mgr-cfg", "\t\t\t       ");
 
+ print_array_u8((const u8 *)&io_config, sizeof(io_config), 8,
 
+ "\t", "altr,sdr-io-cfg", "\t\t\t   ");
 
+ print_array_u8((const u8 *)&misc_config, sizeof(misc_config), 8,
 
+ "\t", "altr,sdr-misc-cfg", "\t\t\t     ");
 
+ print_array_alt_u32(ac_rom_init, ARRAY_SIZE(ac_rom_init), 4,
 
+ "\t", "altr,sdr-ac-rom-init", "\t\t\t\t");
 
+ print_array_alt_u32(inst_rom_init, ARRAY_SIZE(inst_rom_init), 4,
 
+ "\t", "altr,sdr-inst-rom-init", "\t\t\t\t  ");
 
+ printf(handoff_dtsi_sdram_cfg_end);
 
+}
 
+
 
+int main(void)
 
+{
 
+ print_hdr();
 
+ print_clkmgr_base();
 
+ print_clkmgr_cfg();
 
+ print_sysmgr();
 
+ print_sdram_cfg();
 
+}
arch/arm/mach-socfpga/qts-to-handoff.sh +0 -0

new file mode 100755

index 0000000000..b9032a5411

--- /dev/null

+++ b/arch/arm/mach-socfpga/qts-to-handoff.sh

arch/arm/mach-socfpga/qts-to-handoff.sh +83 -0
@@ -0,0 +1,83 @@
 
+#!/bin/sh
 
+# This script converts Quartus handoff files (in Quartus or U-Boot format)
 
+# to a handoff.dtsi file.
 
+
 
+
 
+usage() {
 
+ MY_BASENAME=`basename $0`
 
+ echo "${MY_BASENAME} [soc_type] [input_qts_dir] [input_bsp_dir] [output_file]"
 
+ echo " or"
 
+ echo "${MY_BASENAME} 'u-boot' [uboot_qts_dir] [output_file]"
 
+ echo ""
 
+ echo "Process QTS-generated headers into handoff.dtsi:"
 
+ echo ""
 
+ echo "  soc_type      - Type of SoC, either 'cyclone5' or 'arria5'."
 
+ echo "  input_qts_dir - Directory with compiled Quartus project"
 
+ echo "                  and containing the Quartus project file (QPF)."
 
+ echo "  input_bsp_dir - Directory with generated bsp containing"
 
+ echo "                  the settings.bsp file."
 
+ echo "  output_file   - Full filename to store the handoff dtsi file."
 
+ echo "  uboot_qts_dir - board/qts directory if input files are in"
 
+ echo "                  'old-style' U-Boot format."
 
+ echo ""
 
+}
 
+
 
+soc="$1"
 
+
 
+HANDOFF_TEMPLATE="`dirname $0`/create_handoff_gen5.c"
 
+
 
+case "$soc" in
 
+"cyclone5"|"arria5")
 
+ if [ "$#" -ne 4 ] ; then
 
+ usage
 
+ exit 1
 
+ fi
 
+ in_qts_dir="$2"
 
+ in_bsp_dir="$3"
 
+ output_file="$4"
 
+ out_dir=`dirname ${output_file}`
 
+
 
+ if [ ! -d "${in_qts_dir}" -o ! -d "${in_bsp_dir}" -o \
 
+ ! -d "${out_dir}" -o -z "${soc}" ] ; then
 
+ usage
 
+ exit 3
 
+ fi
 
+
 
+ if [ "$soc" = "cyclone5" ] ; then
 
+ CMDLINE_DEFINES="-DCYCLONE5"
 
+ else
 
+ CMDLINE_DEFINES="-DARRIA5"
 
+ fi
 
+ CMDLINE_DEFINES="${CMDLINE_DEFINES} -DUSE_QUARTUS_OUTPUT -I${in_bsp_dir}/generated/"
 
+ for d in ${in_qts_dir}/hps_isw_handoff/*/ ; do
 
+ CMDLINE_DEFINES="${CMDLINE_DEFINES} -I$d"
 
+ done
 
+ ;;
 
+"u-boot")
 
+ if [ "$#" -ne 3 ] ; then
 
+ usage
 
+ exit 1
 
+ fi
 
+ in_qts_dir="$2"
 
+ output_file="$3"
 
+ out_dir=`dirname ${output_file}`
 
+
 
+ if [ ! -d "${in_qts_dir}" -o ! -d "${out_dir}" ] ; then
 
+ usage
 
+ exit 3
 
+ fi
 
+
 
+ CMDLINE_DEFINES="-I${in_qts_dir}"
 
+ ;;
 
+*)
 
+ usage
 
+ exit 1
 
+ ;;
 
+esac
 
+
 
+# compile
 
+gcc ${CMDLINE_DEFINES} ${HANDOFF_TEMPLATE} -o ${out_dir}/create_handoff_gen5
 
+${out_dir}/create_handoff_gen5 > ${output_file}
 
+
 
+# TODO: remove tmp file:
 
+#rm $${out_dir}/create_handoff_gen5
#17 lore raw

RFC PATCH v2 9/18 sdram: socfpga: gen5: make config structs dts compatible

In reply to Simon Goldschmidt

In preparation of moving SDRAM config from 'qts' files to devicetree, make the config structs compatible to devicetree by keeping all struct members of the same type (u8 or u32). That way, these structs can be stored to devicetree as simple array.

---

Changes in v2: None

 .../mach-socfpga/include/mach/sdram_gen5.h    |  8 +++-
 arch/arm/mach-socfpga/wrap_sdram_config.c     |  8 +++-
 drivers/ddr/altera/sequencer.c                | 39 +++++++++++--------
 3 files changed, 35 insertions(+), 20 deletions(-)
arch/arm/mach-socfpga/include/mach/sdram_gen5.h +6 -2
index c41208591a..7353b1c5e6 100644
@@ -180,7 +180,8 @@ struct socfpga_sdram_rw_mgr_config {
 };
 
 struct socfpga_sdram_io_config {
-	u16	delay_per_opa_tap;
+	u8	delay_per_opa_tap_lo;
+	u8	delay_per_opa_tap_hi;
 	u8	delay_per_dchain_tap;
 	u8	delay_per_dqs_en_dchain_tap;
 	u8	dll_chain_length;
@@ -198,7 +199,10 @@ struct socfpga_sdram_io_config {
 };
 
 struct socfpga_sdram_misc_config {
-	u32	reg_file_init_seq_signature;
+	u8	reg_file_init_seq_signature_ll;
+	u8	reg_file_init_seq_signature_lh;
+	u8	reg_file_init_seq_signature_hl;
+	u8	reg_file_init_seq_signature_hh;
 	u8	afi_rate_ratio;
 	u8	calib_lfifo_offset;
 	u8	calib_vfifo_offset;
arch/arm/mach-socfpga/wrap_sdram_config.c +6 -2
index 2b072cc65e..c43c2423a0 100644
@@ -254,7 +254,8 @@ static const struct socfpga_sdram_rw_mgr_config rw_mgr_config = {
 static const struct socfpga_sdram_io_config io_config = {
 	.delay_per_dchain_tap		= IO_DELAY_PER_DCHAIN_TAP,
 	.delay_per_dqs_en_dchain_tap	= IO_DELAY_PER_DQS_EN_DCHAIN_TAP,
-	.delay_per_opa_tap		= IO_DELAY_PER_OPA_TAP,
+	.delay_per_opa_tap_lo		= IO_DELAY_PER_OPA_TAP & 0xff,
+	.delay_per_opa_tap_hi		= (IO_DELAY_PER_OPA_TAP << 8) & 0xff,
 	.dll_chain_length		= IO_DLL_CHAIN_LENGTH,
 	.dqdqs_out_phase_max		= IO_DQDQS_OUT_PHASE_MAX,
 	.dqs_en_delay_max		= IO_DQS_EN_DELAY_MAX,
@@ -276,7 +277,10 @@ static const struct socfpga_sdram_misc_config misc_config = {
 	.enable_super_quick_calibration	= ENABLE_SUPER_QUICK_CALIBRATION,
 	.max_latency_count_width	= MAX_LATENCY_COUNT_WIDTH,
 	.read_valid_fifo_size		= READ_VALID_FIFO_SIZE,
-	.reg_file_init_seq_signature	= REG_FILE_INIT_SEQ_SIGNATURE,
+	.reg_file_init_seq_signature_ll	= REG_FILE_INIT_SEQ_SIGNATURE & 0xff,
+	.reg_file_init_seq_signature_lh	= (REG_FILE_INIT_SEQ_SIGNATURE >> 8) & 0xff,
+	.reg_file_init_seq_signature_hl	= (REG_FILE_INIT_SEQ_SIGNATURE >> 16) & 0xff,
+	.reg_file_init_seq_signature_hh	= (REG_FILE_INIT_SEQ_SIGNATURE >> 24) & 0xff,
 	.tinit_cntr0_val		= TINIT_CNTR0_VAL,
 	.tinit_cntr1_val		= TINIT_CNTR1_VAL,
 	.tinit_cntr2_val		= TINIT_CNTR2_VAL,
drivers/ddr/altera/sequencer.c +23 -16
index b85b56efe5..6c632227c2 100644
@@ -30,6 +30,9 @@ static const struct socfpga_data_mgr *data_mgr =
 static const struct socfpga_sdr_ctrl *sdr_ctrl =
 	(struct socfpga_sdr_ctrl *)SDR_CTRLGRP_ADDRESS;
 
+#define delay_per_opa_tap(iocfg) ((iocfg)->delay_per_opa_tap_lo | \
+				  ((iocfg)->delay_per_opa_tap_hi << 8))
+
 #define DELTA_D		1
 
 /*
@@ -1623,7 +1626,7 @@ static int sdr_find_phase(struct socfpga_sdrseq *seq, int working,
 			*p = 0;
 
 		ret = sdr_find_phase_delay(seq, working, 0, grp, work,
-					   seq->iocfg->delay_per_opa_tap, p);
+					   delay_per_opa_tap(seq->iocfg), p);
 		if (!ret)
 			return 0;
 
@@ -1651,7 +1654,7 @@ static int sdr_find_phase(struct socfpga_sdrseq *seq, int working,
 static int sdr_working_phase(struct socfpga_sdrseq *seq, const u32 grp,
 			     u32 *work_bgn, u32 *d, u32 *p, u32 *i)
 {
-	const u32 dtaps_per_ptap = seq->iocfg->delay_per_opa_tap /
+	const u32 dtaps_per_ptap = delay_per_opa_tap(seq->iocfg) /
 				   seq->iocfg->delay_per_dqs_en_dchain_tap;
 	int ret;
 
@@ -1693,7 +1696,7 @@ static void sdr_backup_phase(struct socfpga_sdrseq *seq, const u32 grp,
 	} else {
 		(*p)--;
 	}
-	tmp_delay = *work_bgn - seq->iocfg->delay_per_opa_tap;
+	tmp_delay = *work_bgn - delay_per_opa_tap(seq->iocfg);
 	scc_mgr_set_dqs_en_phase_all_ranks(seq, grp, *p);
 
 	for (d = 0; d <= seq->iocfg->dqs_en_delay_max && tmp_delay < *work_bgn;
@@ -1735,7 +1738,7 @@ static int sdr_nonworking_phase(struct socfpga_sdrseq *seq,
 	int ret;
 
 	(*p)++;
-	*work_end += seq->iocfg->delay_per_opa_tap;
+	*work_end += delay_per_opa_tap(seq->iocfg);
 	if (*p > seq->iocfg->dqs_en_phase_max) {
 		/* Fiddle with FIFO. */
 		*p = 0;
@@ -1774,19 +1777,19 @@ static int sdr_find_window_center(struct socfpga_sdrseq *seq,
 		   work_bgn, work_end, work_mid);
 	/* Get the middle delay to be less than a VFIFO delay */
 	tmp_delay = (seq->iocfg->dqs_en_phase_max + 1)
-		* seq->iocfg->delay_per_opa_tap;
+		* delay_per_opa_tap(seq->iocfg);
 
 	debug_cond(DLEVEL >= 2, "vfifo ptap delay %d\n", tmp_delay);
 	work_mid %= tmp_delay;
 	debug_cond(DLEVEL >= 2, "new work_mid %d\n", work_mid);
 
-	tmp_delay = rounddown(work_mid, seq->iocfg->delay_per_opa_tap);
+	tmp_delay = rounddown(work_mid, delay_per_opa_tap(seq->iocfg));
 	if (tmp_delay > seq->iocfg->dqs_en_phase_max
-		* seq->iocfg->delay_per_opa_tap) {
+		* delay_per_opa_tap(seq->iocfg)) {
 		tmp_delay = seq->iocfg->dqs_en_phase_max
-			* seq->iocfg->delay_per_opa_tap;
+			* delay_per_opa_tap(seq->iocfg);
 	}
-	p = tmp_delay / seq->iocfg->delay_per_opa_tap;
+	p = tmp_delay / delay_per_opa_tap(seq->iocfg);
 
 	debug_cond(DLEVEL >= 2, "new p %d, tmp_delay=%d\n", p, tmp_delay);
 
@@ -1850,7 +1853,7 @@ rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase(struct socfpga_sdrseq *seq,
 	scc_mgr_set_dqs_en_phase_all_ranks(seq, grp, 0);
 
 	/* Step 0: Determine number of delay taps for each phase tap. */
-	dtaps_per_ptap = seq->iocfg->delay_per_opa_tap /
+	dtaps_per_ptap = delay_per_opa_tap(seq->iocfg) /
 			 seq->iocfg->delay_per_dqs_en_dchain_tap;
 
 	/* Step 1: First push vfifo until we get a failing read. */
@@ -1894,7 +1897,7 @@ rw_mgr_mem_calibrate_vfifo_find_dqs_en_phase(struct socfpga_sdrseq *seq,
 			p = p - 1;
 		}
 
-		work_end -= seq->iocfg->delay_per_opa_tap;
+		work_end -= delay_per_opa_tap(seq->iocfg);
 		scc_mgr_set_dqs_en_phase_all_ranks(seq, grp, p);
 
 		d = 0;
@@ -2747,7 +2750,7 @@ static int rw_mgr_mem_calibrate_vfifo(struct socfpga_sdrseq *seq,
 	failed_substage = CAL_SUBSTAGE_GUARANTEED_READ;
 
 	/* USER Determine number of delay taps for each phase tap. */
-	dtaps_per_ptap = DIV_ROUND_UP(seq->iocfg->delay_per_opa_tap,
+	dtaps_per_ptap = DIV_ROUND_UP(delay_per_opa_tap(seq->iocfg),
 				      seq->iocfg->delay_per_dqs_en_dchain_tap)
 				      - 1;
 
@@ -3677,8 +3680,12 @@ static void hc_initialize_rom_data(void)
 static void initialize_reg_file(struct socfpga_sdrseq *seq)
 {
 	/* Initialize the register file with the correct data */
-	writel(seq->misccfg->reg_file_init_seq_signature,
-	       &sdr_reg_file->signature);
+	u32 reg_file_init_seq_signature =
+		seq->misccfg->reg_file_init_seq_signature_ll |
+		(seq->misccfg->reg_file_init_seq_signature_lh << 8) |
+		(seq->misccfg->reg_file_init_seq_signature_hl << 16) |
+		(seq->misccfg->reg_file_init_seq_signature_hh << 24);
+	writel(reg_file_init_seq_signature, &sdr_reg_file->signature);
 	writel(0, &sdr_reg_file->debug_data_addr);
 	writel(0, &sdr_reg_file->cur_stage);
 	writel(0, &sdr_reg_file->fom);
@@ -3749,7 +3756,7 @@ static void initialize_tracking(struct socfpga_sdrseq *seq)
 	 * Compute usable version of value in case we skip full
 	 * computation later.
 	 */
-	writel(DIV_ROUND_UP(seq->iocfg->delay_per_opa_tap,
+	writel(DIV_ROUND_UP(delay_per_opa_tap(seq->iocfg),
 			    seq->iocfg->delay_per_dchain_tap) - 1,
 	       &sdr_reg_file->dtaps_per_ptap);
 
@@ -3834,7 +3841,7 @@ int sdram_calibration_full(struct socfpga_sdr *sdr)
 		   seq.rwcfg->mem_if_read_dqs_width,
 		   seq.rwcfg->mem_if_write_dqs_width,
 		   seq.rwcfg->mem_data_width, seq.rwcfg->mem_data_mask_width,
-		   seq.iocfg->delay_per_opa_tap,
+		   delay_per_opa_tap(seq.iocfg),
 		   seq.iocfg->delay_per_dchain_tap);
 	debug_cond(DLEVEL >= 1, "dtap_dqsen_delay=%u, dll=%u",
 		   seq.iocfg->delay_per_dqs_en_dchain_tap,
Signature · 1 line
2.20.1
#18 lore raw

RFC PATCH v2 10/18 ddr: socfpga: gen5: fetch handoff information from 'of_to_platdata'

In reply to Simon Goldschmidt

In preparation to move handoff data from 'qts' files to devicetree, fetch SDRAM config in 'of_to_platdata' DM callback. That way, this callback can be changed to fetch the data from devicetree.

---

Changes in v2: None

 drivers/ddr/altera/sdram_gen5.c | 45 +++++++++++++++++++++++++--------
 drivers/ddr/altera/sequencer.c  | 35 +++++++++++++++----------
 drivers/ddr/altera/sequencer.h  |  9 ++++++-
 3 files changed, 64 insertions(+), 25 deletions(-)
drivers/ddr/altera/sdram_gen5.c +35 -10
index 8c8ea19eb9..91d9f6c0fc 100644
@@ -25,6 +25,15 @@ struct altera_gen5_sdram_priv {
 
 struct altera_gen5_sdram_platdata {
 	struct socfpga_sdr *sdr;
+	/* Handoff config follows */
+	const struct socfpga_sdram_config *cfg;
+	const struct socfpga_sdram_rw_mgr_config *rwcfg;
+	const struct socfpga_sdram_io_config *iocfg;
+	const struct socfpga_sdram_misc_config *misccf;
+	const u32 *inst_rom_init;
+	unsigned int inst_rom_init_len;
+	const u32 *ac_rom_init;
+	unsigned int ac_rom_init_len;
 };
 
 struct sdram_prot_rule {
@@ -43,7 +52,9 @@ struct sdram_prot_rule {
 static struct socfpga_system_manager *sysmgr_regs =
 	(struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS;
 
-static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl);
+static unsigned long sdram_calculate_size(
+	struct socfpga_sdr_ctrl *sdr_ctrl,
+	const struct socfpga_sdram_config *cfg);
 
 /**
  * get_errata_rows() - Up the number of DRAM rows to cover entire address space
@@ -446,10 +457,10 @@ static void sdr_load_regs(struct socfpga_sdr_ctrl *sdr_ctrl,
  *
  * Initialize the SDRAM MMR.
  */
-int sdram_mmr_init_full(struct socfpga_sdr_ctrl *sdr_ctrl,
-			unsigned int sdr_phy_reg)
+static int sdram_mmr_init_full(struct socfpga_sdr_ctrl *sdr_ctrl,
+			       unsigned int sdr_phy_reg,
+			       const struct socfpga_sdram_config *cfg)
 {
-	const struct socfpga_sdram_config *cfg = socfpga_get_sdram_config();
 	const unsigned int rows =
 		(cfg->dram_addrw & SDR_CTRLGRP_DRAMADDRW_ROWBITS_MASK) >>
 			SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB;
@@ -481,7 +492,7 @@ int sdram_mmr_init_full(struct socfpga_sdr_ctrl *sdr_ctrl,
 			1 << SDR_CTRLGRP_STATICCFG_APPLYCFG_LSB);
 
 	sdram_set_protection_config(sdr_ctrl, 0,
-				    sdram_calculate_size(sdr_ctrl) - 1);
+				    sdram_calculate_size(sdr_ctrl, cfg) - 1);
 
 	sdram_dump_protection_config(sdr_ctrl);
 
@@ -494,11 +505,12 @@ int sdram_mmr_init_full(struct socfpga_sdr_ctrl *sdr_ctrl,
  * Calculate SDRAM device size based on SDRAM controller parameters.
  * Size is specified in bytes.
  */
-static unsigned long sdram_calculate_size(struct socfpga_sdr_ctrl *sdr_ctrl)
+static unsigned long sdram_calculate_size(
+	struct socfpga_sdr_ctrl *sdr_ctrl,
+	const struct socfpga_sdram_config *cfg)
 {
 	unsigned long temp;
 	unsigned long row, bank, col, cs, width;
-	const struct socfpga_sdram_config *cfg = socfpga_get_sdram_config();
 	const unsigned int csbits =
 		((cfg->dram_addrw & SDR_CTRLGRP_DRAMADDRW_CSBITS_MASK) >>
 			SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB) + 1;
@@ -565,6 +577,16 @@ static int altera_gen5_sdram_ofdata_to_platdata(struct udevice *dev)
 	if (!plat->sdr)
 		return -ENODEV;
 
+	/* Get handoff config */
+	plat->cfg = socfpga_get_sdram_config();
+	plat->rwcfg = socfpga_get_sdram_rwmgr_config();
+	plat->iocfg = socfpga_get_sdram_io_config();
+	plat->misccf = socfpga_get_sdram_misc_config();
+
+	socfpga_get_seq_inst_init(&plat->inst_rom_init,
+				  &plat->inst_rom_init_len);
+	socfpga_get_seq_ac_init(&plat->ac_rom_init, &plat->ac_rom_init_len);
+
 	return 0;
 }
 
@@ -584,19 +606,22 @@ static int altera_gen5_sdram_probe(struct udevice *dev)
 	}
 	reset_deassert_bulk(&resets);
 
-	if (sdram_mmr_init_full(sdr_ctrl, 0xffffffff) != 0) {
+	if (sdram_mmr_init_full(sdr_ctrl, 0xffffffff, plat->cfg) != 0) {
 		puts("SDRAM init failed.\n");
 		goto failed;
 	}
 
 	debug("SDRAM: Calibrating PHY\n");
 	/* SDRAM calibration */
-	if (sdram_calibration_full(plat->sdr) == 0) {
+	if (sdram_calibration_full(plat->sdr, plat->rwcfg, plat->iocfg,
+				   plat->misccf, plat->inst_rom_init,
+				   plat->inst_rom_init_len, plat->ac_rom_init,
+				   plat->ac_rom_init_len) == 0) {
 		puts("SDRAM calibration failed.\n");
 		goto failed;
 	}
 
-	sdram_size = sdram_calculate_size(sdr_ctrl);
+	sdram_size = sdram_calculate_size(sdr_ctrl, plat->cfg);
 	debug("SDRAM: %ld MiB\n", sdram_size >> 20);
 
 	/* Sanity check ensure correct SDRAM size specified */
drivers/ddr/altera/sequencer.c +21 -14
index 6c632227c2..1e03cf3cf6 100644
@@ -3655,21 +3655,20 @@ static void debug_mem_calibrate(struct socfpga_sdrseq *seq, int pass)
  *
  * Initialize ROM data.
  */
-static void hc_initialize_rom_data(void)
+static void hc_initialize_rom_data(const u32 *inst_rom_init,
+				   unsigned int inst_rom_init_len,
+				   const u32 *ac_rom_init,
+				   unsigned int ac_rom_init_len)
 {
-	unsigned int nelem = 0;
-	const u32 *rom_init;
 	u32 i, addr;
 
-	socfpga_get_seq_inst_init(&rom_init, &nelem);
 	addr = SDR_PHYGRP_RWMGRGRP_ADDRESS | RW_MGR_INST_ROM_WRITE_OFFSET;
-	for (i = 0; i < nelem; i++)
-		writel(rom_init[i], addr + (i << 2));
+	for (i = 0; i < inst_rom_init_len; i++)
+		writel(inst_rom_init[i], addr + (i << 2));
 
-	socfpga_get_seq_ac_init(&rom_init, &nelem);
 	addr = SDR_PHYGRP_RWMGRGRP_ADDRESS | RW_MGR_AC_ROM_WRITE_OFFSET;
-	for (i = 0; i < nelem; i++)
-		writel(rom_init[i], addr + (i << 2));
+	for (i = 0; i < ac_rom_init_len; i++)
+		writel(ac_rom_init[i], addr + (i << 2));
 }
 
 /**
@@ -3788,7 +3787,14 @@ static void initialize_tracking(struct socfpga_sdrseq *seq)
 	       &sdr_reg_file->trk_rfsh);
 }
 
-int sdram_calibration_full(struct socfpga_sdr *sdr)
+int sdram_calibration_full(struct socfpga_sdr *sdr,
+			   const struct socfpga_sdram_rw_mgr_config *rwcfg,
+			   const struct socfpga_sdram_io_config *iocfg,
+			   const struct socfpga_sdram_misc_config *misccfg,
+			   const u32 *inst_rom_init,
+			   unsigned int inst_rom_init_len,
+			   const u32 *ac_rom_init,
+			   unsigned int ac_rom_init_len)
 {
 	u32 pass;
 	struct socfpga_sdrseq seq;
@@ -3802,9 +3808,9 @@ int sdram_calibration_full(struct socfpga_sdr *sdr)
 
 	memset(&seq, 0, sizeof(seq));
 
-	seq.rwcfg = socfpga_get_sdram_rwmgr_config();
-	seq.iocfg = socfpga_get_sdram_io_config();
-	seq.misccfg = socfpga_get_sdram_misc_config();
+	seq.rwcfg = rwcfg;
+	seq.iocfg = iocfg;
+	seq.misccfg = misccfg;
 
 	/* Set the calibration enabled by default */
 	seq.gbl.phy_debug_mode_flags |= PHY_DEBUG_ENABLE_CAL_RPT;
@@ -3856,7 +3862,8 @@ int sdram_calibration_full(struct socfpga_sdr *sdr)
 	debug_cond(DLEVEL >= 1, "dqs_in_reserve=%u dqs_out_reserve=%u\n",
 		   seq.iocfg->dqs_in_reserve, seq.iocfg->dqs_out_reserve);
 
-	hc_initialize_rom_data();
+	hc_initialize_rom_data(inst_rom_init, inst_rom_init_len,
+			       ac_rom_init, ac_rom_init_len);
 
 	/* update info for sims */
 	reg_file_set_stage(CAL_STAGE_NIL);
drivers/ddr/altera/sequencer.h +8 -1
index 4a03c3fdf9..84057d4b4f 100644
@@ -278,6 +278,13 @@ struct socfpga_sdrseq {
 	struct param_type param;
 };
 
-int sdram_calibration_full(struct socfpga_sdr *sdr);
+int sdram_calibration_full(struct socfpga_sdr *sdr,
+			   const struct socfpga_sdram_rw_mgr_config *rwcfg,
+			   const struct socfpga_sdram_io_config *iocfg,
+			   const struct socfpga_sdram_misc_config *misccfg,
+			   const u32 *inst_rom_init,
+			   unsigned int inst_rom_init_len,
+			   const u32 *ac_rom_init,
+			   unsigned int ac_rom_init_len);
 
 #endif /* _SEQUENCER_H_ */
Signature · 1 line
2.20.1
#19 lore raw

RFC PATCH v2 11/18 ddr: socfpga: gen5: read handoff information from devicetree

In reply to Simon Goldschmidt

Instead of reading SDRAM handoff data from 'qts' files, read it from devicetree.

---

Changes in v2: None

 drivers/ddr/altera/sdram_gen5.c | 61 ++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 8 deletions(-)
drivers/ddr/altera/sdram_gen5.c +53 -8
index 91d9f6c0fc..09ee45026c 100644
@@ -572,20 +572,65 @@ static unsigned long sdram_calculate_size(
 static int altera_gen5_sdram_ofdata_to_platdata(struct udevice *dev)
 {
 	struct altera_gen5_sdram_platdata *plat = dev->platdata;
+	int sz;
 
 	plat->sdr = (struct socfpga_sdr *)devfdt_get_addr_index(dev, 0);
 	if (!plat->sdr)
 		return -ENODEV;
 
 	/* Get handoff config */
-	plat->cfg = socfpga_get_sdram_config();
-	plat->rwcfg = socfpga_get_sdram_rwmgr_config();
-	plat->iocfg = socfpga_get_sdram_io_config();
-	plat->misccf = socfpga_get_sdram_misc_config();
-
-	socfpga_get_seq_inst_init(&plat->inst_rom_init,
-				  &plat->inst_rom_init_len);
-	socfpga_get_seq_ac_init(&plat->ac_rom_init, &plat->ac_rom_init_len);
+	plat->cfg = (const struct socfpga_sdram_config *)
+		dev_read_u8_array_ptr(dev, "altr,sdr-cfg", sizeof(*plat->cfg));
+	if (!plat->cfg) {
+		debug("Failed to parse altr,sdr-cfg\n");
+		return -EINVAL;
+	}
+	plat->rwcfg = (const struct socfpga_sdram_rw_mgr_config *)
+		dev_read_u8_array_ptr(dev, "altr,sdr-rw-mgr-cfg",
+				      sizeof(*plat->rwcfg));
+	if (!plat->rwcfg) {
+		debug("Failed to parse altr,sdr-rw-mgr-cfg\n");
+		return -EINVAL;
+	}
+	plat->iocfg = (const struct socfpga_sdram_io_config *)
+		dev_read_u8_array_ptr(dev, "altr,sdr-io-cfg",
+				      sizeof(*plat->iocfg));
+	if (!plat->iocfg) {
+		debug("Failed to parse altr,sdr-io-cfg\n");
+		return -EINVAL;
+	}
+	plat->misccf = (const struct socfpga_sdram_misc_config *)
+		dev_read_u8_array_ptr(dev, "altr,sdr-misc-cfg",
+				      sizeof(*plat->misccf));
+	if (!plat->misccf) {
+		debug("Failed to parse altr,sdr-misc-cfg\n");
+		return -EINVAL;
+	}
+
+	sz = dev_read_size(dev, "altr,sdr-inst-rom-init");
+	if (sz <= 0) {
+		debug("Failed to read altr,sdr-inst-rom-init size\n");
+		return sz;
+	}
+	plat->inst_rom_init_len = sz / sizeof(u32);
+	plat->inst_rom_init = (const u32*)dev_read_u8_array_ptr(dev,
+		"altr,sdr-inst-rom-init", sz);
+	if (!plat->inst_rom_init) {
+		debug("Failed to parse altr,sdr-inst-rom-init\n");
+		return -EINVAL;
+	}
+	sz = dev_read_size(dev, "altr,sdr-ac-rom-init");
+	if (sz <= 0) {
+		debug("Failed to read altr,sdr-ac-rom-init size\n");
+		return sz;
+	}
+	plat->ac_rom_init_len = sz / sizeof(u32);
+	plat->ac_rom_init = (const u32*)dev_read_u8_array_ptr(dev,
+		"altr,sdr-ac-rom-init", sz);
+	if (!plat->ac_rom_init) {
+		debug("Failed to parse altr,sdr-ac-rom-init\n");
+		return -EINVAL;
+	}
 
 	return 0;
 }
Signature · 1 line
2.20.1
#20 lore raw

RFC PATCH v2 12/18 arm: socfpga: gen5: add readonly clk driver

In reply to Simon Goldschmidt

This adds clk-gen5 as a readonly DM_CLK driver that can return clocks for the peripherals.

---

Changes in v2: None

 MAINTAINERS                   |   1 +
 drivers/clk/altera/Makefile   |   1 +
 drivers/clk/altera/clk-gen5.c | 338 ++++++++++++++++++++++++++++++++++
 3 files changed, 340 insertions(+)
 create mode 100644 drivers/clk/altera/clk-gen5.c
MAINTAINERS +1 -0
index 74a1423f50..be8a38ea07 100644
@@ -114,6 +114,7 @@ M:	Simon Goldschmidt <[email protected]>
 S:	Maintainted
 T:	git https://gitlab.denx.de/u-boot/custodians/u-boot-socfpga.git
 F:	arch/arm/mach-socfpga/
+F:	drivers/clk/altera/clk-gen5.c
 F:	drivers/sysreset/sysreset_socfpga*
 
 ARM AMLOGIC SOC SUPPORT
drivers/clk/altera/Makefile +1 -0
index a3ae8b24b0..d0664c6ad5 100644
@@ -4,3 +4,4 @@
 #
 
 obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += clk-arria10.o
+obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += clk-gen5.o
drivers/clk/altera/clk-gen5.c new file +338 -0

338 lines not on this page · raw message

Signature · 1 line
2.20.1
#21 lore raw

RFC PATCH v2 13/18 arm: socfpga: gen5: enable DM CLK

In reply to Simon Goldschmidt

Enable CLK and SPL_CLK so that the new readonly clock driver is used.

---

Changes in v2: None

 arch/arm/mach-socfpga/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-socfpga/Kconfig +2 -0
index 9efdcd6f10..81052f27d5 100644
@@ -53,7 +53,9 @@ config TARGET_SOCFPGA_CYCLONE5
 
 config TARGET_SOCFPGA_GEN5
 	bool
+	select CLK
 	select SPL_ALTERA_SDRAM
+	select SPL_CLK if SPL
 	imply FPGA_SOCFPGA
 	imply SPL_SIZE_LIMIT_SUBTRACT_GD
 	imply SPL_SIZE_LIMIT_SUBTRACT_MALLOC
Signature · 1 line
2.20.1
#22 lore raw

RFC PATCH v2 14/18 arm: socfpga: gen5: move clock initialization to CLK driver

In reply to Simon Goldschmidt

This moves setting initial clock values (as defined by Quartus handoff files) from ad-hoc code in arch to CM_CLK driver.

TODO: CONFIG_CLOCKS and cmd 'clocks' must be fixed for dts access.

---

Changes in v2: None

 arch/arm/mach-socfpga/Makefile                |   1 -
 arch/arm/mach-socfpga/clock_manager.c         |  31 +-
 arch/arm/mach-socfpga/clock_manager_gen5.c    | 528 ------------------
 .../mach-socfpga/include/mach/clock_manager.h |   2 +
 .../include/mach/clock_manager_gen5.h         |  12 -
 arch/arm/mach-socfpga/spl_gen5.c              |   8 +-
 drivers/clk/altera/clk-gen5.c                 | 361 ++++++++++++
 7 files changed, 388 insertions(+), 555 deletions(-)
 delete mode 100644 arch/arm/mach-socfpga/clock_manager_gen5.c
arch/arm/mach-socfpga/Makefile +0 -1
index fc1181cb27..4b77990f74 100644
@@ -10,7 +10,6 @@ obj-y	+= clock_manager.o
 obj-y	+= misc.o
 
 ifdef CONFIG_TARGET_SOCFPGA_GEN5
-obj-y	+= clock_manager_gen5.o
 obj-y	+= misc_gen5.o
 obj-y	+= reset_manager_gen5.o
 obj-y	+= scan_manager.o
arch/arm/mach-socfpga/clock_manager.c +22 -9
index 9f3c643df8..16760c760f 100644
@@ -10,6 +10,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifndef CONFIG_TARGET_SOCFPGA_GEN5
+
 static const struct socfpga_clock_manager *clock_manager_base =
 	(struct socfpga_clock_manager *)SOCFPGA_CLKMGR_ADDRESS;
 
@@ -18,11 +20,7 @@ void cm_wait_for_lock(u32 mask)
 	u32 inter_val;
 	u32 retry = 0;
 	do {
-#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
-		inter_val = readl(&clock_manager_base->inter) & mask;
-#else
 		inter_val = readl(&clock_manager_base->stat) & mask;
-#endif
 		/* Wait for stable lock */
 		if (inter_val == mask)
 			retry++;
@@ -40,14 +38,29 @@ int cm_wait_for_fsm(void)
 				 CLKMGR_STAT_BUSY, false, 20000, false);
 }
 
-int set_cpu_clk_info(void)
+#endif
+
+#ifdef CONFIG_TARGET_SOCFPGA_GEN5
+static unsigned long cm_get_mpu_clk_hz(void)
 {
-#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
-	/* Calculate the clock frequencies required for drivers */
-	cm_get_l4_sp_clk_hz();
-	cm_get_mmc_controller_clk_hz();
+	return 0; // TODO: use devicetree
+}
+
+static unsigned long cm_get_sdram_clk_hz(void)
+{
+	return 0; // TODO: use devicetree
+}
+
+#ifndef CONFIG_SPL_BUILD
+static void cm_print_clock_quick_summary(void)
+{
+	// TODO: use devicetree
+}
+#endif
 #endif
 
+int set_cpu_clk_info(void)
+{
 	gd->bd->bi_arm_freq = cm_get_mpu_clk_hz() / 1000000;
 	gd->bd->bi_dsp_freq = 0;
 
arch/arm/mach-socfpga/clock_manager_gen5.c deleted +0 -528

528 lines not on this page · raw message

arch/arm/mach-socfpga/include/mach/clock_manager.h +2 -0
index dd80e3a767..fff606e099 100644
@@ -6,11 +6,13 @@
 #ifndef _CLOCK_MANAGER_H_
 #define _CLOCK_MANAGER_H_
 
+#ifndef CONFIG_TARGET_SOCFPGA_GEN5
 #ifndef __ASSEMBLER__
 void cm_wait_for_lock(u32 mask);
 int cm_wait_for_fsm(void);
 void cm_print_clock_quick_summary(void);
 #endif
+#endif
 
 #if defined(CONFIG_TARGET_SOCFPGA_GEN5)
 #include <asm/arch/clock_manager_gen5.h>
arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h +0 -12
index 5bedf28cf1..a9efe2a377 100644
@@ -111,19 +111,7 @@ struct socfpga_clock_manager {
 	u32	_pad_0xe8_0x200[70];
 };
 
-/* Clock speed accessors */
-unsigned long cm_get_mpu_clk_hz(void);
-unsigned long cm_get_sdram_clk_hz(void);
-unsigned int cm_get_l4_sp_clk_hz(void);
-unsigned int cm_get_mmc_controller_clk_hz(void);
-unsigned int cm_get_qspi_controller_clk_hz(void);
-unsigned int cm_get_spi_controller_clk_hz(void);
-const unsigned int cm_get_osc_clk_hz(const int osc);
-const unsigned int cm_get_f2s_per_ref_clk_hz(void);
-const unsigned int cm_get_f2s_sdr_ref_clk_hz(void);
-
 /* Clock configuration accessors */
-int cm_basic_init(const struct cm_config * const cfg);
 const struct cm_config * const cm_get_default_config(void);
 #endif /* __ASSEMBLER__ */
 
arch/arm/mach-socfpga/spl_gen5.c +3 -5
index 1ae8025746..901fd9597e 100644
@@ -62,7 +62,6 @@ u32 spl_boot_mode(const u32 boot_device)
 
 void board_init_f(ulong dummy)
 {
-	const struct cm_config *cm_default_cfg = cm_get_default_config();
 	unsigned long reg;
 	int ret;
 	struct udevice *dev;
@@ -106,10 +105,9 @@ void board_init_f(ulong dummy)
 	socfpga_per_reset(SOCFPGA_RESET(OSC1TIMER0), 0);
 	timer_init();
 
-	debug("Reconfigure Clock Manager\n");
-	/* reconfigure the PLLs */
-	if (cm_basic_init(cm_default_cfg))
-		hang();
+	ret = uclass_get_device(UCLASS_CLK, 0, &dev);
+	if (ret)
+		debug("Reset init failed: %d\n", ret);
 
 	/* Enable bootrom to configure IOs. */
 	sysmgr_config_warmrstcfgio(1);
drivers/clk/altera/clk-gen5.c +361 -0

385 lines not on this page · raw message

Signature · 1 line
2.20.1
#23 lore raw

RFC PATCH v2 15/18 arm: socfpga: gen5: load CLK config from devicetree

In reply to Simon Goldschmidt

Instead of using ad-hoc code in arch/arm, load clock config from devicetree.

---

Changes in v2: None

 drivers/clk/altera/clk-gen5.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/clk/altera/clk-gen5.c +7 -1
index e8f435a798..a5425b7424 100644
@@ -136,7 +136,13 @@ static int socfpga_gen5_clk_init(struct udevice *dev)
 	struct socfpga_gen5_clk_platdata *plat = dev_get_platdata(dev);
 	const struct socfpga_clock_manager *clock_manager_base =
 		(const struct socfpga_clock_manager *)plat->regs;
-	const struct cm_config *cfg = cm_get_default_config();
+	const struct cm_config *cfg = (const struct cm_config *)
+		dev_read_u8_array_ptr(dev, "altr,clk-mgr-cfg", sizeof(*cfg));
+
+	if (!cfg) {
+		dev_dbg(dev, "Failed to load CLK config\n");
+		return -EINVAL;
+	}
 
 	/* Start by being paranoid and gate all sw managed clocks */
 
Signature · 1 line
2.20.1
#24 lore raw

RFC PATCH v2 16/18 spi: cadence_qspi: support DM_CLK

In reply to Simon Goldschmidt

Support loading clk speed via DM instead of requiring ad-hoc code.

---

Changes in v2: None

 drivers/spi/cadence_qspi.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/spi/cadence_qspi.c +18 -2
index e2e54cd277..0b89115885 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <clk.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <malloc.h>
@@ -22,12 +23,27 @@ static int cadence_spi_write_speed(struct udevice *bus, uint hz)
 {
 	struct cadence_spi_platdata *plat = bus->platdata;
 	struct cadence_spi_priv *priv = dev_get_priv(bus);
+	unsigned int ref_clk_hz;
+	struct clk clk;
+	int ret;
+
+	ret = clk_get_by_index(bus, 0, &clk);
+	if (ret) {
+#ifdef CONFIG_CQSPI_REF_CLK
+		ref_clk_hz = CONFIG_CQSPI_REF_CLK;
+#else
+		return ret;
+#endif
+	} else {
+		ref_clk_hz = clk_get_rate(&clk);
+		clk_free(&clk);
+	}
 
 	cadence_qspi_apb_config_baudrate_div(priv->regbase,
-					     CONFIG_CQSPI_REF_CLK, hz);
+					     ref_clk_hz, hz);
 
 	/* Reconfigure delay timing if speed is changed. */
-	cadence_qspi_apb_delay(priv->regbase, CONFIG_CQSPI_REF_CLK, hz,
+	cadence_qspi_apb_delay(priv->regbase, ref_clk_hz, hz,
 			       plat->tshsl_ns, plat->tsd2d_ns,
 			       plat->tchsh_ns, plat->tslch_ns);
 
Signature · 1 line
2.20.1
#25 lore raw

RFC PATCH v2 17/18 arm: socfpga: gen5: parse qspi clock from devictree

In reply to Simon Goldschmidt

Remove the need for ad-hoc code for qspi speed.

---

Changes in v2: None

 include/configs/socfpga_common.h | 5 -----
 1 file changed, 5 deletions(-)
include/configs/socfpga_common.h +0 -5
index d1034ac280..e4a5dfc5ef 100644
@@ -137,11 +137,6 @@
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SPI_FLASH_MTD
 #endif
-/* QSPI reference clock */
-#ifndef __ASSEMBLY__
-unsigned int cm_get_qspi_controller_clk_hz(void);
-#define CONFIG_CQSPI_REF_CLK		cm_get_qspi_controller_clk_hz()
-#endif
 
 /*
  * USB
Signature · 1 line
2.20.1
#26 lore raw

RFC PATCH v2 18/18 socfpga: gen5: move CLK and SDRAM to DM

In reply to Simon Goldschmidt

- removed wrapper files for sdram & pll
- fix freeze_controller to not depend on OSC1 speed
- remove unused function definitions
- add autogenerated handoff dtsi for socfpga_socrates

---

Changes in v2: None

 .../dts/socfpga_cyclone5_socrates-u-boot.dtsi |   1 +
 .../socfpga_cyclone5_socrates_handoff.dtsi    | 290 ++++++++++++++++
 arch/arm/mach-socfpga/Makefile                |   4 -
 arch/arm/mach-socfpga/freeze_controller.c     |  10 +-
 .../include/mach/clock_manager_gen5.h         |   2 -
 .../mach-socfpga/include/mach/sdram_gen5.h    |   8 -
 arch/arm/mach-socfpga/wrap_pll_config.c       | 146 --------
 arch/arm/mach-socfpga/wrap_sdram_config.c     | 322 ------------------
 8 files changed, 297 insertions(+), 486 deletions(-)
 create mode 100644 arch/arm/dts/socfpga_cyclone5_socrates_handoff.dtsi
 delete mode 100644 arch/arm/mach-socfpga/wrap_pll_config.c
 delete mode 100644 arch/arm/mach-socfpga/wrap_sdram_config.c
arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi +1 -0
index 0a4d54e304..36ae10ab28 100644
@@ -7,6 +7,7 @@
  */
 
 #include "socfpga-common-u-boot.dtsi"
+#include "socfpga_cyclone5_socrates_handoff.dtsi"
 
 /{
 	aliases {
arch/arm/dts/socfpga_cyclone5_socrates_handoff.dtsi new file +290 -0

290 lines not on this page · raw message

arch/arm/mach-socfpga/Makefile +0 -4
index 4b77990f74..c6281373f7 100644
@@ -15,7 +15,6 @@ obj-y	+= reset_manager_gen5.o
 obj-y	+= scan_manager.o
 obj-y	+= system_manager_gen5.o
 obj-y	+= timer.o
-obj-y	+= wrap_pll_config.o
 obj-y	+= fpga_manager.o
 endif
 
@@ -44,7 +43,6 @@ obj-y	+= spl_gen5.o
 obj-y	+= freeze_controller.o
 obj-y	+= wrap_iocsr_config.o
 obj-y	+= wrap_pinmux_config.o
-obj-y	+= wrap_sdram_config.o
 endif
 ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
 obj-y	+= spl_a10.o
@@ -58,6 +56,4 @@ ifdef CONFIG_TARGET_SOCFPGA_GEN5
 # QTS-generated config file wrappers
 CFLAGS_wrap_iocsr_config.o	+= -I$(srctree)/board/$(BOARDDIR)
 CFLAGS_wrap_pinmux_config.o	+= -I$(srctree)/board/$(BOARDDIR)
-CFLAGS_wrap_pll_config.o	+= -I$(srctree)/board/$(BOARDDIR)
-CFLAGS_wrap_sdram_config.o	+= -I$(srctree)/board/$(BOARDDIR)
 endif
arch/arm/mach-socfpga/freeze_controller.c +6 -4
index d48aeec374..3ed6229631 100644
@@ -109,7 +109,6 @@ void sys_mgr_frzctrl_thaw_req(void)
 	u32 reg_cfg_mask;
 	u32 reg_value;
 	u32 channel_id;
-	unsigned long eosc1_freq;
 
 	/* select software FSM */
 	writel(SYSMGR_FRZCTRL_SRC_VIO1_ENUM_SW,	&freeze_controller_base->src);
@@ -160,9 +159,12 @@ void sys_mgr_frzctrl_thaw_req(void)
 	setbits_le32(&freeze_controller_base->hioctrl,
 		SYSMGR_FRZCTRL_HIOCTRL_OCT_CFGEN_CALSTART_MASK);
 
-	/* Delay 1000 intosc cycles. The intosc is based on eosc1. */
-	eosc1_freq = cm_get_osc_clk_hz(1) / 1000;	/* kHz */
-	udelay(DIV_ROUND_UP(1000000, eosc1_freq));
+	/*
+	 * Delay 1000 intosc cycles. The intosc is based on eosc1.
+	 * Use worst case which is fatest eosc1=50MHz, delay required
+	 * is 1/50MHz * 1000 = 20us
+	 */
+	udelay(20);
 
 	/*
 	 * de-assert active low bhniotri signals,
arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h +0 -2
index a9efe2a377..3b52986f78 100644
@@ -111,8 +111,6 @@ struct socfpga_clock_manager {
 	u32	_pad_0xe8_0x200[70];
 };
 
-/* Clock configuration accessors */
-const struct cm_config * const cm_get_default_config(void);
 #endif /* __ASSEMBLER__ */
 
 #define LOCKED_MASK \
arch/arm/mach-socfpga/include/mach/sdram_gen5.h +0 -8
index 7353b1c5e6..47b5793271 100644
@@ -7,14 +7,6 @@
 
 #ifndef __ASSEMBLY__
 
-const struct socfpga_sdram_config *socfpga_get_sdram_config(void);
-
-void socfpga_get_seq_ac_init(const u32 **init, unsigned int *nelem);
-void socfpga_get_seq_inst_init(const u32 **init, unsigned int *nelem);
-const struct socfpga_sdram_rw_mgr_config *socfpga_get_sdram_rwmgr_config(void);
-const struct socfpga_sdram_io_config *socfpga_get_sdram_io_config(void);
-const struct socfpga_sdram_misc_config *socfpga_get_sdram_misc_config(void);
-
 #define SDR_CTRLGRP_ADDRESS	(SOCFPGA_SDR_ADDRESS | 0x5000)
 
 struct socfpga_sdr_ctrl {
arch/arm/mach-socfpga/wrap_pll_config.c deleted +0 -146

146 lines not on this page · raw message

arch/arm/mach-socfpga/wrap_sdram_config.c deleted +0 -322

322 lines not on this page · raw message

Signature · 1 line
2.20.1
#27 lore raw

v2 cover arm: socfpga: gen5: move to DM

In reply to Simon Goldschmidt

Am 15.10.2019 um 22:10 schrieb Simon Goldschmidt:

Quoted 2 lines

This is an RFC series with the target to move SPL code from arch to DM drivers.

I've sent a few patches of this series now as non-RFC, as I don't know if I will make it this merge window: I still have trouble getting the existing defconfigs into the 64 KB of SRAM for SPL :-(

Might need some work regarding size of DM in SPL...

Regards,
Simon

Quoted 75 lines

It is not finished, but I send this here for discussion mainly about the devicetree format with the goal of keeping the various sub- architectures (cyclone5, arria10, etc.) in the same style.

Patch 8 adds a C tool to convert existing gen5 qts handoff files to a handoff dtsi. As an example, the last patch contains the handoff dtsi for socfpga_socrates.

I have sent v1 some time ago, but this one has heavily changed and is not finished, thus v2 but RFC. This series also is not edited to fix patman warnings, yet.

Changes in v2:
- add dts based reset handling (messed up in v1)
- split this patch from v1 5/6
- split this patch from v1 5/6

Simon Goldschmidt (18):
ddr: socfpga: gen5: constify altera_gen5_sdram_ops
dts: arm: socfpga: add label for clkmgr
arm: socfpga: gen5: increase SPL_SYS_MALLOC_F_LEN
timer: dw-apb: add reset handling
arm: socfpga: gen5: move initial reset handling to reset driver
arm: dts: socfpga: add settings for gen5 clk driver
arm: dts: socfpga: make clock nodes available in SPL
socfpga: gen5: add new tool to create handoff dtsi files
sdram: socfpga: gen5: make config structs dts compatible
ddr: socfpga: gen5: fetch handoff information from 'of_to_platdata'
ddr: socfpga: gen5: read handoff information from devicetree
arm: socfpga: gen5: add readonly clk driver
arm: socfpga: gen5: enable DM CLK
arm: socfpga: gen5: move clock initialization to CLK driver
arm: socfpga: gen5: load CLK config from devicetree
spi: cadence_qspi: support DM_CLK
arm: socfpga: gen5: parse qspi clock from devictree
socfpga: gen5: move CLK and SDRAM to DM

  MAINTAINERS                                   |   1 +
  arch/arm/dts/socfpga-common-u-boot.dtsi       |  71 ++
  arch/arm/dts/socfpga.dtsi                     |   7 +-
  .../dts/socfpga_cyclone5_socrates-u-boot.dtsi |   1 +
  .../socfpga_cyclone5_socrates_handoff.dtsi    | 290 +++++++
  arch/arm/mach-socfpga/Kconfig                 |   4 +-
  arch/arm/mach-socfpga/Makefile                |   5 -
  arch/arm/mach-socfpga/clock_manager.c         |  31 +-
  arch/arm/mach-socfpga/clock_manager_gen5.c    | 528 -------------
  arch/arm/mach-socfpga/create_handoff_gen5.c   | 660 ++++++++++++++++
  arch/arm/mach-socfpga/freeze_controller.c     |  10 +-
  .../mach-socfpga/include/mach/clock_manager.h |   2 +
  .../include/mach/clock_manager_gen5.h         |  14 -
  .../mach-socfpga/include/mach/sdram_gen5.h    |  16 +-
  arch/arm/mach-socfpga/qts-to-handoff.sh       |  83 +++
  arch/arm/mach-socfpga/reset_manager_gen5.c    |  13 -
  arch/arm/mach-socfpga/spl_gen5.c              |  29 +-
  arch/arm/mach-socfpga/wrap_pll_config.c       | 146 ----
  arch/arm/mach-socfpga/wrap_sdram_config.c     | 318 --------
  drivers/clk/altera/Makefile                   |   1 +
  drivers/clk/altera/clk-gen5.c                 | 705 ++++++++++++++++++
  drivers/ddr/altera/sdram_gen5.c               |  92 ++-
  drivers/ddr/altera/sequencer.c                |  74 +-
  drivers/ddr/altera/sequencer.h                |   9 +-
  drivers/reset/reset-socfpga.c                 |  37 +-
  drivers/spi/cadence_qspi.c                    |  20 +-
  drivers/timer/dw-apb-timer.c                  |  18 +-
  include/configs/socfpga_common.h              |   5 -
  28 files changed, 2072 insertions(+), 1118 deletions(-)

create mode 100644 arch/arm/dts/socfpga_cyclone5_socrates_handoff.dtsi delete mode 100644 arch/arm/mach-socfpga/clock_manager_gen5.c create mode 100644 arch/arm/mach-socfpga/create_handoff_gen5.c create mode 100755 arch/arm/mach-socfpga/qts-to-handoff.sh delete mode 100644 arch/arm/mach-socfpga/wrap_pll_config.c delete mode 100644 arch/arm/mach-socfpga/wrap_sdram_config.c create mode 100644 drivers/clk/altera/clk-gen5.c