arm: socfpga: Move wrappers into platform directory
authorMarek Vasut <marex@denx.de>
Sun, 2 Aug 2015 19:12:09 +0000 (21:12 +0200)
committerMarek Vasut <marex@denx.de>
Sun, 23 Aug 2015 09:56:19 +0000 (11:56 +0200)
Move the wrappers for QTS-generated files into platform directory
out of the board directory. The trick here is to add -I to CFLAGS
such that it points to the board directory in source tree and thus
the qts/ directory there is still reachable.

Signed-off-by: Marek Vasut <marex@denx.de>
arch/arm/mach-socfpga/Makefile
arch/arm/mach-socfpga/wrap_iocsr_config.c [new file with mode: 0644]
arch/arm/mach-socfpga/wrap_pinmux_config.c [new file with mode: 0644]
arch/arm/mach-socfpga/wrap_pll_config.c [new file with mode: 0644]
arch/arm/mach-socfpga/wrap_sdram_config.c [new file with mode: 0644]
board/altera/socfpga/Makefile
board/altera/socfpga/wrap_iocsr_config.c [deleted file]
board/altera/socfpga/wrap_pinmux_config.c [deleted file]
board/altera/socfpga/wrap_pll_config.c [deleted file]
board/altera/socfpga/wrap_sdram_config.c [deleted file]

index 8a745c9b1e80475c6b548e72fc70517337ee700e..316b326d417e602b0fbde813bc4fb43932a3cc69 100644 (file)
 obj-y  += misc.o timer.o reset_manager.o system_manager.o clock_manager.o \
           fpga_manager.o scan_manager.o
 obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o
+
+# QTS-generated config file wrappers
+obj-y  += wrap_pll_config.o
+obj-$(CONFIG_SPL_BUILD) += wrap_iocsr_config.o wrap_pinmux_config.o    \
+                          wrap_sdram_config.o
+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)
diff --git a/arch/arm/mach-socfpga/wrap_iocsr_config.c b/arch/arm/mach-socfpga/wrap_iocsr_config.c
new file mode 100644 (file)
index 0000000..31b5426
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2015 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <asm/arch/clock_manager.h>
+/*
+ * Yes, dear reader, we're including a C file here, this is no mistake :-)
+ */
+#include <qts/iocsr_config.c>
+
+int iocsr_get_config_table(const unsigned int chain_id,
+                          const unsigned long **table,
+                          unsigned int *table_len)
+{
+       switch (chain_id) {
+       case 0:
+               *table = iocsr_scan_chain0_table;
+               *table_len = CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH;
+               break;
+       case 1:
+               *table = iocsr_scan_chain1_table;
+               *table_len = CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH;
+               break;
+       case 2:
+               *table = iocsr_scan_chain2_table;
+               *table_len = CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH;
+               break;
+       case 3:
+               *table = iocsr_scan_chain3_table;
+               *table_len = CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config.c b/arch/arm/mach-socfpga/wrap_pinmux_config.c
new file mode 100644 (file)
index 0000000..688f1e4
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2015 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+/*
+ * Yes, dear reader, we're including a C file here, this is no mistake.
+ * But this time around, we do even more perverse hacking here to be
+ * compatible with QTS headers and obtain reasonably nice results too.
+ *
+ * First, we define _PRELOADER_PINMUX_CONFIG_H_, which will neutralise
+ * the pinmux_config.h inclusion in pinmux_config.c . Since we are
+ * probing everything from DT, we do NOT want those macros from the
+ * pinmux_config.h to ooze into our build system, anywhere, ever. So
+ * we nip it at the bud.
+ *
+ * Next, pinmux_config.c needs CONFIG_HPS_PINMUX_NUM and uses it to
+ * specify sized array explicitly. Instead, we want to use ARRAY_SIZE
+ * to figure out the size of the array, so define this macro as an
+ * empty one, so that the preprocessor optimizes things such that the
+ * arrays are not sized by default.
+ */
+#define _PRELOADER_PINMUX_CONFIG_H_
+#define CONFIG_HPS_PINMUX_NUM
+#include <qts/pinmux_config.c>
+
+void sysmgr_get_pinmux_table(const unsigned long **table,
+                            unsigned int *table_len)
+{
+       *table = sys_mgr_init_table;
+       *table_len = ARRAY_SIZE(sys_mgr_init_table);
+}
diff --git a/arch/arm/mach-socfpga/wrap_pll_config.c b/arch/arm/mach-socfpga/wrap_pll_config.c
new file mode 100644 (file)
index 0000000..8a0a0e6
--- /dev/null
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2015 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/arch/clock_manager.h>
+#include <qts/pll_config.h>
+
+#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_cfg = {
+       /* 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),
+};
+
+const struct cm_config * const cm_get_default_config(void)
+{
+       return &cm_default_cfg;
+}
+
+const unsigned int cm_get_osc_clk_hz(const int osc)
+{
+       if (osc == 1)
+               return CONFIG_HPS_CLK_OSC1_HZ;
+       else if (osc == 2)
+               return CONFIG_HPS_CLK_OSC2_HZ;
+       else
+               return 0;
+}
+
+const unsigned int cm_get_f2s_per_ref_clk_hz(void)
+{
+       return CONFIG_HPS_CLK_F2S_PER_REF_HZ;
+}
+
+const unsigned int cm_get_f2s_sdr_ref_clk_hz(void)
+{
+       return CONFIG_HPS_CLK_F2S_SDR_REF_HZ;
+}
diff --git a/arch/arm/mach-socfpga/wrap_sdram_config.c b/arch/arm/mach-socfpga/wrap_sdram_config.c
new file mode 100644 (file)
index 0000000..72ce565
--- /dev/null
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2015 Marek Vasut <marex@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <asm/arch/sdram.h>
+/* QTS output file. */
+#include <qts/sdram_config.h>
+
+#include <qts/sequencer_auto_ac_init.h>
+#include <qts/sequencer_auto_inst_init.h>
+#include <qts/sequencer_auto.h>
+#include <qts/sequencer_defines.h>
+
+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),
+       .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,
+};
+
+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,
+       .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,
+};
+
+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    = REG_FILE_INIT_SEQ_SIGNATURE,
+       .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,
+};
+
+const struct socfpga_sdram_config *socfpga_get_sdram_config(void)
+{
+       return &sdram_config;
+}
+
+void socfpga_get_seq_ac_init(const u32 **init, unsigned int *nelem)
+{
+       *init = ac_rom_init;
+       *nelem = ARRAY_SIZE(ac_rom_init);
+}
+
+void socfpga_get_seq_inst_init(const u32 **init, unsigned int *nelem)
+{
+       *init = inst_rom_init;
+       *nelem = ARRAY_SIZE(inst_rom_init);
+}
+
+const struct socfpga_sdram_rw_mgr_config *socfpga_get_sdram_rwmgr_config(void)
+{
+       return &rw_mgr_config;
+}
+
+const struct socfpga_sdram_io_config *socfpga_get_sdram_io_config(void)
+{
+       return &io_config;
+}
+
+const struct socfpga_sdram_misc_config *socfpga_get_sdram_misc_config(void)
+{
+       return &misc_config;
+}
index 5a15c71610697cffaeebaa97b9837e7a4ddda778..86f9b78cad7bdba06bff62bb56391f0ee7062679 100644 (file)
@@ -6,6 +6,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-y  := socfpga.o wrap_pll_config.o
-obj-$(CONFIG_SPL_BUILD) += wrap_iocsr_config.o wrap_pinmux_config.o    \
-                          wrap_sdram_config.o
+obj-y  := socfpga.o
diff --git a/board/altera/socfpga/wrap_iocsr_config.c b/board/altera/socfpga/wrap_iocsr_config.c
deleted file mode 100644 (file)
index 49e9228..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <errno.h>
-#include <asm/arch/clock_manager.h>
-/*
- * Yes, dear reader, we're including a C file here, this is no mistake :-)
- */
-#include "qts/iocsr_config.c"
-
-int iocsr_get_config_table(const unsigned int chain_id,
-                          const unsigned long **table,
-                          unsigned int *table_len)
-{
-       switch (chain_id) {
-       case 0:
-               *table = iocsr_scan_chain0_table;
-               *table_len = CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH;
-               break;
-       case 1:
-               *table = iocsr_scan_chain1_table;
-               *table_len = CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH;
-               break;
-       case 2:
-               *table = iocsr_scan_chain2_table;
-               *table_len = CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH;
-               break;
-       case 3:
-               *table = iocsr_scan_chain3_table;
-               *table_len = CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
-}
diff --git a/board/altera/socfpga/wrap_pinmux_config.c b/board/altera/socfpga/wrap_pinmux_config.c
deleted file mode 100644 (file)
index b33e2ca..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <errno.h>
-/*
- * Yes, dear reader, we're including a C file here, this is no mistake.
- * But this time around, we do even more perverse hacking here to be
- * compatible with QTS headers and obtain reasonably nice results too.
- *
- * First, we define _PRELOADER_PINMUX_CONFIG_H_, which will neutralise
- * the pinmux_config.h inclusion in pinmux_config.c . Since we are
- * probing everything from DT, we do NOT want those macros from the
- * pinmux_config.h to ooze into our build system, anywhere, ever. So
- * we nip it at the bud.
- *
- * Next, pinmux_config.c needs CONFIG_HPS_PINMUX_NUM and uses it to
- * specify sized array explicitly. Instead, we want to use ARRAY_SIZE
- * to figure out the size of the array, so define this macro as an
- * empty one, so that the preprocessor optimizes things such that the
- * arrays are not sized by default.
- */
-#define _PRELOADER_PINMUX_CONFIG_H_
-#define CONFIG_HPS_PINMUX_NUM
-#include "qts/pinmux_config.c"
-
-void sysmgr_get_pinmux_table(const unsigned long **table,
-                            unsigned int *table_len)
-{
-       *table = sys_mgr_init_table;
-       *table_len = ARRAY_SIZE(sys_mgr_init_table);
-}
diff --git a/board/altera/socfpga/wrap_pll_config.c b/board/altera/socfpga/wrap_pll_config.c
deleted file mode 100644 (file)
index 8dbff68..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/clock_manager.h>
-#include "qts/pll_config.h"
-
-#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_cfg = {
-       /* 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),
-};
-
-const struct cm_config * const cm_get_default_config(void)
-{
-       return &cm_default_cfg;
-}
-
-const unsigned int cm_get_osc_clk_hz(const int osc)
-{
-       if (osc == 1)
-               return CONFIG_HPS_CLK_OSC1_HZ;
-       else if (osc == 2)
-               return CONFIG_HPS_CLK_OSC2_HZ;
-       else
-               return 0;
-}
-
-const unsigned int cm_get_f2s_per_ref_clk_hz(void)
-{
-       return CONFIG_HPS_CLK_F2S_PER_REF_HZ;
-}
-
-const unsigned int cm_get_f2s_sdr_ref_clk_hz(void)
-{
-       return CONFIG_HPS_CLK_F2S_SDR_REF_HZ;
-}
diff --git a/board/altera/socfpga/wrap_sdram_config.c b/board/altera/socfpga/wrap_sdram_config.c
deleted file mode 100644 (file)
index cd97cc5..0000000
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <errno.h>
-#include <asm/arch/sdram.h>
-/* QTS output file. */
-#include "qts/sdram_config.h"
-
-#include "qts/sequencer_auto_ac_init.h"
-#include "qts/sequencer_auto_inst_init.h"
-#include "qts/sequencer_auto.h"
-#include "qts/sequencer_defines.h"
-
-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),
-       .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,
-};
-
-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,
-       .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,
-};
-
-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    = REG_FILE_INIT_SEQ_SIGNATURE,
-       .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,
-};
-
-const struct socfpga_sdram_config *socfpga_get_sdram_config(void)
-{
-       return &sdram_config;
-}
-
-void socfpga_get_seq_ac_init(const u32 **init, unsigned int *nelem)
-{
-       *init = ac_rom_init;
-       *nelem = ARRAY_SIZE(ac_rom_init);
-}
-
-void socfpga_get_seq_inst_init(const u32 **init, unsigned int *nelem)
-{
-       *init = inst_rom_init;
-       *nelem = ARRAY_SIZE(inst_rom_init);
-}
-
-const struct socfpga_sdram_rw_mgr_config *socfpga_get_sdram_rwmgr_config(void)
-{
-       return &rw_mgr_config;
-}
-
-const struct socfpga_sdram_io_config *socfpga_get_sdram_io_config(void)
-{
-       return &io_config;
-}
-
-const struct socfpga_sdram_misc_config *socfpga_get_sdram_misc_config(void)
-{
-       return &misc_config;
-}