powerpc/p2041rdb: remove watch dog related codes

CPLD 2.2 removed board watch dog support due to the limitation of CPLD
capacity after adding all the requested features, such as switch overriding.
There is no pin-compatible upgrade part available for current PCB design.
So remove codes related to it.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c
index 2ad89a84e213f1912e3dd688e47290b313d7e727..a4bcc183e4e3e348cd082658a64c3d94623e3946 100644 (file)
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/freescale/p2041rdb/cpld.c
@@ -79,7 +79,6 @@ static void cpld_dump_regs(void)
        printf("cpld_ver_sub    = 0x%02x\n", CPLD_READ(cpld_ver_sub));
        printf("pcba_ver        = 0x%02x\n", CPLD_READ(pcba_ver));
        printf("system_rst      = 0x%02x\n", CPLD_READ(system_rst));
-       printf("wd_cfg          = 0x%02x\n", CPLD_READ(wd_cfg));
        printf("sw_ctl_on       = 0x%02x\n", CPLD_READ(sw_ctl_on));
        printf("por_cfg         = 0x%02x\n", CPLD_READ(por_cfg));
        printf("switch_strobe   = 0x%02x\n", CPLD_READ(switch_strobe));
@@ -96,7 +95,6 @@ static void cpld_dump_regs(void)
 int cpld_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int rc = 0;
-       unsigned int i;
 
        if (argc <= 1)
                return cmd_usage(cmdtp);
@@ -106,13 +104,6 @@ int cpld_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        cpld_set_altbank();
                else
                        cpld_set_defbank();
-       } else if (strcmp(argv[1], "watchdog") == 0) {
-               static char *period[8] = {"1ms", "10ms", "30ms", "disable",
-                       "100ms", "1s", "10s", "60s"};
-               for (i = 0; i < ARRAY_SIZE(period); i++) {
-                       if (strcmp(argv[2], period[i]) == 0)
-                               CPLD_WRITE(wd_cfg, i);
-               }
        } else if (strcmp(argv[1], "lane_mux") == 0) {
                u32 lane = simple_strtoul(argv[2], NULL, 16);
                u8 val = (u8)simple_strtoul(argv[3], NULL, 16);
@@ -156,8 +147,6 @@ U_BOOT_CMD(
        "Reset the board or pin mulexing selection using the CPLD sequencer",
        "reset - hard reset to default bank\n"
        "cpld_cmd reset altbank - reset to alternate bank\n"
-       "cpld_cmd watchdog <watchdog_period> - set the watchdog period\n"
-       "       period: 1ms 10ms 30ms 100ms 1s 10s 60s disable\n"
        "cpld_cmd lane_mux <lane> <mux_value> - set multiplexed lane pin\n"
        "       lane 6: 0 -> slot1\n"
        "               1 -> SGMII (Default)\n"

diff --git a/board/freescale/p2041rdb/cpld.h b/board/freescale/p2041rdb/cpld.h
index bece5dd8c3c819ba956c39e0b8d1603a77319185..2e3e7b113c934f829010bfa35a725ae70eebf987 100644 (file)
--- a/board/freescale/p2041rdb/cpld.h
+++ b/board/freescale/p2041rdb/cpld.h
@@ -19,7 +19,7 @@ typedef struct cpld_data {
        u8 cpld_ver_sub;        /* 0x1 - CPLD Minor Revision Register */
        u8 pcba_ver;            /* 0x2 - PCBA Revision Register */
        u8 system_rst;          /* 0x3 - system reset register */
-       u8 wd_cfg;              /* 0x4 - Watchdog Period Setting Register */
+       u8 res0;                /* 0x4 - not used */
        u8 sw_ctl_on;           /* 0x5 - Switch Control Enable Register */
        u8 por_cfg;             /* 0x6 - POR Control Register */
        u8 switch_strobe;       /* 0x7 - Multiplexed pin Select Register */