[U-Boot-Users] MPC8548CDS pre-eTSEC 3 and 4 patch

[Jon Loeliger]

Guys,

So, before Andy can put the PHYs of eTSEC 3 and 4 into
RGMII mode on 8548CDS systems, you have to add them to
the port first.	

This patch must be applied _before_ Andy Flemings patch
posted just a couple hours ago with no subject line.

Thanks,
jdl


* Patch by Jon Loeliger, 23-May-2005
  Add eTSEC 3 and 4 to MPC8548CDS board.


Index: include/configs/MPC8548CDS.h
===================================================================
RCS file: /cm/vault/u-boot/u-boot/include/configs/MPC8548CDS.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- include/configs/MPC8548CDS.h	6 May 2005 19:47:20 -0000	1.1.4.2
+++ include/configs/MPC8548CDS.h	12 May 2005 19:57:14 -0000	1.1.4.3
@@ -370,13 +370,22 @@
 #define CONFIG_MII		1	/* MII PHY management */
 #define CONFIG_MPC85XX_TSEC1	1
 #define CONFIG_MPC85XX_TSEC2	1
+#define CONFIG_MPC85XX_TSEC3	1
+#define CONFIG_MPC85XX_TSEC4	1
 #undef CONFIG_MPC85XX_FEC
+
 #define TSEC1_PHY_ADDR		0
 #define TSEC2_PHY_ADDR		1
+#define TSEC3_PHY_ADDR		2
+#define TSEC4_PHY_ADDR		3
 #define FEC_PHY_ADDR		3
+
 #define TSEC1_PHYIDX		0
 #define TSEC2_PHYIDX		0
+#define TSEC3_PHYIDX		0
+#define TSEC4_PHYIDX		0
 #define FEC_PHYIDX		0
+
 #define CONFIG_ETHPRIME		"MOTO ENET0"
 
 #endif	/* CONFIG_TSEC_ENET */
Index: net/eth.c
===================================================================
RCS file: /cm/vault/u-boot/u-boot/net/eth.c,v
retrieving revision 1.1.1.2.2.4
retrieving revision 1.1.1.2.2.5
diff -u -r1.1.1.2.2.4 -r1.1.1.2.2.5
--- net/eth.c	1 Feb 2005 19:17:25 -0000	1.1.1.2.2.4
+++ net/eth.c	12 May 2005 19:57:14 -0000	1.1.1.2.2.5
@@ -162,6 +162,13 @@
 #endif
 #if defined(CONFIG_MPC85XX_FEC)
 	tsec_initialize(bis, 2);
+#else
+#    if defined(CONFIG_MPC85XX_TSEC3)
+	tsec_initialize(bis, 2);
+#    endif
+#    if defined(CONFIG_MPC85XX_TSEC4)
+	tsec_initialize(bis, 3);
+#    endif
 #endif
 #if defined(CONFIG_AU1X00)
 	au1x00_enet_initialize(bis);
Index: cpu/mpc85xx/tsec.c
===================================================================
RCS file: /cm/vault/u-boot/u-boot/cpu/mpc85xx/tsec.c,v
retrieving revision 1.1.1.2.2.10
retrieving revision 1.1.1.2.2.11
diff -u -r1.1.1.2.2.10 -r1.1.1.2.2.11
--- cpu/mpc85xx/tsec.c	5 May 2005 21:33:52 -0000	1.1.1.2.2.10
+++ cpu/mpc85xx/tsec.c	12 May 2005 19:57:13 -0000	1.1.1.2.2.11
@@ -82,11 +82,20 @@
 #ifdef CONFIG_MPC85XX_FEC
 	{FEC_PHY_ADDR, 0, FEC_PHYIDX},
 #else
+#    ifdef CONFIG_MPC85XX_TSEC3
+	{TSEC3_PHY_ADDR, 1, TSEC3_PHYIDX},
+#    else
 	{ 0, 0, 0},
+#    endif
+#    ifdef CONFIG_MPC85XX_TSEC4
+	{TSEC4_PHY_ADDR, 1, TSEC4_PHYIDX},
+#    else
+	{ 0, 0, 0},
+#    endif
 #endif
 };
 
-#define MAXCONTROLLERS 3
+#define MAXCONTROLLERS	(4)
 
 static int relocated = 0;