From 45b4937a350ec4221ade0bc6c58c66cab0d9c837 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 11 Mar 2014 23:58:11 -0500 Subject: [PATCH] wcte13xp: Update firmware for TE133/TE131 to 780019 This firmware image is able to handle system conditions that would result in spans going down and then coming back intermittently. Signed-off-by: Shaun Ruffell --- drivers/dahdi/firmware/Makefile | 2 +- drivers/dahdi/wcte13xp-base.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/dahdi/firmware/Makefile b/drivers/dahdi/firmware/Makefile index 07d1a02..1c2e5f7 100644 --- a/drivers/dahdi/firmware/Makefile +++ b/drivers/dahdi/firmware/Makefile @@ -31,7 +31,7 @@ VPMADT032_VERSION:=1.25.0 HX8_VERSION:=2.06 VPMOCT032_VERSION:=1.12.0 WCT820_VERSION:=1.76 -TE133_VERSION:=780017 +TE133_VERSION:=780019 TE134_VERSION:=780017 TE435_VERSION:=e0017 A8A_VERSION:=1d0017 diff --git a/drivers/dahdi/wcte13xp-base.c b/drivers/dahdi/wcte13xp-base.c index 5c61309..a7e02de 100644 --- a/drivers/dahdi/wcte13xp-base.c +++ b/drivers/dahdi/wcte13xp-base.c @@ -45,7 +45,8 @@ static const char *TE133_FW_FILENAME = "dahdi-fw-te133.bin"; static const char *TE134_FW_FILENAME = "dahdi-fw-te134.bin"; -static const u32 TE13X_FW_VERSION = 0x780017; +static const u32 TE133_FW_VERSION = 0x780019; +static const u32 TE134_FW_VERSION = 0x780017; #define WC_MAX_IFACES 8 @@ -2434,12 +2435,16 @@ error_exit: static int te13xp_check_firmware(struct t13x *wc) { const char *filename; + u32 expected_version; enum wcxb_reset_option reset; - if (is_pcie(wc)) + if (is_pcie(wc)) { filename = TE133_FW_FILENAME; - else + expected_version = TE133_FW_VERSION; + } else { filename = TE134_FW_FILENAME; + expected_version = TE134_FW_VERSION; + } /* Specific firmware requires power cycle to properly reset */ if (0x6f0017 == wcxb_get_firmware_version(&wc->xb)) @@ -2447,7 +2452,7 @@ static int te13xp_check_firmware(struct t13x *wc) else reset = WCXB_RESET_NOW; - return wcxb_check_firmware(&wc->xb, TE13X_FW_VERSION, filename, + return wcxb_check_firmware(&wc->xb, expected_version, filename, force_firmware, reset); }