diff --git a/dsl-cpe-api-vrx/Makefile b/dsl-cpe-api-vrx/Makefile
index 293191e5dfb48524ae9a637e0ee700723d9175c7..fb50f2a62bce155f1ea55687c5755906241ce4c3 100644
--- a/dsl-cpe-api-vrx/Makefile
+++ b/dsl-cpe-api-vrx/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=dsl-cpe-api-vrx
-PKG_VERSION:=4.20.1.2
+PKG_VERSION:=4.20.1.2.0
#PKG_MD5SUM:=5363ff46ecae41772a459f31046bc5b7
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=69947536fb6208ffaef0d04126c541dda7f5d39d
+PKG_SOURCE_VERSION:=180da3b590ccbfd0ca316211c42dcdb4b14a106a
PKG_RELEASE:=1
PKG_INSTALL:=1
diff --git a/dsl-cpe-api-vrx/patches/4.20.1.2-pd1_UGW_SW-23435_DSL_link_problem.patch b/dsl-cpe-api-vrx/patches/4.20.1.2-pd1_UGW_SW-23435_DSL_link_problem.patch
deleted file mode 100644
index 952d87d2780e82d0d6b4be53f4ba4f430ad9aef8..0000000000000000000000000000000000000000
--- a/dsl-cpe-api-vrx/patches/4.20.1.2-pd1_UGW_SW-23435_DSL_link_problem.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur org/configure.in new/configure.in
---- org/configure.in
-+++ new/configure.in
-@@ -1,7 +1,7 @@
-
- AC_REVISION($Revision: 1.177 $)
-
--AC_INIT([DSL CPE API driver],[4.20.1.2],[],[drv_dsl_cpe_api])
-+AC_INIT([DSL CPE API driver],[4.20.1.2-pd1],[],[drv_dsl_cpe_api])
-
- AC_CONFIG_SRCDIR(src/Makefile.am)
- AM_INIT_AUTOMAKE
-diff -Naur org/src/device/drv_dsl_cpe_device_vrx.c new/src/device/drv_dsl_cpe_device_vrx.c
---- org/src/pm/drv_dsl_cpe_pm_core.c
-+++ new/src/pm/drv_dsl_cpe_pm_core.c
-@@ -6748,10 +6748,38 @@ DSL_Error_t DSL_DRV_PM_Resume(
- DSL_Context_t *pContext)
- {
- DSL_Error_t nErrCode = DSL_SUCCESS;
-+ unsigned int i;
-
-- if (DSL_DRV_PM_CONTEXT(pContext) == DSL_NULL)
-+/*loop for 3 iterations at max with sleep of max 3 secs to avoid contention between
-+ PM thread not getting initialized , when autoboot thread is trying to do PM_RESUME
-+ Probably the best way will be to synchronize autoboot thread and PM_thread during init
-+ In our tests we see that it passes in 1 loop itself at max, but 3 for safeside
-+ This is a workqround , needs a proper fix*/
-+
-+ i = 3;
-+ while ( i > 0 )
- {
-- return DSL_ERR_POINTER;
-+ if (DSL_DRV_PM_CONTEXT(pContext) == DSL_NULL)
-+ {
-+ DSL_DEBUG( DSL_DBG_ERR,
-+ (pContext, SYS_DBG_ERR"DSL[%02d]: ERROR - PM context NULL Retry after 1 sec"
-+ DSL_DRV_CRLF, DSL_DEV_NUM(pContext)));
-+ }
-+ else
-+ {
-+ break;
-+ }
-+ i--;
-+ /*Didnt find it even after three iterations, some thing really wrong, so exit*/
-+ if ( i == 0 )
-+ {
-+ DSL_DEBUG( DSL_DBG_ERR,
-+ (pContext, SYS_DBG_ERR"DSL[%02d]: ERROR - PM context NULL Returning"
-+ DSL_DRV_CRLF, DSL_DEV_NUM(pContext)));
-+ return DSL_ERR_POINTER;
-+ }
-+ /*else sleep for 1 sec and check again*/
-+ msleep(1000);
- }
-
- if (DSL_DRV_PM_CONTEXT(pContext)->bPmLock)
diff --git a/dsl-cpe-api-vrx/patches/4.20.1.2-pd2_UGW_SW-29182_UGW_SW-32158_DSL_IFXOS_Thread_Crash.patch b/dsl-cpe-api-vrx/patches/4.20.1.2-pd2_UGW_SW-29182_UGW_SW-32158_DSL_IFXOS_Thread_Crash.patch
deleted file mode 100644
index 0879abb2b8bee6bc68a25cb27c898b16b90d2b4e..0000000000000000000000000000000000000000
--- a/dsl-cpe-api-vrx/patches/4.20.1.2-pd2_UGW_SW-29182_UGW_SW-32158_DSL_IFXOS_Thread_Crash.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur org/configure.in new/configure.in
---- org/configure.in
-+++ new/configure.in
-@@ -1,7 +1,7 @@
-
- AC_REVISION($Revision: 1.177 $)
-
--AC_INIT([DSL CPE API driver],[4.20.1.2-pd1],[],[drv_dsl_cpe_api])
-+AC_INIT([DSL CPE API driver],[4.20.1.2-pd2],[],[drv_dsl_cpe_api])
-
- AC_CONFIG_SRCDIR(src/Makefile.am)
- AM_INIT_AUTOMAKE
---- org/src/pm/drv_dsl_cpe_api_pm.c 2018-08-16 22:45:01.000000000 +0530
-+++ new/src/pm/drv_dsl_cpe_api_pm.c 2018-10-25 14:54:29.346325705 +0530
-@@ -19,6 +19,8 @@
-
- #undef DSL_DBG_BLOCK
- #define DSL_DBG_BLOCK DSL_DBG_PM
-+#include <linux/delay.h>
-+#define DSL_PM_THREAD_COUNT 50
-
- /** \addtogroup DRV_DSL_CPE_PM
- @{ */
-@@ -160,7 +162,7 @@
- #if defined(INCLUDE_DSL_CPE_PM_OPTIONAL_PARAMETERS) && defined (INCLUDE_DSL_CPE_PM_RETX_THRESHOLDS)
- DSL_XTUDir_t dir;
- #endif
--
-+ unsigned int count = DSL_PM_THREAD_COUNT;
- DSL_CHECK_CTX_POINTER(pContext);
- DSL_CHECK_ERR_CODE();
-
-@@ -556,18 +558,32 @@
- DSL_DRV_CRLF, DSL_DEV_NUM(pContext), nErrCode));
- }
-
-- /* Check the PM module Near-End and Far-End thread active flag */
-- if( DSL_DRV_PM_CONTEXT(pContext)->pmThreadFe.bRun == DSL_FALSE &&
-- DSL_DRV_PM_CONTEXT(pContext)->pmThreadNe.bRun == DSL_FALSE )
-- {
-- DSL_DEBUG(DSL_DBG_ERR,
-- (pContext, SYS_DBG_ERR"DSL[%02d]: ERROR - PM module NE and FE threads start failed!"
-- DSL_DRV_CRLF, DSL_DEV_NUM(pContext)));
-
-- DSL_DRV_MemFree(DSL_DRV_PM_CONTEXT(pContext)->pCounters);
-- DSL_DRV_MemFree(DSL_DRV_PM_CONTEXT(pContext)->pCountersDump);
-- DSL_DRV_MemFree(pContext->PM);
-- }
-+ /* Check the PM module Near-End and Far-End thread active flag */
-+ while(count > 0) {
-+ count --;
-+ msleep (100);
-+ if( DSL_DRV_PM_CONTEXT(pContext)->pmThreadFe.bRun == DSL_TRUE &&
-+ DSL_DRV_PM_CONTEXT(pContext)->pmThreadNe.bRun == DSL_TRUE )
-+ {
-+ DSL_DEBUG(DSL_DBG_MSG,
-+ (pContext, SYS_DBG_MSG"DSL[%02d]: PM module NE and FE threads start success!"
-+ DSL_DRV_CRLF, DSL_DEV_NUM(pContext)));
-+ break;
-+
-+ }
-+ } //end of while
-+
-+ if( count == 0 )
-+ {
-+ DSL_DEBUG(DSL_DBG_ERR,
-+ (pContext, SYS_DBG_ERR"DSL[%02d]: ERROR - PM module NE and FE threads start failed!"
-+ DSL_DRV_CRLF, DSL_DEV_NUM(pContext)));
-+
-+ DSL_DRV_MemFree(DSL_DRV_PM_CONTEXT(pContext)->pCounters);
-+ DSL_DRV_MemFree(DSL_DRV_PM_CONTEXT(pContext)->pCountersDump);
-+ DSL_DRV_MemFree(pContext->PM);
-+ }
-
- DSL_DEBUG(DSL_DBG_MSG,
- (pContext, SYS_DBG_MSG"DSL[%02d]: PM module started..." DSL_DRV_CRLF,
diff --git a/dsl-cpe-api-vrx/patches/4.20.1.2-pd3_UGW_SW-31095_RCU_CPU_stall.patch b/dsl-cpe-api-vrx/patches/4.20.1.2-pd3_UGW_SW-31095_RCU_CPU_stall.patch
deleted file mode 100644
index 7cb2c945f3a51e7b2f5983ec7c6b37ea7dc7f09f..0000000000000000000000000000000000000000
--- a/dsl-cpe-api-vrx/patches/4.20.1.2-pd3_UGW_SW-31095_RCU_CPU_stall.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur org/configure.in new/configure.in
---- org/configure.in
-+++ new/configure.in
-@@ -1,7 +1,7 @@
-
- AC_REVISION($Revision: 1.177 $)
-
--AC_INIT([DSL CPE API driver],[4.20.1.2-pd2],[],[drv_dsl_cpe_api])
-+AC_INIT([DSL CPE API driver],[4.20.1.2-pd3],[],[drv_dsl_cpe_api])
-
- AC_CONFIG_SRCDIR(src/Makefile.am)
- AM_INIT_AUTOMAKE
-diff -Naur org/src/include/drv_dsl_cpe_autoboot.h new/src/include/drv_dsl_cpe_autoboot.h
---- org/src/include/drv_dsl_cpe_autoboot.h
-+++ new/src/include/drv_dsl_cpe_autoboot.h
-@@ -164,15 +164,15 @@ DSL_Error_t DSL_DRV_AutobootHandleDeviceEvt(
- #define DSL_AUTOBOOT_TRAINING_POLL_TIME 1000
- #define DSL_AUTOBOOT_INIT_POLL_TIME 100
- #define DSL_AUTOBOOT_SHOWTIME_POLL_TIME 1000
--#define DSL_AUTOBOOT_EXCEPTION_POLL_TIME 0
-+#define DSL_AUTOBOOT_EXCEPTION_POLL_TIME 10
- #define DSL_AUTOBOOT_DIAGNOSTIC_POLL_TIME 1000
--#define DSL_AUTOBOOT_FW_REQUEST_POLL_TIME 0
-+#define DSL_AUTOBOOT_FW_REQUEST_POLL_TIME 10
- #define DSL_AUTOBOOT_FW_WAIT_POLL_TIME 100
- #define DSL_AUTOBOOT_LINK_ACTIVATE_WAIT_POLL_TIME 100
- #define DSL_AUTOBOOT_CONFIG_WRITE_WAIT_POLL_TIME 100
- #define DSL_AUTOBOOT_RESTART_WAIT_POLL_TIME 100
- #define DSL_AUTOBOOT_FW_READY_POLL_TIME 100
--#define DSL_AUTOBOOT_RESTART_POLL_TIME 0
-+#define DSL_AUTOBOOT_RESTART_POLL_TIME 100
- #define DSL_AUTOBOOT_ORDERLY_SHUTDOWN_POLL_TIME 250
- #define DSL_AUTOBOOT_DISABLE_POLL_TIME 100
-
diff --git a/dsl-cpe-control-vrx/Makefile b/dsl-cpe-control-vrx/Makefile
index a04cf0421c5f62ab64dd58e191f2a395b6e21345..fd936ab1bfae6e3640577bb0bc712a4f3a2704a5 100644
--- a/dsl-cpe-control-vrx/Makefile
+++ b/dsl-cpe-control-vrx/Makefile
@@ -10,16 +10,16 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=dsl-cpe-control-vrx
-PKG_VERSION:=4.20.1.2
+PKG_VERSION:=4.20.1.2.0
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=114b68c50f0e2b52af61fdf0ea2de29e55b64495
+PKG_SOURCE_VERSION:=5e45d5fbfa5dd2a93a888b53ae811cafa59dab4b
#PKG_MD5SUM:=85d293ee43f01ba367301a7fe7c46156
PKG_RELEASE:=1
PKG_BASE_NAME:=dsl_cpe_control_vrx
PKG_SOURCE:=$(PKG_BASE_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
#PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/dsl_cpe_control-$(PKG_VERSION)
#PKG_SOURCE_URL:=http://localhost
-PKG_SOURCE_URL:=https://dev.iopsys.eu/intel/$(PKG_BASE_NAME).git
+PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/$(PKG_BASE_NAME).git
DSL_BIN_DIR=$(VENDOR_PATH)/bin
DSL_INITD_DIR=$(VENDOR_PATH)/etc/init.d
diff --git a/dsl-cpe-fapi/Makefile b/dsl-cpe-fapi/Makefile
index 37f12d70d98283e9eabeffc1ca7f9419e640661f..2027727861fb4a8083e01a91f60e3e10d8012abe 100644
--- a/dsl-cpe-fapi/Makefile
+++ b/dsl-cpe-fapi/Makefile
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=dsl-cpe-fapi
-PKG_VERSION:=0.6.1
+PKG_VERSION:=0.6.1.1.0
#PKG_MD5SUM:=4d24f6163e6c2ba53222872bf7019198
PKG_BASE_NAME:=$(PKG_NAME)
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a90129a36bec27b13530cdc126ef955eb8d39a7b
+PKG_SOURCE_VERSION:=b45304c732b42609cbaa5ed0add202bbf211b3ae
PKG_SOURCE:=$(PKG_BASE_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BASE_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=https://dev.iopsys.eu/intel/$(PKG_NAME).git
diff --git a/dsl-cpe-mei-vrx/Makefile b/dsl-cpe-mei-vrx/Makefile
index 95ef06e989c78d9a15dbf7400f8d60923b726c9b..ff716bb6daf8c339b6f34d2ba3a25c092c61b67a 100644
--- a/dsl-cpe-mei-vrx/Makefile
+++ b/dsl-cpe-mei-vrx/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=dsl-cpe-mei-vrx
-PKG_VERSION:=1.8.1.1
+PKG_VERSION:=1.8.1.1.0
#PKG_MD5SUM:=37caf38002b82bf92d8e62659254197a
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6b6c877a44fd4dee6aea25857d0821e13fb41160
+PKG_SOURCE_VERSION:=dde1a3f205f84160109e99a6eeed957da5bc6e55
# re-define PATCH_DIR to get version-specific patches
PATCH_DIR:=./patches-$(PKG_VERSION)
diff --git a/dsl-cpe-mei-vrx/files/dsl_dbg.cfg b/dsl-cpe-mei-vrx/files/dsl_dbg.cfg
index 50edbc2e7e821bef98d243cdd8810079e8ad4ab2..d71d5d736c9ac648f28200a2019096b73bef79f7 100644
--- a/dsl-cpe-mei-vrx/files/dsl_dbg.cfg
+++ b/dsl-cpe-mei-vrx/files/dsl_dbg.cfg
@@ -337,9 +337,9 @@ xDSL_Cfg_EntitiesEnabledSelect="1"
# Test and debug configuration to switch back to FW message polling mode (by
# default the line state is not polled anymore during link activation)
# xDSL_Dbg_FwMsgPollingOnly
-# "0": Use autonomous FW message handling (instead of polling) - DEFAULT
-# "1": Switch back to polling mode only
-xDSL_Dbg_FwMsgPollingOnly="0"
+# "0": Use autonomous FW message handling (instead of polling)
+# "1": Use polling mode only - DEFAULT
+xDSL_Dbg_FwMsgPollingOnly="1"
# Test and debug configuration to load a DSL Firmware on each system start
# from a defined server.
diff --git a/dsl-cpe-mei-vrx/files/dsl_rel.cfg b/dsl-cpe-mei-vrx/files/dsl_rel.cfg
index ab5808d0268903a18872b791bc07adcbbb82a5aa..e92960fc16a555c2d4af0f7cf81df38c2ecde990 100644
--- a/dsl-cpe-mei-vrx/files/dsl_rel.cfg
+++ b/dsl-cpe-mei-vrx/files/dsl_rel.cfg
@@ -337,9 +337,9 @@ xDSL_Cfg_EntitiesEnabledSelect="1"
# Test and debug configuration to switch back to FW message polling mode (by
# default the line state is not polled anymore during link activation)
# xDSL_Dbg_FwMsgPollingOnly
-# "0": Use autonomous FW message handling (instead of polling) - DEFAULT
-# "1": Switch back to polling mode only
-xDSL_Dbg_FwMsgPollingOnly="0"
+# "0": Use autonomous FW message handling (instead of polling)
+# "1": Use polling mode only - DEFAULT
+xDSL_Dbg_FwMsgPollingOnly="1"
# Test and debug configuration to load a DSL Firmware on each system start
# from a defined server.
diff --git a/fapi_system/Makefile b/fapi_system/Makefile
index d4d60ff7de6421cd28fd4b4b65c5a9147cf6452c..25608411821aa9f7be30bd3bd8ef798e5d52187c 100755
--- a/fapi_system/Makefile
+++ b/fapi_system/Makefile
@@ -146,7 +146,7 @@ ifeq ($(CONFIG_PACKAGE_kmod-gphy_event),y)
TARGET_CFLAGS +=-DENABLE_LAN_PORT_LINK_EVENT
endif
-ifeq ($(CONFIG_PACKAGE_kmod-vrx518-dp-mod),y)
+ifeq ($(CONFIG_PACKAGE_kmod-vrx518_tc_drv),y)
TARGET_CFLAGS += -DCONFIG_VRX518_SUPPORT
endif