ASoC: qdsp6: q6afe: Add Quinary MI2S ports

This patch adds support for the Quinary MI2S ports on LPASS.

Signed-off-by: Gabriel David <ultracoolguy@disroot.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210605022206.13226-3-ultracoolguy@disroot.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 729d27da04475e735ddf53d6ed68432657732f56..625724852a7fb9a478727849c134add3e08bb3c9 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -120,6 +120,8 @@
 #define AFE_PORT_ID_TERTIARY_MI2S_TX        0x1005
 #define AFE_PORT_ID_QUATERNARY_MI2S_RX      0x1006
 #define AFE_PORT_ID_QUATERNARY_MI2S_TX      0x1007
+#define AFE_PORT_ID_QUINARY_MI2S_RX        0x1016
+#define AFE_PORT_ID_QUINARY_MI2S_TX        0x1017
 
 /* Start of the range of port IDs for TDM devices. */
 #define AFE_PORT_ID_TDM_PORT_RANGE_START       0x9000
@@ -620,6 +622,10 @@ static struct afe_port_map port_maps[AFE_PORT_MAX] = {
                                QUATERNARY_MI2S_RX, 1, 1},
        [QUATERNARY_MI2S_TX] = { AFE_PORT_ID_QUATERNARY_MI2S_TX,
                                QUATERNARY_MI2S_TX, 0, 1},
+       [QUINARY_MI2S_RX]  =  { AFE_PORT_ID_QUINARY_MI2S_RX,
+                               QUINARY_MI2S_RX, 1, 1},
+       [QUINARY_MI2S_TX] =   { AFE_PORT_ID_QUINARY_MI2S_TX,
+                               QUINARY_MI2S_TX, 0, 1},
        [PRIMARY_TDM_RX_0] =  { AFE_PORT_ID_PRIMARY_TDM_RX,
                                PRIMARY_TDM_RX_0, 1, 1},
        [PRIMARY_TDM_TX_0] =  { AFE_PORT_ID_PRIMARY_TDM_TX,
@@ -1596,6 +1602,8 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
        case AFE_PORT_ID_TERTIARY_MI2S_TX:
        case AFE_PORT_ID_QUATERNARY_MI2S_RX:
        case AFE_PORT_ID_QUATERNARY_MI2S_TX:
+       case AFE_PORT_ID_QUINARY_MI2S_RX:
+       case AFE_PORT_ID_QUINARY_MI2S_TX:
                cfg_type = AFE_PARAM_ID_I2S_CONFIG;
                break;
        case AFE_PORT_ID_PRIMARY_TDM_RX ... AFE_PORT_ID_QUINARY_TDM_TX_7:

diff --git a/sound/soc/qcom/qdsp6/q6afe.h b/sound/soc/qcom/qdsp6/q6afe.h
index f9a1c04e38c27fd48b5205a84401cc1b9bc0dec7..30fd77e2f458ca24dc2983e618b3ed7daaa5af43 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6afe.h
+++ b/sound/soc/qcom/qdsp6/q6afe.h
@@ -5,7 +5,7 @@
 
 #include <dt-bindings/sound/qcom,q6afe.h>
 
-#define AFE_PORT_MAX           127
+#define AFE_PORT_MAX           129
 
 #define MSM_AFE_PORT_TYPE_RX 0
 #define MSM_AFE_PORT_TYPE_TX 1