Skip to contentSkip to conversation

Revert "imx: mx6: ddr correct tRFC and tXS"

PATCH New Peng Fan 2 participants 4 messages Sep 1, 2015 – Sep 13, 2015 Arm (32-bit)

lore
Share & tools
lore

Peng Fan

author
#0 lore raw

PATCH 1/2 Revert "imx: mx6: ddr correct tRFC and tXS"

This reverts commit 059323fb6a8f21637bb617919715c2427f24777c.

This commit 059323fb6a8f21637bb617919715c2427f24777c use JESD79-3E which is not the newest spec. Should use JESD79-3F in which tRFC is 260ns for 4Gb chip.

Cc Stefano Babic <[email protected]>
Cc Tim Harvey <[email protected]>
---
 arch/arm/cpu/armv7/mx6/ddr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/mx6/ddr.c +2 -2
index cf5587b..6b039e4 100644
@@ -702,8 +702,8 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo,
 		txs = DIV_ROUND_UP(170000, clkper) - 1;
 		break;
 	case 4: /* 4Gb per chip */
-		trfc = DIV_ROUND_UP(300000, clkper) - 1;
-		txs = DIV_ROUND_UP(310000, clkper) - 1;
+		trfc = DIV_ROUND_UP(260000, clkper) - 1;
+		txs = DIV_ROUND_UP(270000, clkper) - 1;
 		break;
 	case 8: /* 8Gb per chip */
 		trfc = DIV_ROUND_UP(350000, clkper) - 1;
Signature · 1 line
1.8.4
author
#1 lore raw

PATCH 2/2 imx: discard duplicated MXC_OCOTP and CMD_FUSE

We have CONFIG_MXC_OCOTP and CONFIG_CMD_FUSE in mx6_common.h, discard duplicated macro definitions in board header files.

Cc Stefano Babic <[email protected]>
Cc Peter Robinson <[email protected]>
Cc Otavio Salvador <[email protected]>
---
 include/configs/cgtqmx6eval.h     | 5 -----
 include/configs/mx6ul_14x14_evk.h | 5 -----
 2 files changed, 10 deletions(-)
include/configs/cgtqmx6eval.h +0 -5
index 92930c8..0979728 100644
@@ -35,11 +35,6 @@
 /* Thermal support */
 #define CONFIG_IMX6_THERMAL
 
-#define CONFIG_CMD_FUSE
-#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL)
-#define CONFIG_MXC_OCOTP
-#endif
-
 /* I2C Configs */
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
include/configs/mx6ul_14x14_evk.h +0 -5
index f643e4d..89e6028 100644
@@ -34,11 +34,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
-#define CONFIG_CMD_FUSE
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
-
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
Signature · 1 line
1.8.4
#2 lore raw

PATCH 2/2 imx: discard duplicated MXC_OCOTP and CMD_FUSE

Quoted 35 lines · Peng Fan

We have CONFIG_MXC_OCOTP and CONFIG_CMD_FUSE in mx6_common.h, discard duplicated macro definitions in board header files.

Cc Stefano Babic <[email protected]>
Cc Peter Robinson <[email protected]>
Cc Otavio Salvador <[email protected]>
---
 include/configs/cgtqmx6eval.h     | 5 -----
 include/configs/mx6ul_14x14_evk.h | 5 -----
 2 files changed, 10 deletions(-)
include/configs/cgtqmx6eval.h +0 -5
index 92930c8..0979728 100644
@@ -35,11 +35,6 @@
 /* Thermal support */
 #define CONFIG_IMX6_THERMAL
 
-#define CONFIG_CMD_FUSE
-#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL)
-#define CONFIG_MXC_OCOTP
-#endif
-
 /* I2C Configs */
 #define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
include/configs/mx6ul_14x14_evk.h +0 -0
index f643e4d..89e6028 100644
@@ -34,11 +34,6 @@
 #define CONFIG_MXC_UART

include/configs/mx6ul_14x14_evk.h line 39

Quoted 10 lines
include/configs/mx6ul_14x14_evk.h +0 -5
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
-#define CONFIG_CMD_FUSE
-#ifdef CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
-#endif
-
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR

for the 6ul part:

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH 1/2 Revert "imx: mx6: ddr correct tRFC and tXS"

In reply to Peng Fan
Quoted 19 lines · Peng Fan

This reverts commit 059323fb6a8f21637bb617919715c2427f24777c.

This commit 059323fb6a8f21637bb617919715c2427f24777c use JESD79-3E which is not the newest spec. Should use JESD79-3F in which tRFC is 260ns for 4Gb chip.

Cc Stefano Babic <[email protected]>
Cc Tim Harvey <[email protected]>
---
 arch/arm/cpu/armv7/mx6/ddr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/mx6/ddr.c +0 -0
index cf5587b..6b039e4 100644

arch/arm/cpu/armv7/mx6/ddr.c void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo, · line 709

Quoted 10 lines
arch/arm/cpu/armv7/mx6/ddr.c +2 -2
@@ -702,8 +702,8 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo,
 		txs = DIV_ROUND_UP(170000, clkper) - 1;
 		break;
 	case 4: /* 4Gb per chip */
-		trfc = DIV_ROUND_UP(300000, clkper) - 1;
-		txs = DIV_ROUND_UP(310000, clkper) - 1;
+		trfc = DIV_ROUND_UP(260000, clkper) - 1;
+		txs = DIV_ROUND_UP(270000, clkper) - 1;
 		break;
 	case 8: /* 8Gb per chip */
 		trfc = DIV_ROUND_UP(350000, clkper) - 1;

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================