Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

[oweals/u-boot.git] / board / freescale / common / pixis.c

diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index bff6a82e28801c69ff42c8732d84eae481b6c2d2..b5a0e847ad7a3a17ad01d486036cc307a4ee9439 100644 (file)
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -26,6 +26,7 @@
 #include <command.h>
 #include <watchdog.h>
 #include <asm/cache.h>
+#include <asm/io.h>
 
 #include "pixis.h"
 
@@ -282,6 +283,60 @@ U_BOOT_CMD(
           "diswd       - Disable watchdog timer \n",
           NULL);
 
+#ifdef CONFIG_FSL_SGMII_RISER
+int pixis_set_sgmii(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+       int which_tsec = -1;
+       uchar mask;
+       uchar switch_mask;
+
+       if (argc > 2)
+               if (strcmp(argv[1], "all") != 0)
+                       which_tsec = simple_strtoul(argv[1], NULL, 0);
+
+       switch (which_tsec) {
+       case 1:
+               mask = PIXIS_VSPEED2_TSEC1SER;
+               switch_mask = PIXIS_VCFGEN1_TSEC1SER;
+               break;
+       case 3:
+               mask = PIXIS_VSPEED2_TSEC3SER;
+               switch_mask = PIXIS_VCFGEN1_TSEC3SER;
+               break;
+       default:
+               mask = PIXIS_VSPEED2_TSEC1SER | PIXIS_VSPEED2_TSEC3SER;
+               switch_mask = PIXIS_VCFGEN1_TSEC1SER | PIXIS_VCFGEN1_TSEC3SER;
+               break;
+       }
+
+       /* Toggle whether the switches or FPGA control the settings */
+       if (!strcmp(argv[argc - 1], "switch"))
+               clrbits_8((unsigned char *)PIXIS_BASE + PIXIS_VCFGEN1,
+                       switch_mask);
+       else
+               setbits_8((unsigned char *)PIXIS_BASE + PIXIS_VCFGEN1,
+                       switch_mask);
+
+       /* If it's not the switches, enable or disable SGMII, as specified */
+       if (!strcmp(argv[argc - 1], "on"))
+               clrbits_8((unsigned char *)PIXIS_BASE + PIXIS_VSPEED2, mask);
+       else if (!strcmp(argv[argc - 1], "off"))
+               setbits_8((unsigned char *)PIXIS_BASE + PIXIS_VSPEED2, mask);
+
+       return 0;
+}
+
+U_BOOT_CMD(
+               pixis_set_sgmii, CFG_MAXARGS, 1, pixis_set_sgmii,
+               "pixis_set_sgmii"
+               " - Enable or disable SGMII mode for a given TSEC \n",
+               "\npixis_set_sgmii [TSEC num] <on|off|switch>\n"
+               "    TSEC num: 1,2,3,4 or 'all'.  'all' is default.\n"
+               "    on - enables SGMII\n"
+               "    off - disables SGMII\n"
+               "    switch - use switch settings\n");
+#endif
+
 /*
  * This function takes the non-integral cpu:mpx pll ratio
  * and converts it to an integer that can be used to assign
@@ -397,7 +452,7 @@ pixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         * Check that cf has all required parms
         */
        if ((p_cf && !(p_cf_sysclk && p_cf_corepll && p_cf_mpxpll))
-           ||  unknown_param) {
+           ||  unknown_param) {
                puts(cmdtp->help);
                return 1;
        }