mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 09/22] ARM: pcm051: Clean up lowlevel code
Date: Mon, 26 Aug 2013 08:55:50 +0200	[thread overview]
Message-ID: <1377500163-28962-10-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1377500163-28962-1-git-send-email-s.hauer@pengutronix.de>

From: Teresa Gámez <t.gamez@phytec.de>

Use now the initialisation functions from am33xx_generic.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/pcm051/lowlevel.c | 211 ++++++++------------------------------
 1 file changed, 41 insertions(+), 170 deletions(-)

diff --git a/arch/arm/boards/pcm051/lowlevel.c b/arch/arm/boards/pcm051/lowlevel.c
index 3a637cf..6ad170f 100644
--- a/arch/arm/boards/pcm051/lowlevel.c
+++ b/arch/arm/boards/pcm051/lowlevel.c
@@ -13,171 +13,36 @@
 #include <mach/am33xx-mux.h>
 #include <mach/wdt.h>
 
-/* UART Defines */
-#define UART_SYSCFG_OFFSET  (0x54)
-#define UART_SYSSTS_OFFSET  (0x58)
-
-#define UART_RESET      (0x1 << 1)
-#define UART_CLK_RUNNING_MASK   0x1
-#define UART_SMART_IDLE_EN  (0x1 << 0x3)
-
-/* AM335X EMIF Register values */
-#define VTP_CTRL_READY          (0x1 << 5)
-#define VTP_CTRL_ENABLE         (0x1 << 6)
-#define VTP_CTRL_START_EN       (0x1)
-#define CMD_FORCE              0x00    /* common #def */
-#define CMD_DELAY              0x00
-
-#define EMIF_READ_LATENCY       0x06
-#define EMIF_SDCFG              0x61C04832 /* CL 5, CWL 5 */
-#define EMIF_SDREF              0x0000093B
-
-#define EMIF_TIM1               0x0668A39B
-#define EMIF_TIM2               0x26337FDA
-#define EMIF_TIM3               0x501F830F
-
-#define DLL_LOCK_DIFF           0x0
-#define PHY_WR_DATA             0xC1
-#define RD_DQS                  0x3B
-#define WR_DQS                  0x85
-#define PHY_FIFO_WE             0x100
-#define INVERT_CLKOUT           0x1
-#define PHY_RANK0_DELAY         0x01
-#define DDR_IOCTRL_VALUE        0x18B
-#define CTRL_SLAVE_RATIO        0x40
-#define PHY_LVL_MODE            0x1
-#define DDR_ZQ_CFG              0x50074BE4
-
-static void Cmd_Macro_Config(void)
-{
-	writel(CTRL_SLAVE_RATIO, AM33XX_CMD0_CTRL_SLAVE_RATIO_0);
-	writel(CMD_FORCE, AM33XX_CMD0_CTRL_SLAVE_FORCE_0);
-	writel(CMD_DELAY, AM33XX_CMD0_CTRL_SLAVE_DELAY_0);
-	writel(DLL_LOCK_DIFF, AM33XX_CMD0_DLL_LOCK_DIFF_0);
-	writel(INVERT_CLKOUT, AM33XX_CMD0_INVERT_CLKOUT_0);
-
-	writel(CTRL_SLAVE_RATIO, AM33XX_CMD1_CTRL_SLAVE_RATIO_0);
-	writel(CMD_FORCE, AM33XX_CMD1_CTRL_SLAVE_FORCE_0);
-	writel(CMD_DELAY, AM33XX_CMD1_CTRL_SLAVE_DELAY_0);
-	writel(DLL_LOCK_DIFF, AM33XX_CMD1_DLL_LOCK_DIFF_0);
-	writel(INVERT_CLKOUT, AM33XX_CMD1_INVERT_CLKOUT_0);
-
-	writel(CTRL_SLAVE_RATIO, AM33XX_CMD2_CTRL_SLAVE_RATIO_0);
-	writel(CMD_FORCE, AM33XX_CMD2_CTRL_SLAVE_FORCE_0);
-	writel(CMD_DELAY, AM33XX_CMD2_CTRL_SLAVE_DELAY_0);
-	writel(DLL_LOCK_DIFF, AM33XX_CMD2_DLL_LOCK_DIFF_0);
-	writel(INVERT_CLKOUT, AM33XX_CMD2_INVERT_CLKOUT_0);
-}
-
-static void config_vtp(void)
-{
-	writel(readl(AM33XX_VTP0_CTRL_REG) | VTP_CTRL_ENABLE,
-			AM33XX_VTP0_CTRL_REG);
-	writel(readl(AM33XX_VTP0_CTRL_REG) & (~VTP_CTRL_START_EN),
-			AM33XX_VTP0_CTRL_REG);
-	writel(readl(AM33XX_VTP0_CTRL_REG) | VTP_CTRL_START_EN,
-			AM33XX_VTP0_CTRL_REG);
-
-	/* Poll for READY */
-	while ((readl(AM33XX_VTP0_CTRL_REG) &
-			VTP_CTRL_READY) != VTP_CTRL_READY);
-}
-
-static void phy_config_data(void)
-{
-	writel(RD_DQS, AM33XX_DATA0_RD_DQS_SLAVE_RATIO_0);
-	writel(WR_DQS, AM33XX_DATA0_WR_DQS_SLAVE_RATIO_0);
-	writel(PHY_FIFO_WE, AM33XX_DATA0_FIFO_WE_SLAVE_RATIO_0);
-	writel(PHY_WR_DATA, AM33XX_DATA0_WR_DATA_SLAVE_RATIO_0);
-
-	writel(RD_DQS, AM33XX_DATA1_RD_DQS_SLAVE_RATIO_0);
-	writel(WR_DQS, AM33XX_DATA1_WR_DQS_SLAVE_RATIO_0);
-	writel(PHY_FIFO_WE, AM33XX_DATA1_FIFO_WE_SLAVE_RATIO_0);
-	writel(PHY_WR_DATA, AM33XX_DATA1_WR_DATA_SLAVE_RATIO_0);
-}
-
-static void config_emif(void)
-{
-	/*Program EMIF0 CFG Registers*/
-	writel(EMIF_READ_LATENCY, AM33XX_EMIF4_0_REG(DDR_PHY_CTRL_1));
-	writel(EMIF_READ_LATENCY,
-				AM33XX_EMIF4_0_REG(DDR_PHY_CTRL_1_SHADOW));
-	writel(EMIF_READ_LATENCY, AM33XX_EMIF4_0_REG(DDR_PHY_CTRL_2));
-	writel(EMIF_TIM1, AM33XX_EMIF4_0_REG(SDRAM_TIM_1));
-	writel(EMIF_TIM1, AM33XX_EMIF4_0_REG(SDRAM_TIM_1_SHADOW));
-	writel(EMIF_TIM2, AM33XX_EMIF4_0_REG(SDRAM_TIM_2));
-	writel(EMIF_TIM2, AM33XX_EMIF4_0_REG(SDRAM_TIM_2_SHADOW));
-	writel(EMIF_TIM3, AM33XX_EMIF4_0_REG(SDRAM_TIM_3));
-	writel(EMIF_TIM3, AM33XX_EMIF4_0_REG(SDRAM_TIM_3_SHADOW));
-
-	writel(EMIF_SDREF, AM33XX_EMIF4_0_REG(SDRAM_REF_CTRL));
-	writel(EMIF_SDREF, AM33XX_EMIF4_0_REG(SDRAM_REF_CTRL_SHADOW));
-
-	writel(EMIF_SDCFG, AM33XX_EMIF4_0_REG(SDRAM_CONFIG));
-	writel(DDR_ZQ_CFG, AM33XX_EMIF4_0_REG(ZQ_CONFIG));
-
-	while ((readl(AM33XX_EMIF4_0_REG(SDRAM_STATUS)) & 0x4) != 0x4);
-}
-
-static void pcm051_config_ddr(void)
-{
-	enable_ddr_clocks();
-
-	config_vtp();
-
-	/* init mode */
-	writel(PHY_LVL_MODE, AM33XX_DATA0_WRLVL_INIT_MODE_0);
-	writel(PHY_LVL_MODE, AM33XX_DATA0_GATELVL_INIT_MODE_0);
-	writel(PHY_LVL_MODE, AM33XX_DATA1_WRLVL_INIT_MODE_0);
-	writel(PHY_LVL_MODE, AM33XX_DATA1_GATELVL_INIT_MODE_0);
-
-	Cmd_Macro_Config();
-	phy_config_data();
-
-	writel(PHY_RANK0_DELAY, AM33XX_DATA0_RANK0_DELAYS_0);
-	writel(PHY_RANK0_DELAY, AM33XX_DATA1_RANK0_DELAYS_0);
-
-	writel(DDR_IOCTRL_VALUE, AM33XX_DDR_CMD0_IOCTRL);
-	writel(DDR_IOCTRL_VALUE, AM33XX_DDR_CMD1_IOCTRL);
-	writel(DDR_IOCTRL_VALUE, AM33XX_DDR_CMD2_IOCTRL);
-	writel(DDR_IOCTRL_VALUE, AM33XX_DDR_DATA0_IOCTRL);
-	writel(DDR_IOCTRL_VALUE, AM33XX_DDR_DATA1_IOCTRL);
-
-	writel(readl(AM33XX_DDR_IO_CTRL) &
-				0xefffffff, AM33XX_DDR_IO_CTRL);
-	writel(readl(AM33XX_DDR_CKE_CTRL) |
-				0x00000001, AM33XX_DDR_CKE_CTRL);
-
-	config_emif();
-}
-
-/*
- * early system init of muxing and clocks.
- */
-void pcm051_sram_init(void)
-{
-	u32 regVal, uart_base;
-
-	/* Setup the PLLs and the clocks for the peripherals */
-	pll_init(MPUPLL_M_600, 25);
-
-	pcm051_config_ddr();
-
-	/* UART softreset */
-	am33xx_enable_uart0_pin_mux();
-	uart_base = AM33XX_UART0_BASE;
-
-	regVal = readl(uart_base + UART_SYSCFG_OFFSET);
-	regVal |= UART_RESET;
-	writel(regVal, (uart_base + UART_SYSCFG_OFFSET));
-	while ((readl(uart_base + UART_SYSSTS_OFFSET) &
-		UART_CLK_RUNNING_MASK) != UART_CLK_RUNNING_MASK);
-
-	/* Disable smart idle */
-	regVal = readl((uart_base + UART_SYSCFG_OFFSET));
-	regVal |= UART_SMART_IDLE_EN;
-	writel(regVal, (uart_base + UART_SYSCFG_OFFSET));
-}
+static const struct am33xx_cmd_control MT41J256M8HX15E_2x256M8_cmd = {
+	.slave_ratio0 = 0x40,
+	.dll_lock_diff0 = 0x0,
+	.invert_clkout0 = 0x1,
+	.slave_ratio1 = 0x40,
+	.dll_lock_diff1 = 0x0,
+	.invert_clkout1 = 0x1,
+	.slave_ratio2 = 0x40,
+	.dll_lock_diff2 = 0x0,
+	.invert_clkout2 = 0x1,
+};
+
+static const struct am33xx_emif_regs MT41J256M8HX15E_2x256M8_regs = {
+	.emif_read_latency	= 0x6,
+	.emif_tim1		= 0x0668A39B,
+	.emif_tim2		= 0x26337FDA,
+	.emif_tim3		= 0x501F830F,
+	.sdram_config		= 0x61C04832,
+	.zq_config		= 0x50074BE4,
+	.sdram_ref_ctrl		= 0x0000093B,
+};
+
+static const struct am33xx_ddr_data MT41J256M8HX15E_2x256M8_data = {
+	.rd_slave_ratio0	= 0x3B,
+	.wr_dqs_slave_ratio0	= 0x85,
+	.fifo_we_slave_ratio0	= 0x100,
+	.wr_slave_ratio0	= 0xC1,
+	.use_rank0_delay	= 0x01,
+	.dll_lock_diff0		= 0x0,
+};
 
 /**
  * @brief The basic entry point for board initialization.
@@ -190,8 +55,6 @@ void pcm051_sram_init(void)
  */
 static int pcm051_board_init(void)
 {
-	int in_sdram = running_in_sdram();
-
 	/* WDT1 is already running when the bootloader gets control
 	 * Disable it to avoid "random" resets
 	 */
@@ -201,9 +64,17 @@ static int pcm051_board_init(void)
 	writel(WDT_DISABLE_CODE2, AM33XX_WDT_REG(WSPR));
 	while (readl(AM33XX_WDT_REG(WWPS)) != 0x0);
 
-	/* Dont reconfigure SDRAM while running in SDRAM! */
-	if (!in_sdram)
-		pcm051_sram_init();
+	if (running_in_sdram())
+		return 0;
+
+	pll_init(MPUPLL_M_600, 25);
+
+	am335x_sdram_init(0x18B, &MT41J256M8HX15E_2x256M8_cmd,
+			&MT41J256M8HX15E_2x256M8_regs,
+			&MT41J256M8HX15E_2x256M8_data);
+
+	am33xx_uart0_soft_reset();
+	am33xx_enable_uart0_pin_mux();
 
 	return 0;
 }
