Merge branch 'master' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / arch / powerpc / include / asm / fsl_serdes.h

diff --git a/arch/powerpc/include/asm/fsl_serdes.h b/arch/powerpc/include/asm/fsl_serdes.h
index 1106d28..f60cb0a 100644 (file)
--- a/arch/powerpc/include/asm/fsl_serdes.h
+++ b/arch/powerpc/include/asm/fsl_serdes.h
@@ -62,18 +62,14 @@ enum srds_prtcl {
        QSGMII_FM1_B,           /* B indicates MACs 5,6,9,10 */
        QSGMII_FM2_A,
        QSGMII_FM2_B,
+       XFI_FM1_MAC1,
+       XFI_FM1_MAC2,
        XFI_FM1_MAC9,
        XFI_FM1_MAC10,
        XFI_FM2_MAC9,
        XFI_FM2_MAC10,
        INTERLAKEN,
-       SGMII_SW1_DTSEC1,       /* SW indicates on L2 switch */
-       SGMII_SW1_DTSEC2,
-       SGMII_SW1_DTSEC3,
-       SGMII_SW1_DTSEC4,
-       SGMII_SW1_DTSEC5,
-       SGMII_SW1_DTSEC6,
-       QSGMII_SW1_A,           /* SW indicates on L2 swtich */
+       QSGMII_SW1_A,           /* Indicates ports on L2 Switch */
        QSGMII_SW1_B,
 };
 
@@ -86,6 +82,7 @@ enum srds {
 
 int is_serdes_configured(enum srds_prtcl device);
 void fsl_serdes_init(void);
+const char *serdes_clock_to_string(u32 clock);
 
 #ifdef CONFIG_FSL_CORENET
 #ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2