Skip to contentSkip to conversation

powerpc/T104xD4RDB: Add T1040/T1042D4RDB boards support

PATCH New Vijay Rai 2 participants 2 messages Feb 3, 2015 – Feb 26, 2015

lore
Share & tools
lore

Vijay Rai

author
#0 lore raw

PATCH 1/1 powerpc/T104xD4RDB: Add T1040/T1042D4RDB boards support

T1040D4RDB is a Freescale reference board that hosts the T1040 SoC. It is similar to T1040RDB board with the following differences :
- Has DDR4 memory
- PHY ports have different PHY addresses
- RTC support
- Both QE-TDM and DIU connector

T1040D4RDB supports 0x66 serdes protocol with following interfaces
- 2 RGMII's on DTSEC4, DTSEC5
- 1 SGMII on DTSEC3

T1042D4RDB is variant of T1040D4RDB which hosts T1042 SoC (Personality of T1040 without L2 switch)
T1042D4RDB supports 0x86 serdes protocol with following interfaces
- 2 RGMII's on DTSEC4, DTSEC5
- 3 SGMII on DTSEC1, DTSEC2 & DTSEC3

---
 board/freescale/t104xrdb/MAINTAINERS     |    8 ++++++
 board/freescale/t104xrdb/ddr.c           |    7 +++++
 board/freescale/t104xrdb/ddr.h           |   12 ++++++++
 board/freescale/t104xrdb/eth.c           |   20 +++++++++++--
 board/freescale/t104xrdb/t1040d4_rcw.cfg |    7 +++++
 board/freescale/t104xrdb/t1042d4_rcw.cfg |    7 +++++
 configs/T1040D4RDB_NAND_defconfig        |    5 ++++
 configs/T1040D4RDB_SDCARD_defconfig      |    5 ++++
 configs/T1040D4RDB_SPIFLASH_defconfig    |    5 ++++
 configs/T1040D4RDB_defconfig             |    4 +++
 configs/T1042D4RDB_NAND_defconfig        |    5 ++++
 configs/T1042D4RDB_SDCARD_defconfig      |    5 ++++
 configs/T1042D4RDB_SPIFLASH_defconfig    |    5 ++++
 configs/T1042D4RDB_defconfig             |    4 +++
 include/configs/T104xRDB.h               |   46 ++++++++++++++++++++++++------
 15 files changed, 134 insertions(+), 11 deletions(-)
 create mode 100644 board/freescale/t104xrdb/t1040d4_rcw.cfg
 create mode 100644 board/freescale/t104xrdb/t1042d4_rcw.cfg
 create mode 100644 configs/T1040D4RDB_NAND_defconfig
 create mode 100644 configs/T1040D4RDB_SDCARD_defconfig
 create mode 100644 configs/T1040D4RDB_SPIFLASH_defconfig
 create mode 100644 configs/T1040D4RDB_defconfig
 create mode 100644 configs/T1042D4RDB_NAND_defconfig
 create mode 100644 configs/T1042D4RDB_SDCARD_defconfig
 create mode 100644 configs/T1042D4RDB_SPIFLASH_defconfig
 create mode 100644 configs/T1042D4RDB_defconfig
board/freescale/t104xrdb/MAINTAINERS +8 -0
index 13d9be9..32e044f 100644
@@ -6,7 +6,13 @@ F:	include/configs/T104xRDB.h
 F:	configs/T1040RDB_defconfig
 F:	configs/T1040RDB_NAND_defconfig
 F:	configs/T1040RDB_SPIFLASH_defconfig
+F:	configs/T1040D4RDB_defconfig
+F:	configs/T1040D4RDB_NAND_defconfig
+F:	configs/T1040D4RDB_SPIFLASH_defconfig
 F:	configs/T1042RDB_defconfig
+F:	configs/T1042D4RDB_defconfig
+F:	configs/T1042D4RDB_NAND_defconfig
+F:	configs/T1042D4RDB_SPIFLASH_defconfig
 F:	configs/T1042RDB_PI_defconfig
 F:	configs/T1042RDB_PI_NAND_defconfig
 F:	configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -15,6 +21,8 @@ T1040RDB_SDCARD BOARD
 #M:	-
 S:	Maintained
 F:	configs/T1040RDB_SDCARD_defconfig