-- 
1.8.4.rc3


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

  parent reply	other threads:[~2013-08-26  6:56 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-26  6:55 [PATCH] am33xx beaglebone and related Sascha Hauer
2013-08-26  6:55 ` [PATCH 01/22] console: fix console without CONFIG_PARAMETER Sascha Hauer
2013-08-26  6:55 ` [PATCH 02/22] mci: omap: advertise 8 bit support Sascha Hauer
2013-08-26  6:55 ` [PATCH 03/22] mci: omap: implement device detect callback Sascha Hauer
2013-08-26  6:55 ` [PATCH 04/22] mci: omap: Allow to set mmc devname via platformdata Sascha Hauer
2013-08-26  6:55 ` [PATCH 05/22] ARM: omap: Allow to set mmc devname used for booting Sascha Hauer
2013-08-26  6:55 ` [PATCH 06/22] ARM: omap: fix omap_save_bootinfo Sascha Hauer
2013-08-26 12:00   ` Teresa Gamez
2013-08-26  6:55 ` [PATCH 07/22] ARM: omap: rename INIT_LL to omap_uart_lowlevel_init Sascha Hauer
2013-08-26  6:55 ` [PATCH 08/22] ARM: am33xx: Cleanup of lowlevel code Sascha Hauer
2013-08-26  6:55 ` Sascha Hauer [this message]
2013-08-26  6:55 ` [PATCH 10/22] ARM: beaglebone: Clean up " Sascha Hauer
2013-08-26  6:55 ` [PATCH 11/22] ARM: am33xx: set bootsource instance correctly for MMC1 Sascha Hauer
2013-08-26  6:55 ` [PATCH 12/22] ARM: cpuinfo: display the core name and version Sascha Hauer
2013-08-26  6:55 ` [PATCH 13/22] ARM: am33xx: implement cpu revision decoding Sascha Hauer
2013-08-26  6:55 ` [PATCH 14/22] ARM: am33xx: beaglebone: configure I2C EEPROM Sascha Hauer
2013-08-26  6:55 ` [PATCH 15/22] ARM: am33xx: Add mmc1 registration helper Sascha Hauer
2013-08-26  6:55 ` [PATCH 16/22] ARM: am33xx: make DDR PLL frequency configurable Sascha Hauer
2013-08-26  6:55 ` [PATCH 17/22] rework debug_ll Sascha Hauer
2013-08-26  6:55 ` [PATCH 18/22] ARM: beaglebone: Initialize UART for lowlevel debugging Sascha Hauer
2013-08-26  6:56 ` [PATCH 19/22] ARM: beaglebone: add support for beaglebone black with DDR3 RAM Sascha Hauer
2013-08-26  6:56 ` [PATCH 20/22] ARM: beaglebone: register sd/emmc with persistent name Sascha Hauer
2013-08-26  6:56 ` [PATCH 21/22] ARM: beaglebone: update mlo_small defconfig Sascha Hauer
2013-08-26  6:56 ` [PATCH 22/22] ARM: beaglebone: update defconfig Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377500163-28962-10-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox