glk: fix sof-glk-rt5682 ssp bclk and virtual widgets

fix ssp bclk and virtual widgets in sof-glk-rt5682

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

topology/sof-glk-rt5682.m4

@@ -1,5 +1,8 @@
 #
-# Topology for AppoloLake with headset on SSP2, spk on SSP1 and DMIC capture
+# Topology for Geminilake with rt5682 headset on SSP2, max98357a spk on SSP1
+#
+# Modified from:
+# Geminilake topology for codecs da7219 headset on SSP2, max98357a spk on SSP1
 #
 
 # Include topology builder
@@ -24,7 +27,7 @@ include(`platform/intel/dmic.m4')
 #
 # PCM0  ----> volume (pipe 1)   -----> SSP1 (speaker - maxim98357a, BE link 0)
 # PCM1  <---> volume (pipe 2,3) <----> SSP2 (headset - rt5682, BE link 1)
-# PCM99 <---- volume (pipe 4)   <----- DMIC0 (dmic capture, BE link 2)
+# PCM99 <---- DMIC0 (dmic capture, BE link 2)
 # PCM5  ----> volume (pipe 5)   -----> iDisp1 (HDMI/DP playback, BE link 3)
 # PCM6  ----> Volume (pipe 6)   -----> iDisp2 (HDMI/DP playback, BE link 4)
 # PCM7  ----> volume (pipe 7)   -----> iDisp3 (HDMI/DP playback, BE link 5)
@@ -48,7 +51,7 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
 	3, 1, 2, s32le,
 	48, 1000, 0, 0)
 
-# Low Latency capture pipeline 4 on PCM 99 using max 4 channels of s32le.
+# Low Latency capture pipeline 4 on PCM 99 using max 4 channels of s16le.
 # Schedule 48 frames per 1000us deadline on core 0 with priority 0
 #PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
 PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
@@ -148,10 +151,10 @@ DAI_CONFIG(SSP, 1, 0, SSP1-Codec,
 		SSP_TDM(2, 16, 3, 3),
 		SSP_CONFIG_DATA(SSP, 1, 16, 1)))
 
-#SSP 2 (ID: 1) with 19.2 MHz mclk with MCLK_ID 1, 1.92 MHz bclk
+#SSP 2 (ID: 1) with 19.2 MHz mclk with MCLK_ID 1, 2.4 MHz bclk
 DAI_CONFIG(SSP, 2, 1, SSP2-Codec,
 	SSP_CONFIG(I2S, SSP_CLOCK(mclk, 19200000, codec_mclk_in),
-		SSP_CLOCK(bclk, 24576000, codec_slave),
+		SSP_CLOCK(bclk, 2400000, codec_slave),
 		SSP_CLOCK(fsync, 48000, codec_slave),
 		SSP_TDM(2, 20, 3, 3),
 		SSP_CONFIG_DATA(SSP, 2, 16, 1)))
@@ -160,36 +163,28 @@ DAI_CONFIG(SSP, 2, 1, SSP2-Codec,
 DAI_CONFIG(DMIC, 0, 2, dmic01,
 	DMIC_CONFIG(1, 500000, 4800000, 40, 60, 48000,
 		DMIC_WORD_LENGTH(s16le), DMIC, 0,
-		# FIXME: what is the right configuration
 		PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1)))
-		#PDM_CONFIG(DMIC, 0, STEREO_PDM0)))
 
 # 3 HDMI/DP outputs (ID: 3,4,5)
 HDA_DAI_CONFIG(3, 3, iDisp1)
 HDA_DAI_CONFIG(4, 4, iDisp2)
 HDA_DAI_CONFIG(5, 5, iDisp3)
 
-## remove warnings with SST hard-coded routes (FIXME)
+## remove warnings with SST hard-coded routes
-
-VIRTUAL_WIDGET(ssp5 Tx, 0)
-VIRTUAL_WIDGET(ssp1 Rx, 1)
-VIRTUAL_WIDGET(ssp1 Tx, 2)
-VIRTUAL_WIDGET(DMIC01 Rx, 3)
-VIRTUAL_WIDGET(DMic, 4)
-VIRTUAL_WIDGET(dmic01_hifi, 5)
-VIRTUAL_WIDGET(hif5-0 Output, 6)
-VIRTUAL_WIDGET(hif6-0 Output, 7)
-VIRTUAL_WIDGET(hif7-0 Output, 8)
-
-VIRTUAL_DAPM_ROUTE_OUT(codec0_out, SSP, 0, OUT, 12)
-VIRTUAL_DAPM_ROUTE_OUT(codec1_out, SSP, 0, OUT, 13)
-VIRTUAL_DAPM_ROUTE_OUT(ssp1 Tx, SSP, 0, OUT, 14)
-VIRTUAL_DAPM_ROUTE_IN(ssp1 Rx, SSP, 0, IN, 15)
-VIRTUAL_DAPM_ROUTE_OUT(Capture, SSP, 0, OUT, 16)
-VIRTUAL_DAPM_ROUTE_OUT(SoC DMIC, SSP, 0, OUT, 17)
-VIRTUAL_DAPM_ROUTE_IN(codec0_in, SSP, 0, IN, 18)
-
-
-
-
 
+VIRTUAL_WIDGET(ssp1 Tx, out_drv, 0)
+VIRTUAL_WIDGET(ssp2 Rx, out_drv, 1)
+VIRTUAL_WIDGET(ssp2 Tx, out_drv, 2)
+VIRTUAL_WIDGET(DMIC01 Rx, out_drv, 3)
+VIRTUAL_WIDGET(DMIC AIF, input, 15)
+VIRTUAL_WIDGET(DMic, out_drv, 4)
+VIRTUAL_WIDGET(dmic01_hifi, out_drv, 5)
+VIRTUAL_WIDGET(hif5-0 Output, out_drv, 6)
+VIRTUAL_WIDGET(hif6-0 Output, out_drv, 7)
+VIRTUAL_WIDGET(hif7-0 Output, out_drv, 8)
+VIRTUAL_WIDGET(iDisp3_out, out_drv, 9)
+VIRTUAL_WIDGET(iDisp2_out, out_drv, 10)
+VIRTUAL_WIDGET(iDisp1_out, out_drv, 11)
+VIRTUAL_WIDGET(codec0_out, output, 12)
+VIRTUAL_WIDGET(codec1_out, output, 13)
+VIRTUAL_WIDGET(codec0_in, input, 14)