diff --git a/tcl/target/ti/mspm0.cfg b/tcl/target/ti/mspm0.cfg
index 4e9b89c1f..89c7847e5 100644
--- a/tcl/target/ti/mspm0.cfg
+++ b/tcl/target/ti/mspm0.cfg
@@ -14,26 +14,17 @@ if { [info exists CHIPNAME] } {
 	set _CHIPNAME mspm0x
 }
 
-if { [info exists CPUTAPID] } {
-	set _DAP_TAPID $CPUTAPID
-} else {
-	set _DAP_TAPID 0x4ba00477
-}
-
+# Note, some targets use "CPUTAPID" variable for this purpose.
 if { [info exists DAP_SWD_ID] } {
 	set _DAP_SWD_ID $DAP_SWD_ID
 } else {
 	set _DAP_SWD_ID 0x2ba01477
 }
 
-source [find target/swj-dp.tcl]
-
-# MSPM0 only supports swd, so set it here and save a line for custom boards
+# MSPM0 only supports swd
 transport select swd
 
-set _DAP_ID $_DAP_SWD_ID
-
-swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_DAP_ID
+swd newdap $_CHIPNAME cpu -expected-id $_DAP_SWD_ID
 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu