diff --git a/configure.ac b/configure.ac
index df5cd92a1..033637827 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ AC_OUTPUT([
 	topology/common/Makefile
 	topology/platform/Makefile
 	topology/platform/intel/Makefile
+	topology/platform/common/Makefile
 	topology/m4/Makefile
 	topology/sof/Makefile
 	topology/test/Makefile
diff --git a/topology/Makefile.am b/topology/Makefile.am
index 25410b0f2..b59c6f588 100644
--- a/topology/Makefile.am
+++ b/topology/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS = test m4 sof common platform
 
 DEPS = \
 	platform/intel/*.m4 \
+	platform/common/*.m4 \
 	common/*.m4 \
 	m4/*.m4 \
 	sof/*.m4
@@ -34,7 +35,7 @@ MACHINES = \
 .PRECIOUS: %.conf
 
 %.conf : %.m4 ${DEPS}
-	m4 -I m4 -I common $< > $@
+	m4 -I m4 -I common -I platform/common $< > $@
 
 %.tplg : %.conf
 	alsatplg -v 1 -c $< -o $@
diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4
index 882d958e8..5fc1dedde 100644
--- a/topology/m4/dai.m4
+++ b/topology/m4/dai.m4
@@ -121,47 +121,6 @@ define(`D_DAI', `SectionDAI."'N_DAI`" {'
 `	capture "'$3`"'
 `}')
 
-dnl DAI_CLOCK(clock, freq, codec_master)
-define(`DAI_CLOCK',
-	$1		STR($3)
-	$1_freq	STR($2))
-
-
-dnl DAI_TDM(slots, width, tx_mask, rx_mask)
-define(`DAI_TDM',
-`tdm_slots	'STR($1)
-`	tdm_slot_width	'STR($2)
-`	tx_slots	'STR($3)
-`	rx_slots	'STR($4)
-)
-dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data)
-define(`SSP_CONFIG',
-`	format		"'$1`"'
-`	'$2
-`	'$3
-`	'$4
-`	'$5
-`}'
-$6
-)
-
-dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id)
-dnl mclk_id is optional
-define(`SSP_CONFIG_DATA',
-`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {'
-`	tokens "sof_ssp_tokens"'
-`	tuples."word" {'
-`		SOF_TKN_INTEL_SSP_SAMPLE_BITS'	STR($3)
-`	}'
-`	tuples."short" {'
-`		SOF_TKN_INTEL_SSP_MCLK_ID'	ifelse($4, `', "0", STR($4))
-`	}'
-`}'
-`SectionData."'N_DAI_CONFIG($1$2)`_data" {'
-`	tuples "'N_DAI_CONFIG($1$2)`_tuples"'
-`}'
-)
-
 dnl PDM_TUPLES(pdm ctrl id, mic_a_enable, mic_b_enable, polarity_a, polarity_b,
 dnl	       clk_egde, skew)
 define(`PDM_TUPLES',
diff --git a/topology/platform/Makefile.am b/topology/platform/Makefile.am
index c6966a9b6..011ff9e93 100644
--- a/topology/platform/Makefile.am
+++ b/topology/platform/Makefile.am
@@ -1 +1 @@
-SUBDIRS = intel
+SUBDIRS = intel common
diff --git a/topology/platform/common/Makefile.am b/topology/platform/common/Makefile.am
new file mode 100644
index 000000000..a8576d588
--- /dev/null
+++ b/topology/platform/common/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+	ssp.m4
diff --git a/topology/platform/common/ssp.m4 b/topology/platform/common/ssp.m4
new file mode 100644
index 000000000..f3c78626c
--- /dev/null
+++ b/topology/platform/common/ssp.m4
@@ -0,0 +1,46 @@
+divert(-1)
+
+dnl SSP related macros
+
+dnl SSP_CLOCK(clock, freq, codec_master)
+define(`SSP_CLOCK',
+	$1		STR($3)
+	$1_freq	STR($2))
+
+
+dnl SSP_TDM(slots, width, tx_mask, rx_mask)
+define(`SSP_TDM',
+`tdm_slots	'STR($1)
+`	tdm_slot_width	'STR($2)
+`	tx_slots	'STR($3)
+`	rx_slots	'STR($4)
+)
+dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data)
+define(`SSP_CONFIG',
+`	format		"'$1`"'
+`	'$2
+`	'$3
+`	'$4
+`	'$5
+`}'
+$6
+)
+
+dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id)
+dnl mclk_id is optional
+define(`SSP_CONFIG_DATA',
+`SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {'
+`	tokens "sof_ssp_tokens"'
+`	tuples."word" {'
+`		SOF_TKN_INTEL_SSP_SAMPLE_BITS'	STR($3)
+`	}'
+`	tuples."short" {'
+`		SOF_TKN_INTEL_SSP_MCLK_ID'	ifelse($4, `', "0", STR($4))
+`	}'
+`}'
+`SectionData."'N_DAI_CONFIG($1$2)`_data" {'
+`	tuples "'N_DAI_CONFIG($1$2)`_tuples"'
+`}'
+)
+
+divert(0)dnl
diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4
index 847bfb40b..07a1c5b2c 100644
--- a/topology/sof-apl-nocodec.m4
+++ b/topology/sof-apl-nocodec.m4
@@ -6,6 +6,7 @@
 include(`pipeline.m4')
 include(`utils.m4')
 include(`dai.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 2, 0, NoCodec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 2, 24)))
diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4
index 9110ffaa4..a37e5216a 100644
--- a/topology/sof-apl-tdf8532.m4
+++ b/topology/sof-apl-tdf8532.m4
@@ -6,6 +6,7 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`pipeline.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -179,45 +180,45 @@ PCM_DUPLEX_ADD(Port5, 5, 5, 5, PIPELINE_PCM_9, PIPELINE_PCM_10)
 #
 
 DAI_CONFIG(SSP, 4, 4, SSP4-Codec,
-	   SSP_CONFIG(DSP_B, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 12288000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(8, 32, 15, 15),
+	   SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 12288000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(8, 32, 15, 15),
 		      SSP_CONFIG_DATA(SSP, 4, 32)))
 
 DAI_CONFIG(SSP, 2, 2, SSP2-Codec,
-	   SSP_CONFIG(DSP_B, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 12288000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 32, 255, 255),
+	   SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 12288000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 32, 255, 255),
 		      SSP_CONFIG_DATA(SSP, 2, 32)))
 
 DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 1536000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 16, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 1536000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 16, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 0, 16)))
 
 DAI_CONFIG(SSP, 1, 1, SSP1-Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 1536000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 16, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 1536000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 16, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 1, 16)))
 
 DAI_CONFIG(SSP, 3, 3, SSP3-Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 1536000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 16, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 1536000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 16, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 3, 16)))
 
 DAI_CONFIG(SSP, 5, 5, SSP5-Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 1536000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 16, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24576000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 1536000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 16, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 5, 16)))
 
 
diff --git a/topology/sof-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4
index 461cb6ab4..f8294d202 100644
--- a/topology/sof-bdw-rt286.m4
+++ b/topology/sof-bdw-rt286.m4
@@ -6,6 +6,7 @@
 include(`pipeline.m4')
 include(`utils.m4')
 include(`dai.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 0, 0, Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24000000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 0, 24)))
diff --git a/topology/sof-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4
index e811a130f..3c72d3008 100644
--- a/topology/sof-bdw-rt5640.m4
+++ b/topology/sof-bdw-rt5640.m4
@@ -6,6 +6,7 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`pipeline.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 0, 0, Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24000000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 0, 24)))
diff --git a/topology/sof-byt-da7213.m4 b/topology/sof-byt-da7213.m4
index c36ed67c2..af5129c8d 100644
--- a/topology/sof-byt-da7213.m4
+++ b/topology/sof-byt-da7213.m4
@@ -6,6 +6,7 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`pipeline.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 2, 0, SSP2-Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 2, 24)))
diff --git a/topology/sof-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4
index 2bde71a72..aed2b977a 100644
--- a/topology/sof-byt-nocodec.m4
+++ b/topology/sof-byt-nocodec.m4
@@ -6,6 +6,7 @@
 include(`pipeline.m4')
 include(`utils.m4')
 include(`dai.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 2, 0, NoCodec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 2, 24)))
diff --git a/topology/sof-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4
index a64d5c3a5..41074914d 100644
--- a/topology/sof-byt-rt5640.m4
+++ b/topology/sof-byt-rt5640.m4
@@ -6,6 +6,7 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`pipeline.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 2, 0, SSP2-Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 2, 24)))
diff --git a/topology/sof-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4
index 57e395969..028cb45d6 100644
--- a/topology/sof-byt-rt5645.m4
+++ b/topology/sof-byt-rt5645.m4
@@ -6,6 +6,7 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`pipeline.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 2, 0, SSP2-Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 2, 24)))
diff --git a/topology/sof-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4
index c5bd97418..d2cdfad5e 100644
--- a/topology/sof-byt-rt5651.m4
+++ b/topology/sof-byt-rt5651.m4
@@ -6,6 +6,7 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`pipeline.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 2, 0, SSP2-Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 2, 24)))
diff --git a/topology/sof-cht-max98090.m4 b/topology/sof-cht-max98090.m4
index 96ac5a5d8..38244d76f 100644
--- a/topology/sof-cht-max98090.m4
+++ b/topology/sof-cht-max98090.m4
@@ -6,6 +6,7 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`pipeline.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 2, 0, SSP2-Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 1920000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 20, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 1920000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 20, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 2, 16)))
diff --git a/topology/sof-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4
index f1c6694fb..466f56d0c 100644
--- a/topology/sof-cht-nocodec.m4
+++ b/topology/sof-cht-nocodec.m4
@@ -6,6 +6,7 @@
 include(`pipeline.m4')
 include(`utils.m4')
 include(`dai.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 2, 0, NoCodec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 19200000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 2, 24)))
diff --git a/topology/sof-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4
index 5a55c8a32..e416ce3f6 100644
--- a/topology/sof-cnl-rt274.m4
+++ b/topology/sof-cnl-rt274.m4
@@ -6,6 +6,7 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`pipeline.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -63,10 +64,10 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 0, 0, SSP0-Codec,
-	   SSP_CONFIG(DSP_B, DAI_CLOCK(mclk, 24000000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 4800000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(4, 25, 3, 3),
+	   SSP_CONFIG(DSP_B, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 4800000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(4, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 0, 24)))
 
 VIRTUAL_DAPM_ROUTE_OUT(codec0_out, SSP, 0, OUT, 0)
diff --git a/topology/sof-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4
index 92722869a..9bf8976df 100644
--- a/topology/sof-hsw-rt5640.m4
+++ b/topology/sof-hsw-rt5640.m4
@@ -6,6 +6,7 @@
 include(`utils.m4')
 include(`dai.m4')
 include(`pipeline.m4')
+include(`ssp.m4')
 
 # Include TLV library
 include(`common/tlv.m4')
@@ -91,8 +92,8 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 # BE configurations - overrides config in ACPI if present
 #
 DAI_CONFIG(SSP, 0, 0, Codec,
-	   SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24000000, codec_mclk_in),
-		      DAI_CLOCK(bclk, 2400000, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, 25, 3, 3),
+	   SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
+		      SSP_CLOCK(bclk, 2400000, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, 25, 3, 3),
 		      SSP_CONFIG_DATA(SSP, 0, 24)))
diff --git a/topology/test/test-all.m4 b/topology/test/test-all.m4
index 709e861bf..174f7d260 100644
--- a/topology/test/test-all.m4
+++ b/topology/test/test-all.m4
@@ -4,6 +4,7 @@
 
 # Include topology builder
 include(`dai.m4')
+include(`ssp.m4')
 include(`utils.m4')
 include(`pipeline.m4')
 
@@ -86,9 +87,9 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
 #
 DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
 	   SSP_CONFIG(TEST_SSP_MODE,
-		      DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
-		      DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
+		      SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
+		      SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
 		      SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
 				      TEST_SSP_DATA_BITS)))
diff --git a/topology/test/test-capture.m4 b/topology/test/test-capture.m4
index b9aa29bb3..128717b86 100644
--- a/topology/test/test-capture.m4
+++ b/topology/test/test-capture.m4
@@ -4,6 +4,7 @@
 
 # Include topology builder
 include(`dai.m4')
+include(`ssp.m4')
 include(`utils.m4')
 include(`pipeline.m4')
 
@@ -70,10 +71,10 @@ PCM_CAPTURE_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_2)
 DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
 	   ifelse(TEST_DAI_TYPE, `SSP',
 		  SSP_CONFIG(TEST_SSP_MODE,
-			     DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
-			     DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
-			     DAI_CLOCK(fsync, 48000, codec_slave),
-			     DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
+			     SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
+			     SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
+			     SSP_CLOCK(fsync, 48000, codec_slave),
+			     SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
 			     SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
 					     TEST_SSP_DATA_BITS)),
 		  TEST_DAI_TYPE, `DMIC',
diff --git a/topology/test/test-playback.m4 b/topology/test/test-playback.m4
index 10a9eb6d2..789c8bb6e 100644
--- a/topology/test/test-playback.m4
+++ b/topology/test/test-playback.m4
@@ -5,6 +5,7 @@
 # Include topology builder
 include(`pipeline.m4')
 include(`dai.m4')
+include(`ssp.m4')
 include(`utils.m4')
 
 # Include TLV library
@@ -69,9 +70,9 @@ PCM_PLAYBACK_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1)
 #
 DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
 	   SSP_CONFIG(TEST_SSP_MODE,
-		      DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_slave),
-		      DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
+		      SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_slave),
+		      SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
 		      SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
 				      TEST_SSP_DATA_BITS)))
diff --git a/topology/test/test-tone-playback.m4 b/topology/test/test-tone-playback.m4
index e16a525cf..e74ae4ac5 100644
--- a/topology/test/test-tone-playback.m4
+++ b/topology/test/test-tone-playback.m4
@@ -5,6 +5,7 @@
 # Include topology builder
 include(`pipeline.m4')
 include(`dai.m4')
+include(`ssp.m4')
 include(`utils.m4')
 
 # Include TLV library
@@ -58,9 +59,9 @@ DAI_ADD(sof/pipe-dai-playback.m4,
 #
 DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
 	   SSP_CONFIG(TEST_SSP_MODE,
-		      DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
-		      DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
-		      DAI_CLOCK(fsync, 48000, codec_slave),
-		      DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
+		      SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
+		      SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
+		      SSP_CLOCK(fsync, 48000, codec_slave),
+		      SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
 		      SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
 				      TEST_SSP_DATA_BITS)))
diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh
index 89cd51561..ec750934d 100755
--- a/topology/test/tplg-build.sh
+++ b/topology/test/tplg-build.sh
@@ -8,7 +8,7 @@
 set -e
 
 # M4 preprocessor flags
-export M4PATH="../:../m4:../common:../platform/intel"
+export M4PATH="../:../m4:../common:../platform/intel:../platform/common"
 
 # Simple component test cases
 # can be used on components with 1 sink and 1 source.