+F:	configs/T1040D4RDB_SDCARD_defconfig
+F:	configs/T1042D4RDB_SDCARD_defconfig
 F:	configs/T1042RDB_PI_SDCARD_defconfig
 
 T1040RDB_SECURE_BOOT BOARD
board/freescale/t104xrdb/ddr.c +7 -0
index e1148e5..217c8ea 100644
@@ -91,9 +91,16 @@ found:
 	popts->zq_en = 1;
 
 	/* DHC_EN =1, ODT = 75 Ohm */
+#ifdef CONFIG_SYS_FSL_DDR4
+	popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_80ohm);
+	popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_80ohm) |
+		DDR_CDR2_VREF_OVRD(70);       /* Vref = 70% */
+#else
 	popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_75ohm);
 	popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_75ohm);
+#endif
 }
+#endif
 
 #if defined(CONFIG_DEEP_SLEEP)
 void board_mem_sleep_setup(void)
board/freescale/t104xrdb/ddr.h +12 -0
index ab1c32d..5d7124a 100644
@@ -28,6 +28,13 @@ static const struct board_specific_parameters udimm0[] = {
 	 *   num|  hi| rank|  clk| wrlvl |   wrlvl
 	 * ranks| mhz| GB  |adjst| start |   ctl2
 	 */
+#ifdef CONFIG_SYS_FSL_DDR4
+	{2,  1666, 0, 4,     7, 0x0808090B, 0x0C0D0E0A},
+	{2,  1900, 0, 4,     6, 0x08080A0C, 0x0D0E0F0A},
+	{1,  1666, 0, 4,     6, 0x0708090B, 0x0C0D0E09},
+	{1,  1900, 0, 4,     6, 0x08080A0C, 0x0D0E0F0A},
+	{1,  2200, 0, 4,     7, 0x08090A0D, 0x0F0F100C},
+#elif defined(CONFIG_SYS_FSL_DDR3)
 	{2,  833,  4, 4,     6, 0x06060607, 0x08080807},
 	{2,  833,  0, 4,     6, 0x06060607, 0x08080807},
 	{2,  1350, 4, 4,     7, 0x0708080A, 0x0A0B0C09},
@@ -40,9 +47,14 @@ static const struct board_specific_parameters udimm0[] = {
 	{1,  1350, 0, 4,     7, 0x0708080A, 0x0A0B0C09},
 	{1,  1666, 4, 4,     7, 0x0808090B, 0x0C0D0E0A},
 	{1,  1666, 0, 4,     7, 0x0808090B, 0x0C0D0E0A},
+#else
+#error DDR type not defined
+#endif
 	{}
 };
 
+#endif
+
 static const struct board_specific_parameters *udimms[] = {
 	udimm0,
 };
board/freescale/t104xrdb/eth.c +18 -2
index 7581a4cd..9c4e922 100644
@@ -43,9 +43,11 @@ int board_eth_init(bd_t *bis)
 		int idx = i - FM1_DTSEC1;
 
 		switch (fm_info_get_enet_if(i)) {
-#ifdef CONFIG_T1040RDB
+#if defined(CONFIG_T1040RDB) || (CONFIG_T1040D4RDB)
 		case PHY_INTERFACE_MODE_SGMII:
-			/* T1040RDB only supports SGMII on DTSEC3 */
+			/* T1040RDB & T1040D4RDB only supports SGMII on
+			 * DTSEC3
+			 */
 			fm_info_set_phy_address(FM1_DTSEC3,
 						CONFIG_SYS_SGMII1_PHY_ADDR);
 			break;
@@ -60,6 +62,20 @@ int board_eth_init(bd_t *bis)
 						CONFIG_SYS_SGMII1_PHY_ADDR);
 			break;
 #endif
+#ifdef CONFIG_T1042D4RDB
+		case PHY_INTERFACE_MODE_SGMII:
+			/* T1042D4RDB supports SGMII on DTSEC1, DTSEC2
+			 *  & DTSEC3
+			 */
+			if (FM1_DTSEC1 == i)
+				phy_addr = CONFIG_SYS_SGMII1_PHY_ADDR;
+			if (FM1_DTSEC2 == i)
+				phy_addr = CONFIG_SYS_SGMII2_PHY_ADDR;
+			if (FM1_DTSEC3 == i)
+				phy_addr = CONFIG_SYS_SGMII3_PHY_ADDR;
+			fm_info_set_phy_address(i, phy_addr);
+			break;
+#endif
 		case PHY_INTERFACE_MODE_RGMII:
 			if (FM1_DTSEC4 == i)
 				phy_addr = CONFIG_SYS_RGMII1_PHY_ADDR;
board/freescale/t104xrdb/t1040d4_rcw.cfg new file +7 -0
new file mode 100644
index 0000000..3300c18
@@ -0,0 +1,7 @@
+#PBL preamble and RCW header
+aa55aa55 010e0100
+# serdes protocol 0x66
+0c18000e 0e000000 00000000 00000000
+66000002 80000002 e8106000 01000000
+00000000 00000000 00000000 00032810
+00000000 0342500f 00000000 00000000
board/freescale/t104xrdb/t1042d4_rcw.cfg new file +7 -0
new file mode 100644
index 0000000..db4d52f
@@ -0,0 +1,7 @@
+#PBL preamble and RCW header
+aa55aa55 010e0100
+# serdes protocol 0x86
+0c18000e 0e000000 00000000 00000000
+86000002 80000002 ec027000 01000000
+00000000 00000000 00000000 00032810
+00000000 0342500f 00000000 00000000
configs/T1040D4RDB_NAND_defconfig new file +5 -0
new file mode 100644
index 0000000..72b046b
@@ -0,0 +1,5 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB"
++S:CONFIG_PPC=y
++S:CONFIG_MPC85xx=y
++S:CONFIG_TARGET_T104XRDB=y
configs/T1040D4RDB_SDCARD_defconfig new file +5 -0
new file mode 100644
index 0000000..9e63214
@@ -0,0 +1,5 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB"
++S:CONFIG_PPC=y
++S:CONFIG_MPC85xx=y
++S:CONFIG_TARGET_T104XRDB=y
configs/T1040D4RDB_SPIFLASH_defconfig new file +5 -0
new file mode 100644
index 0000000..e0ab015
@@ -0,0 +1,5 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB"
++S:CONFIG_PPC=y
++S:CONFIG_MPC85xx=y
++S:CONFIG_TARGET_T104XRDB=y
configs/T1040D4RDB_defconfig new file +4 -0
new file mode 100644
index 0000000..d650ab6
@@ -0,0 +1,4 @@
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB"
+CONFIG_PPC=y
+CONFIG_MPC85xx=y
+CONFIG_TARGET_T104XRDB=y
configs/T1042D4RDB_NAND_defconfig new file +5 -0
new file mode 100644
index 0000000..5e33654
@@ -0,0 +1,5 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB"
++S:CONFIG_PPC=y
++S:CONFIG_MPC85xx=y
++S:CONFIG_TARGET_T104XRDB=y
configs/T1042D4RDB_SDCARD_defconfig new file +5 -0
new file mode 100644
index 0000000..7851a8b
@@ -0,0 +1,5 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB"
++S:CONFIG_PPC=y
++S:CONFIG_MPC85xx=y
++S:CONFIG_TARGET_T104XRDB=y
configs/T1042D4RDB_SPIFLASH_defconfig new file +5 -0
new file mode 100644
index 0000000..536ea79
@@ -0,0 +1,5 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB"
++S:CONFIG_PPC=y
++S:CONFIG_MPC85xx=y
++S:CONFIG_TARGET_T104XRDB=y
configs/T1042D4RDB_defconfig new file +4 -0
new file mode 100644
index 0000000..715697f
@@ -0,0 +1,4 @@
+CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB"
+CONFIG_PPC=y
+CONFIG_MPC85xx=y
+CONFIG_TARGET_T104XRDB=y
include/configs/T104xRDB.h +37 -9

106 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 powerpc/T104xD4RDB: Add T1040/T1042D4RDB boards support

Quoted 85 lines · Vijay Rai

T1040D4RDB is a Freescale reference board that hosts the T1040 SoC. It is similar to T1040RDB board with the following differences :
- Has DDR4 memory
- PHY ports have different PHY addresses
- RTC support
- Both QE-TDM and DIU connector

T1040D4RDB supports 0x66 serdes protocol with following interfaces
- 2 RGMII's on DTSEC4, DTSEC5
- 1 SGMII on DTSEC3

T1042D4RDB is variant of T1040D4RDB which hosts T1042 SoC (Personality of T1040 without L2 switch)
T1042D4RDB supports 0x86 serdes protocol with following interfaces
- 2 RGMII's on DTSEC4, DTSEC5
- 3 SGMII on DTSEC1, DTSEC2 & DTSEC3

---
 board/freescale/t104xrdb/MAINTAINERS     |    8 ++++++
 board/freescale/t104xrdb/ddr.c           |    7 +++++
 board/freescale/t104xrdb/ddr.h           |   12 ++++++++
 board/freescale/t104xrdb/eth.c           |   20 +++++++++++--
 board/freescale/t104xrdb/t1040d4_rcw.cfg |    7 +++++
 board/freescale/t104xrdb/t1042d4_rcw.cfg |    7 +++++
 configs/T1040D4RDB_NAND_defconfig        |    5 ++++
 configs/T1040D4RDB_SDCARD_defconfig      |    5 ++++
 configs/T1040D4RDB_SPIFLASH_defconfig    |    5 ++++
 configs/T1040D4RDB_defconfig             |    4 +++
 configs/T1042D4RDB_NAND_defconfig        |    5 ++++
 configs/T1042D4RDB_SDCARD_defconfig      |    5 ++++
 configs/T1042D4RDB_SPIFLASH_defconfig    |    5 ++++
 configs/T1042D4RDB_defconfig             |    4 +++
 include/configs/T104xRDB.h               |   46 ++++++++++++++++++++++++------
 15 files changed, 134 insertions(+), 11 deletions(-)
 create mode 100644 board/freescale/t104xrdb/t1040d4_rcw.cfg
 create mode 100644 board/freescale/t104xrdb/t1042d4_rcw.cfg
 create mode 100644 configs/T1040D4RDB_NAND_defconfig
 create mode 100644 configs/T1040D4RDB_SDCARD_defconfig
 create mode 100644 configs/T1040D4RDB_SPIFLASH_defconfig
 create mode 100644 configs/T1040D4RDB_defconfig
 create mode 100644 configs/T1042D4RDB_NAND_defconfig
 create mode 100644 configs/T1042D4RDB_SDCARD_defconfig
 create mode 100644 configs/T1042D4RDB_SPIFLASH_defconfig
 create mode 100644 configs/T1042D4RDB_defconfig
board/freescale/t104xrdb/MAINTAINERS +8 -0
index 13d9be9..32e044f 100644
@@ -6,7 +6,13 @@ F:	include/configs/T104xRDB.h
 F:	configs/T1040RDB_defconfig
 F:	configs/T1040RDB_NAND_defconfig
 F:	configs/T1040RDB_SPIFLASH_defconfig
+F:	configs/T1040D4RDB_defconfig
+F:	configs/T1040D4RDB_NAND_defconfig
+F:	configs/T1040D4RDB_SPIFLASH_defconfig
 F:	configs/T1042RDB_defconfig
+F:	configs/T1042D4RDB_defconfig
+F:	configs/T1042D4RDB_NAND_defconfig
+F:	configs/T1042D4RDB_SPIFLASH_defconfig
 F:	configs/T1042RDB_PI_defconfig
 F:	configs/T1042RDB_PI_NAND_defconfig
 F:	configs/T1042RDB_PI_SPIFLASH_defconfig
@@ -15,6 +21,8 @@ T1040RDB_SDCARD BOARD
 #M:	-
 S:	Maintained
 F:	configs/T1040RDB_SDCARD_defconfig
+F:	configs/T1040D4RDB_SDCARD_defconfig
+F:	configs/T1042D4RDB_SDCARD_defconfig
 F:	configs/T1042RDB_PI_SDCARD_defconfig
 
 T1040RDB_SECURE_BOOT BOARD
board/freescale/t104xrdb/ddr.c +3 -0
index e1148e5..217c8ea 100644
@@ -91,9 +91,16 @@ found:
 	popts->zq_en = 1;
 
 	/* DHC_EN =1, ODT = 75 Ohm */
+#ifdef CONFIG_SYS_FSL_DDR4
+	popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_80ohm);
+	popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_80ohm) |

board/freescale/t104xrdb/ddr.c found: · line 106

Quoted 10 lines
board/freescale/t104xrdb/ddr.c +4 -0
+		DDR_CDR2_VREF_OVRD(70);       /* Vref = 70% */
+#else
 	popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_75ohm);
 	popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_75ohm);
+#endif
 }
+#endif
 
 #if defined(CONFIG_DEEP_SLEEP)
 void board_mem_sleep_setup(void)

You added extra #endif. Did you miss something? Please check your local code and make sure it compiles when sending patches.

York