MLK-17569-1: hdp: fix channel swapping issue for hdmi audio

There is channel swapping issue for 4 channel and 8 channel audio.
After dump the register, found that SMPL2PKT_CNFG is not set
correctly, the reason is that F_NUM_OF_I2S_PORTS should be
F_NUM_OF_I2S_PORTS_S.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Sandor Yu <sandor.yu@nxp.com>

diff --git a/drivers/mxc/hdp/API_Audio.c b/drivers/mxc/hdp/API_Audio.c
index a09facb..2bfa0fc 100644 (file)
--- a/drivers/mxc/hdp/API_Audio.c
+++ b/drivers/mxc/hdp/API_Audio.c
@@ -108,7 +108,7 @@ CDN_API_STATUS CDN_API_AudioConfigCore(state_struct *state,
                cdn_apb_write(state,
                              ADDR_SOURCE_AIF_SMPL2PCKT + (SMPL2PKT_CNFG << 2),
                              F_MAX_NUM_CH(numOfChannels - 1) |
-                             F_NUM_OF_I2S_PORTS((numOfChannels / 2) - 1) |
+                             F_NUM_OF_I2S_PORTS_S((numOfChannels / 2) - 1) |
                                  (1 << 8) | (lanesParam << 11));
 
                if (numOfChannels == 2)