ASoC: msm: qdsp6v2: amend AUXPCM DAI Driver device tree definition

By design, primary AUXPCM interface and secondary AUXPCM interface
can run concurrently and have different hardware configuration.
Current device tree definition limits primary and secondary AUXPCM
interfaces to share same hardware configuration. In addition, AUXPCM
is bi-direction audio interface. Hence, device tree definition should
not have to differentiate playback and capture DAI devices.
Amend current device tree definition and CPU DAI driver implementation
to allow concurrency and separate configuration. This change in terms
gets rid of global variables used by AUXPCM CPU DAI driver which is one
of long pending action items. Also, update machine drivers and device
tree files to reflect the new CPU DAI driver names and new device tree
structure.

Change-Id: Ifb5a2c8d594f98f07a58829801a43adb7b31ca90
CRs-fixed: 493140, 493741
Signed-off-by: Patrick Lai <plai@codeaurora.org>

10 files changed, 247 insertions, 375 deletions

diff --git a/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt b/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
index 4c6569ef6e51..c799ffb080d6 100644
--- a/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
+++ b/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
@@ -131,15 +131,9 @@ Required properties:
 
 * msm-auxpcm
 
-[First Level Nodes]
-
 Required properties:
 
- - compatible :                           "qcom,msm-auxpcm-resource"
-
- - qcom,msm-cpudai-auxpcm-clk:            clock for auxpcm. The first value is
-                                          for 8khz mode, the second is for
-                                          16khz
+ - compatible :                           "qcom,msm-auxpcm-dev"
 
  - qcom,msm-cpudai-auxpcm-mode:           mode information. The first value is
                                           for 8khz mode, the second is for
@@ -174,16 +168,10 @@ Required properties:
                                           first value is for 8khz mode, the
                                           second is for auxpcm
 
-[Second Level Nodes]
-
-Required Properties:
-
- - qcom,msm-auxpcm-dev-id:                This property specifies the device
-                                          port id.
-                                          For Rx device, the port id is 4106
-                                          and for Tx device, the port id is 4107
-
- - compatible:                            "qcom,msm-auxpcm-dev"
+ - qcom,msm-auxpcm-interface:             name of AUXPCM interface "primary"
+                                          indicates primary AUXPCM interface
+                                          "secondary" indicates secondary
+                                          AUXPCM interface
 
 * msm-pcm-hostless
 
@@ -378,37 +366,17 @@ Example:
 		};
 	};
 
-        qcom,msm-auxpcm {
-                compatible = "qcom,msm-auxpcm-resource";
-                qcom,msm-cpudai-auxpcm-clk = "pcm_clk";
-                qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
-                qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
-                qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
-                qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
-                qcom,msm-cpudai-auxpcm-slot = <1>, <1>;
-                qcom,msm-cpudai-auxpcm-data = <0>, <0>;
-                qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
-
-                qcom,msm-prim-auxpcm-rx {
-                        qcom,msm-auxpcm-dev-id = <4106>;
-                        compatible = "qcom,msm-auxpcm-dev";
-                };
-
-                qcom,msm-prim-auxpcm-tx {
-                        qcom,msm-auxpcm-dev-id = <4107>;
-                        compatible = "qcom,msm-auxpcm-dev";
-                };
-
-		qcom,msm-sec-auxpcm-rx {
-			qcom,msm-auxpcm-dev-id = <4108>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
-
-		qcom,msm-sec-auxpcm-tx {
-			qcom,msm-auxpcm-dev-id = <4109>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
-        };
+	qcom,msm-pri-auxpcm {
+		qcom,msm-cpudai-auxpcm-mode = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
+		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
+		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
+		qcom,msm-auxpcm-interface = "primary";
+		compatible = "qcom,msm-auxpcm-dev";
+	};
 
         qcom,msm-pcm-hostless {
                 compatible = "qcom,msm-pcm-hostless";
diff --git a/arch/arm/boot/dts/msm8226.dtsi b/arch/arm/boot/dts/msm8226.dtsi
index 907421f96df4..a81a3e2a6523 100644
--- a/arch/arm/boot/dts/msm8226.dtsi
+++ b/arch/arm/boot/dts/msm8226.dtsi
@@ -518,9 +518,8 @@
 		compatible = "qcom,msm-pcm-hostless";
 	};
 
-	qcom,msm-auxpcm {
-		compatible = "qcom,msm-auxpcm-resource";
-		qcom,msm-cpudai-auxpcm-clk = "pcm_clk";
+	qcom,msm-pri-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
 		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
 		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
 		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
@@ -528,16 +527,7 @@
 		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;
 		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
 		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
-
-		qcom,msm-prim-auxpcm-rx {
-			qcom,msm-auxpcm-dev-id = <4106>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
-
-		qcom,msm-prim-auxpcm-tx {
-			qcom,msm-auxpcm-dev-id = <4107>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
+		qcom,msm-auxpcm-interface = "primary";
 	};
 
 	qcom,wcnss-wlan@fb000000 {
diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index 61e0f0dbf168..c0362a65de59 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -1103,9 +1103,8 @@
 		};
 	};
 
-	qcom,msm-auxpcm {
-		compatible = "qcom,msm-auxpcm-resource";
-		qcom,msm-cpudai-auxpcm-clk = "pcm_clk";
+	qcom,msm-pri-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
 		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
 		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
 		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
@@ -1113,26 +1112,19 @@
 		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;
 		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
 		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
+		qcom,msm-auxpcm-interface = "primary";
+	};
 
-		qcom,msm-prim-auxpcm-rx {
-			qcom,msm-auxpcm-dev-id = <4106>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
-
-		qcom,msm-prim-auxpcm-tx {
-			qcom,msm-auxpcm-dev-id = <4107>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
-
-		qcom,msm-sec-auxpcm-rx {
-			qcom,msm-auxpcm-dev-id = <4108>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
-
-		qcom,msm-sec-auxpcm-tx {
-			qcom,msm-auxpcm-dev-id = <4109>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
+	qcom,msm-sec-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
+		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
+		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
+		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
+		qcom,msm-auxpcm-interface = "secondary";
 	};
 
 	qcom,msm-dai-mi2s {
diff --git a/arch/arm/boot/dts/msm9625.dtsi b/arch/arm/boot/dts/msm9625.dtsi
index 50bdfa282369..dfdc5c0c8478 100644
--- a/arch/arm/boot/dts/msm9625.dtsi
+++ b/arch/arm/boot/dts/msm9625.dtsi
@@ -749,9 +749,8 @@
 		compatible = "qcom,msm-stub-codec";
 	};
 
-	qcom,msm-auxpcm {
-		compatible = "qcom,msm-auxpcm-resource";
-		qcom,msm-cpudai-auxpcm-clk = "pcm_clk";
+	qcom,msm-pri-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
 		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
 		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
 		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
@@ -759,16 +758,7 @@
 		qcom,msm-cpudai-auxpcm-slot = <1>, <1>;
 		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
 		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
-
-		qcom,msm-auxpcm-rx {
-			qcom,msm-auxpcm-dev-id = <4106>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
-
-		qcom,msm-auxpcm-tx {
-			qcom,msm-auxpcm-dev-id = <4107>;
-			compatible = "qcom,msm-auxpcm-dev";
-		};
+		qcom,msm-auxpcm-interface = "primary";
 	};
 
 	qcom,msm-dai-mi2s {
diff --git a/include/sound/msm-dai-q6-v2.h b/include/sound/msm-dai-q6-v2.h
index c34a3972d833..e2f939986565 100644
--- a/include/sound/msm-dai-q6-v2.h
+++ b/include/sound/msm-dai-q6-v2.h
@@ -40,7 +40,6 @@ struct msm_dai_auxpcm_config {
 };
 
 struct msm_dai_auxpcm_pdata {
-	void *clk_cfg;
 	struct msm_dai_auxpcm_config mode_8k;
 	struct msm_dai_auxpcm_config mode_16k;
 };
diff --git a/sound/soc/msm/apq8074.c b/sound/soc/msm/apq8074.c
index 239b885e17c9..7a69ea47d684 100644
--- a/sound/soc/msm/apq8074.c
+++ b/sound/soc/msm/apq8074.c
@@ -1930,7 +1930,7 @@ static struct snd_soc_dai_link apq8074_common_dai_links[] = {
 	{
 		.name = LPASS_BE_AUXPCM_RX,
 		.stream_name = "AUX PCM Playback",
-		.cpu_dai_name = "msm-dai-q6.4106",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.1",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-rx",
@@ -1945,7 +1945,7 @@ static struct snd_soc_dai_link apq8074_common_dai_links[] = {
 	{
 		.name = LPASS_BE_AUXPCM_TX,
 		.stream_name = "AUX PCM Capture",
-		.cpu_dai_name = "msm-dai-q6.4107",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.1",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-tx",
diff --git a/sound/soc/msm/mdm9625.c b/sound/soc/msm/mdm9625.c
index c41cf33cdd79..7ca56cca9df2 100644
--- a/sound/soc/msm/mdm9625.c
+++ b/sound/soc/msm/mdm9625.c
@@ -928,7 +928,7 @@ static struct snd_soc_dai_link mdm9625_dai[] = {
 	{
 		.name = LPASS_BE_AUXPCM_RX,
 		.stream_name = "AUX PCM Playback",
-		.cpu_dai_name = "msm-dai-q6.4106",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.1",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-rx",
@@ -942,7 +942,7 @@ static struct snd_soc_dai_link mdm9625_dai[] = {
 	{
 		.name = LPASS_BE_AUXPCM_TX,
 		.stream_name = "AUX PCM Capture",
-		.cpu_dai_name = "msm-dai-q6.4107",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.1",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-tx",
diff --git a/sound/soc/msm/msm8226.c b/sound/soc/msm/msm8226.c
index 9dac02e531b1..7ea4aa6c7efb 100644
--- a/sound/soc/msm/msm8226.c
+++ b/sound/soc/msm/msm8226.c
@@ -1124,7 +1124,7 @@ static struct snd_soc_dai_link msm8226_dai[] = {
 	{
 		.name = LPASS_BE_AUXPCM_RX,
 		.stream_name = "AUX PCM Playback",
-		.cpu_dai_name = "msm-dai-q6.4106",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.1",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-rx",
@@ -1139,7 +1139,7 @@ static struct snd_soc_dai_link msm8226_dai[] = {
 	{
 		.name = LPASS_BE_AUXPCM_TX,
 		.stream_name = "AUX PCM Capture",
-		.cpu_dai_name = "msm-dai-q6.4107",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.1",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-tx",
diff --git a/sound/soc/msm/msm8974.c b/sound/soc/msm/msm8974.c
index eea629c2def0..5074410921c7 100644
--- a/sound/soc/msm/msm8974.c
+++ b/sound/soc/msm/msm8974.c
@@ -2229,7 +2229,7 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = {
 	{
 		.name = LPASS_BE_AUXPCM_RX,
 		.stream_name = "AUX PCM Playback",
-		.cpu_dai_name = "msm-dai-q6.4106",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.1",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-rx",
@@ -2244,7 +2244,7 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = {
 	{
 		.name = LPASS_BE_AUXPCM_TX,
 		.stream_name = "AUX PCM Capture",
-		.cpu_dai_name = "msm-dai-q6.4107",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.1",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-tx",
@@ -2258,7 +2258,7 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = {
 	{
 		.name = LPASS_BE_SEC_AUXPCM_RX,
 		.stream_name = "Sec AUX PCM Playback",
-		.cpu_dai_name = "msm-dai-q6.4108",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.2",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-rx",
@@ -2273,7 +2273,7 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = {
 	{
 		.name = LPASS_BE_SEC_AUXPCM_TX,
 		.stream_name = "Sec AUX PCM Capture",
-		.cpu_dai_name = "msm-dai-q6.4109",
+		.cpu_dai_name = "msm-dai-q6-auxpcm.2",
 		.platform_name = "msm-pcm-routing",
 		.codec_name = "msm-stub-codec.1",
 		.codec_dai_name = "msm-stub-tx",
diff --git a/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c b/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
index aab534d5fd65..62b7d03309b8 100644
--- a/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
@@ -28,6 +28,9 @@
 #include <sound/pcm_params.h>
 #include <mach/clk.h>
 
+#define MSM_DAI_PRI_AUXPCM_DT_DEV_ID 1
+#define MSM_DAI_SEC_AUXPCM_DT_DEV_ID 2
+
 static const struct afe_clk_cfg lpass_clk_cfg_default = {
 	AFE_API_VERSION_I2S_CONFIG,
 	Q6AFE_LPASS_OSR_CLK_2_P048_MHZ,
@@ -66,6 +69,15 @@ struct msm_dai_q6_mi2s_dai_data {
 	struct msm_dai_q6_mi2s_dai_config rx_dai;
 };
 
+struct msm_dai_q6_auxpcm_dai_data {
+	struct mutex rlock; /* auxpcm dev resource lock */
+	int rcnt; /* auxpcm dev resource usage count */
+	u16 rx_pid; /* AUXPCM RX AFE port ID */
+	u16 tx_pid; /* AUXPCM TX AFE port ID */
+	struct afe_clk_cfg clk_cfg; /* hold LPASS clock configuration */
+	struct msm_dai_q6_dai_data bdai_data; /* incoporate base DAI data */
+};
+
 /* MI2S format field for AFE_PORT_CMD_I2S_CONFIG command
  *  0: linear PCM
  *  1: non-linear PCM
@@ -83,27 +95,42 @@ static const struct soc_enum mi2s_config_enum[] = {
 	SOC_ENUM_SINGLE_EXT(4, mi2s_format),
 };
 
-static DEFINE_MUTEX(aux_pcm_mutex);
-static int aux_pcm_count;
-
 static int msm_dai_q6_auxpcm_hw_params(
 				struct snd_pcm_substream *substream,
 				struct snd_pcm_hw_params *params,
 				struct snd_soc_dai *dai)
 {
-	struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev);
+	struct msm_dai_q6_auxpcm_dai_data *aux_dai_data =
+			dev_get_drvdata(dai->dev);
+	struct msm_dai_q6_dai_data *dai_data = &aux_dai_data->bdai_data;
 	struct msm_dai_auxpcm_pdata *auxpcm_pdata =
 			(struct msm_dai_auxpcm_pdata *) dai->dev->platform_data;
+	int rc = 0;
 
-	if (params_channels(params) != 1) {
-		dev_err(dai->dev, "AUX PCM supports only mono stream\n");
+	if (params_channels(params) != 1 || (params_rate(params) != 8000 &&
+	    params_rate(params) != 16000)) {
+		dev_err(dai->dev, "%s: invalid param chan %d rate %d\n",
+			__func__, params_channels(params), params_rate(params));
 		return -EINVAL;
 	}
+
+	mutex_lock(&aux_dai_data->rlock);
+
+	if (aux_dai_data->rcnt) {
+		/* AUXPCM DAI in use */
+		if (dai_data->rate != params_rate(params)) {
+			dev_err(dai->dev, "%s: rate mismatch of running DAI\n",
+			__func__);
+			rc = -EINVAL;
+		}
+		mutex_unlock(&aux_dai_data->rlock);
+		return rc;
+	}
+
 	dai_data->channels = params_channels(params);
 	dai_data->rate = params_rate(params);
 
-	switch (dai_data->rate) {
-	case 8000:
+	if (dai_data->rate == 8000) {
 		dai_data->port_config.pcm.pcm_cfg_minor_version =
 				AFE_API_VERSION_PCM_CONFIG;
 		dai_data->port_config.pcm.aux_mode = auxpcm_pdata->mode_8k.mode;
@@ -119,8 +146,7 @@ static int msm_dai_q6_auxpcm_hw_params(
 		dai_data->port_config.pcm.bit_width = 16;
 		dai_data->port_config.pcm.slot_number_mapping[0] =
 					 auxpcm_pdata->mode_8k.slot;
-		break;
-	case 16000:
+	} else {
 		dai_data->port_config.pcm.pcm_cfg_minor_version =
 				AFE_API_VERSION_PCM_CONFIG;
 		dai_data->port_config.pcm.aux_mode =
@@ -138,12 +164,19 @@ static int msm_dai_q6_auxpcm_hw_params(
 		dai_data->port_config.pcm.bit_width = 16;
 		dai_data->port_config.pcm.slot_number_mapping[0] =
 					auxpcm_pdata->mode_16k.slot;
-		break;
-	default:
-		dev_err(dai->dev, "AUX PCM supports only 8kHz and 16kHz sampling rate\n");
-		return -EINVAL;
 	}
-	return 0;
+
+	dev_dbg(dai->dev, "%s: aux_mode %x sync_src %x frame_setting %x\n",
+		__func__, dai_data->port_config.pcm.aux_mode,
+		dai_data->port_config.pcm.sync_src,
+		dai_data->port_config.pcm.frame_setting);
+	dev_dbg(dai->dev, "%s: qtype %x dout %x num_map %x\n",
+		__func__, dai_data->port_config.pcm.quantype,
+		dai_data->port_config.pcm.ctrl_data_out_enable,
+		dai_data->port_config.pcm.slot_number_mapping[0]);
+
+	mutex_unlock(&aux_dai_data->rlock);
+	return rc;
 }
 
 static void msm_dai_q6_auxpcm_shutdown(struct snd_pcm_substream *substream,
@@ -152,109 +185,97 @@ static void msm_dai_q6_auxpcm_shutdown(struct snd_pcm_substream *substream,
 	int rc = 0;
 	struct afe_clk_cfg *lpass_pcm_src_clk = NULL;
 	struct afe_clk_cfg lpass_pcm_oe_clk;
-	struct msm_dai_auxpcm_pdata *auxpcm_pdata = NULL;
-	unsigned int rx_port = 0;
-	unsigned int tx_port = 0;
+	struct msm_dai_q6_auxpcm_dai_data *aux_dai_data =
+		dev_get_drvdata(dai->dev);
 
-	mutex_lock(&aux_pcm_mutex);
+	mutex_lock(&aux_dai_data->rlock);
 
-	if (aux_pcm_count == 0) {
+	if (aux_dai_data->rcnt == 0) {
 		dev_dbg(dai->dev, "%s(): dai->id %d aux_pcm_count is 0. Just return\n",
 				__func__, dai->id);
-		mutex_unlock(&aux_pcm_mutex);
+		mutex_unlock(&aux_dai_data->rlock);
 		return;
 	}
 
-	aux_pcm_count--;
+	aux_dai_data->rcnt--;
 
-	if (aux_pcm_count > 0) {
+	if (aux_dai_data->rcnt > 0) {
 		dev_dbg(dai->dev, "%s(): dai->id %d aux_pcm_count = %d\n",
-			__func__, dai->id, aux_pcm_count);
-		mutex_unlock(&aux_pcm_mutex);
+			__func__, dai->id, aux_dai_data->rcnt);
+		mutex_unlock(&aux_dai_data->rlock);
 		return;
-	} else if (aux_pcm_count < 0) {
+	} else if (aux_dai_data->rcnt < 0) {
 		dev_err(dai->dev, "%s(): ERROR: dai->id %d aux_pcm_count = %d < 0\n",
-			__func__, dai->id, aux_pcm_count);
-		aux_pcm_count = 0;
-		mutex_unlock(&aux_pcm_mutex);
+			__func__, dai->id, aux_dai_data->rcnt);
+		aux_dai_data->rcnt = 0;
+		mutex_unlock(&aux_dai_data->rlock);
 		return;
 	}
 
-	pr_debug("%s: dai->id = %d aux_pcm_count = %d\n", __func__,
-			dai->id, aux_pcm_count);
-
-	auxpcm_pdata = (struct msm_dai_auxpcm_pdata *)dai->dev->platform_data;
-	lpass_pcm_src_clk = (struct afe_clk_cfg *)auxpcm_pdata->clk_cfg;
+	dev_dbg(dai->dev, "%s: dai->id = %d aux_pcm_count = %d\n", __func__,
+		dai->id, aux_dai_data->rcnt);
 
-	if (dai->id == AFE_PORT_ID_PRIMARY_PCM_RX
-			|| dai->id == AFE_PORT_ID_PRIMARY_PCM_TX) {
-		rx_port = AFE_PORT_ID_PRIMARY_PCM_RX;
-		tx_port = AFE_PORT_ID_PRIMARY_PCM_TX;
-	} else if (dai->id == AFE_PORT_ID_SECONDARY_PCM_RX
-			|| dai->id == AFE_PORT_ID_SECONDARY_PCM_TX) {
-		rx_port = AFE_PORT_ID_SECONDARY_PCM_RX;
-		tx_port = AFE_PORT_ID_SECONDARY_PCM_TX;
-	}
+	lpass_pcm_src_clk = (struct afe_clk_cfg *) &aux_dai_data->clk_cfg;
 
-	rc = afe_close(rx_port); /* can block */
+	rc = afe_close(aux_dai_data->rx_pid); /* can block */
 	if (IS_ERR_VALUE(rc))
 		dev_err(dai->dev, "fail to close PCM_RX  AFE port\n");
 
-	rc = afe_close(tx_port);
+	rc = afe_close(aux_dai_data->tx_pid);
 	if (IS_ERR_VALUE(rc))
 		dev_err(dai->dev, "fail to close AUX PCM TX port\n");
 
 	lpass_pcm_src_clk->clk_val1 = 0;
-	afe_set_lpass_clock(tx_port, lpass_pcm_src_clk);
-	afe_set_lpass_clock(rx_port, lpass_pcm_src_clk);
+	afe_set_lpass_clock(aux_dai_data->rx_pid, lpass_pcm_src_clk);
+	afe_set_lpass_clock(aux_dai_data->tx_pid, lpass_pcm_src_clk);
 
 	memcpy(&lpass_pcm_oe_clk, &lpass_clk_cfg_default,
 			 sizeof(struct afe_clk_cfg));
 	lpass_pcm_oe_clk.clk_val1 = 0;
-	afe_set_lpass_clock(rx_port, &lpass_pcm_oe_clk);
+	afe_set_lpass_clock(aux_dai_data->rx_pid, &lpass_pcm_oe_clk);
 
-	mutex_unlock(&aux_pcm_mutex);
+	mutex_unlock(&aux_dai_data->rlock);
 }
 
 static int msm_dai_q6_auxpcm_prepare(struct snd_pcm_substream *substream,
 		struct snd_soc_dai *dai)
 {
-	struct msm_dai_q6_dai_data *dai_data = dev_get_drvdata(dai->dev);
+	struct msm_dai_q6_auxpcm_dai_data *aux_dai_data =
+		dev_get_drvdata(dai->dev);
+	struct msm_dai_q6_dai_data *dai_data = &aux_dai_data->bdai_data;
 	struct msm_dai_auxpcm_pdata *auxpcm_pdata = NULL;
 	int rc = 0;
 	unsigned long pcm_clk_rate;
 	struct afe_clk_cfg lpass_pcm_oe_clk;
 	struct afe_clk_cfg *lpass_pcm_src_clk = NULL;
-	unsigned int rx_port = 0;
-	unsigned int tx_port = 0;
 
 	auxpcm_pdata = dai->dev->platform_data;
-	lpass_pcm_src_clk = (struct afe_clk_cfg *)auxpcm_pdata->clk_cfg;
+	lpass_pcm_src_clk = (struct afe_clk_cfg *) &aux_dai_data->clk_cfg;
 
-	mutex_lock(&aux_pcm_mutex);
+	mutex_lock(&aux_dai_data->rlock);
 
-	if (aux_pcm_count == 2) {
+	if (aux_dai_data->rcnt == 2) { /* xrun case ? */
 		dev_dbg(dai->dev, "%s(): dai->id %d aux_pcm_count is 2. Just return.\n",
 			__func__, dai->id);
-		mutex_unlock(&aux_pcm_mutex);
+		mutex_unlock(&aux_dai_data->rlock);
 		return 0;
-	} else if (aux_pcm_count > 2) {
+	} else if (aux_dai_data->rcnt > 2) {
 		dev_err(dai->dev, "%s(): ERROR: dai->id %d aux_pcm_count = %d > 2\n",
-			__func__, dai->id, aux_pcm_count);
-		mutex_unlock(&aux_pcm_mutex);
+			__func__, dai->id, aux_dai_data->rcnt);
+		mutex_unlock(&aux_dai_data->rlock);
 		return 0;
 	}
 
-	aux_pcm_count++;
-	if (aux_pcm_count == 2)  {
+	aux_dai_data->rcnt++;
+	if (aux_dai_data->rcnt == 2)  {
 		dev_dbg(dai->dev, "%s(): dai->id %d aux_pcm_count = %d after increment\n",
-				__func__, dai->id, aux_pcm_count);
-		mutex_unlock(&aux_pcm_mutex);
+				__func__, dai->id, aux_dai_data->rcnt);
+		mutex_unlock(&aux_dai_data->rlock);
 		return 0;
 	}
 
-	pr_debug("%s:dai->id:%d  aux_pcm_count = %d. opening afe\n",
-			__func__, dai->id, aux_pcm_count);
+	dev_dbg(dai->dev, "%s:dai->id:%d  aux_pcm_count = %d. opening afe\n",
+		__func__, dai->id, aux_dai_data->rcnt);
 
 	rc = afe_q6_interface_prepare();
 	if (IS_ERR_VALUE(rc))
@@ -279,7 +300,7 @@ static int msm_dai_q6_auxpcm_prepare(struct snd_pcm_substream *substream,
 	} else {
 		dev_err(dai->dev, "%s: Invalid AUX PCM rate %d\n", __func__,
 			dai_data->rate);
-		mutex_unlock(&aux_pcm_mutex);
+		mutex_unlock(&aux_dai_data->rlock);
 		return -EINVAL;
 	}
 
@@ -291,42 +312,35 @@ static int msm_dai_q6_auxpcm_prepare(struct snd_pcm_substream *substream,
 			sizeof(struct afe_clk_cfg));
 	lpass_pcm_oe_clk.clk_val1 = Q6AFE_LPASS_OSR_CLK_12_P288_MHZ;
 
-	if (dai->id == AFE_PORT_ID_PRIMARY_PCM_RX ||
-			dai->id == AFE_PORT_ID_PRIMARY_PCM_TX) {
-		rx_port = AFE_PORT_ID_PRIMARY_PCM_RX;
-		tx_port = AFE_PORT_ID_PRIMARY_PCM_TX;
-	} else if (dai->id == AFE_PORT_ID_SECONDARY_PCM_RX ||
-			dai->id == AFE_PORT_ID_SECONDARY_PCM_TX) {
-		rx_port = AFE_PORT_ID_SECONDARY_PCM_RX;
-		tx_port = AFE_PORT_ID_SECONDARY_PCM_TX;
-	}
-
-	rc = afe_set_lpass_clock(rx_port, lpass_pcm_src_clk);
+	rc = afe_set_lpass_clock(aux_dai_data->rx_pid, lpass_pcm_src_clk);
 	if (rc < 0) {
-		pr_err("%s:afe_set_lpass_clock on RX pcm_src_clk failed\n",
-							__func__);
+		dev_err(dai->dev,
+			"%s:afe_set_lpass_clock on RX pcm_src_clk failed\n",
+			__func__);
 		goto fail;
 	}
 
-	rc = afe_set_lpass_clock(tx_port, lpass_pcm_src_clk);
+	rc = afe_set_lpass_clock(aux_dai_data->tx_pid, lpass_pcm_src_clk);
 	if (rc < 0) {
-		pr_err("%s:afe_set_lpass_clock on TX pcm_src_clk failed\n",
-							__func__);
+		dev_err(dai->dev,
+			"%s:afe_set_lpass_clock on TX pcm_src_clk failed\n",
+			__func__);
 		goto fail;
 	}
 
-	rc = afe_set_lpass_clock(rx_port, &lpass_pcm_oe_clk);
+	rc = afe_set_lpass_clock(aux_dai_data->rx_pid, &lpass_pcm_oe_clk);
 	if (rc < 0) {
-		pr_err("%s:afe_set_lpass_clock on pcm_oe_clk failed\n",
-							__func__);
+		dev_err(dai->dev,
+			"%s:afe_set_lpass_clock on pcm_oe_clk failed\n",
+			__func__);
 		goto fail;
 	}
 
-	afe_open(rx_port, &dai_data->port_config, dai_data->rate);
-	afe_open(tx_port, &dai_data->port_config, dai_data->rate);
+	afe_open(aux_dai_data->rx_pid, &dai_data->port_config, dai_data->rate);
+	afe_open(aux_dai_data->tx_pid, &dai_data->port_config, dai_data->rate);
 
 fail:
-	mutex_unlock(&aux_pcm_mutex);
+	mutex_unlock(&aux_dai_data->rlock);
 	return rc;
 }
 
@@ -335,8 +349,8 @@ static int msm_dai_q6_auxpcm_trigger(struct snd_pcm_substream *substream,
 {
 	int rc = 0;
 
-	pr_debug("%s:port:%d  cmd:%d  aux_pcm_count= %d\n",
-		__func__, dai->id, cmd, aux_pcm_count);
+	pr_debug("%s:port:%d  cmd:%d\n",
+		__func__, dai->id, cmd);
 
 	switch (cmd) {
 
@@ -359,85 +373,44 @@ static int msm_dai_q6_auxpcm_trigger(struct snd_pcm_substream *substream,
 
 }
 
-static int msm_dai_q6_dai_auxpcm_probe(struct snd_soc_dai *dai)
-{
-	struct msm_dai_q6_dai_data *dai_data;
-	int rc = 0;
-	struct msm_dai_auxpcm_pdata *auxpcm_pdata = NULL;
-
-	auxpcm_pdata = (struct msm_dai_auxpcm_pdata *)
-					dev_get_drvdata(dai->dev);
-	dai->dev->platform_data = auxpcm_pdata;
-	dai->id = dai->dev->id;
-
-
-	dai_data = kzalloc(sizeof(struct msm_dai_q6_dai_data), GFP_KERNEL);
-
-	if (!dai_data) {
-		dev_err(dai->dev, "DAI-%d: fail to allocate dai data\n",
-		dai->id);
-		rc = -ENOMEM;
-	} else
-		dev_set_drvdata(dai->dev, dai_data);
-
-	pr_debug("%s : probe done for dai->id %d\n", __func__, dai->id);
-	return rc;
-}
-
 static int msm_dai_q6_dai_auxpcm_remove(struct snd_soc_dai *dai)
 {
-	struct msm_dai_q6_dai_data *dai_data;
+	struct msm_dai_q6_auxpcm_dai_data *aux_dai_data;
+	struct afe_clk_cfg *lpass_pcm_src_clk = NULL;
+	struct afe_clk_cfg lpass_pcm_oe_clk;
 	int rc;
-	unsigned int rx_port = 0;
-	unsigned int tx_port = 0;
-
-	dai_data = dev_get_drvdata(dai->dev);
 
-	mutex_lock(&aux_pcm_mutex);
+	aux_dai_data = dev_get_drvdata(dai->dev);
 
-	if (aux_pcm_count == 0) {
+	if (aux_dai_data->rcnt == 0) {
 		dev_dbg(dai->dev, "%s(): dai->id %d aux_pcm_count is 0. clean up and return\n",
-					__func__, dai->id);
-		goto done;
-	}
-
-	aux_pcm_count--;
-
-	if (aux_pcm_count > 0) {
-		dev_dbg(dai->dev, "%s(): dai->id %d aux_pcm_count = %d\n",
-			__func__, dai->id, aux_pcm_count);
-		goto done;
-	} else if (aux_pcm_count < 0) {
-		dev_err(dai->dev, "%s(): ERROR: dai->id %d aux_pcm_count = %d < 0\n",
-			__func__, dai->id, aux_pcm_count);
+			__func__, dai->id);
 		goto done;
 	}
 
-	dev_dbg(dai->dev, "%s(): dai->id %d aux_pcm_count = %d.closing afe\n",
-		__func__, dai->id, aux_pcm_count);
+	dev_dbg(dai->dev, "%s(): dai->id %d closing afe\n",
+		__func__, dai->id);
 
-	if (dai->id == AFE_PORT_ID_PRIMARY_PCM_RX ||
-			dai->id == AFE_PORT_ID_PRIMARY_PCM_TX) {
-		rx_port = AFE_PORT_ID_PRIMARY_PCM_RX;
-		tx_port = AFE_PORT_ID_PRIMARY_PCM_TX;
-	} else if (dai->id == AFE_PORT_ID_SECONDARY_PCM_RX ||
-			dai->id == AFE_PORT_ID_SECONDARY_PCM_TX) {
-		rx_port = AFE_PORT_ID_SECONDARY_PCM_RX;
-		tx_port = AFE_PORT_ID_SECONDARY_PCM_TX;
-	}
-	rc = afe_close(rx_port); /* can block */
+	rc = afe_close(aux_dai_data->rx_pid); /* can block */
 	if (IS_ERR_VALUE(rc))
 		dev_err(dai->dev, "fail to close AUX PCM RX AFE port\n");
 
-	rc = afe_close(tx_port);
+	rc = afe_close(aux_dai_data->tx_pid);
 	if (IS_ERR_VALUE(rc))
 		dev_err(dai->dev, "fail to close AUX PCM TX AFE port\n");
-done:
-	kfree(dai_data);
-	snd_soc_unregister_dai(dai->dev);
 
-	mutex_unlock(&aux_pcm_mutex);
+	lpass_pcm_src_clk = (struct afe_clk_cfg *) &aux_dai_data->clk_cfg;
 
+	lpass_pcm_src_clk->clk_val1 = 0;
+	afe_set_lpass_clock(aux_dai_data->rx_pid, lpass_pcm_src_clk);
+	afe_set_lpass_clock(aux_dai_data->tx_pid, lpass_pcm_src_clk);
+
+	memcpy(&lpass_pcm_oe_clk, &lpass_clk_cfg_default,
+			 sizeof(struct afe_clk_cfg));
+	lpass_pcm_oe_clk.clk_val1 = 0;
+	afe_set_lpass_clock(aux_dai_data->rx_pid, &lpass_pcm_oe_clk);
+
+done:
 	return 0;
 }
 
@@ -448,31 +421,24 @@ static struct snd_soc_dai_ops msm_dai_q6_auxpcm_ops = {
 	.shutdown	= msm_dai_q6_auxpcm_shutdown,
 };
 
-static struct snd_soc_dai_driver msm_dai_q6_aux_pcm_rx_dai = {
+static struct snd_soc_dai_driver msm_dai_q6_aux_pcm_dai = {
 	.playback = {
-		.rates = SNDRV_PCM_RATE_8000,
+		.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),
 		.formats = SNDRV_PCM_FMTBIT_S16_LE,
 		.channels_min = 1,
 		.channels_max = 1,
-		.rate_max = 8000,
+		.rate_max = 16000,
 		.rate_min = 8000,
 	},
-	.ops = &msm_dai_q6_auxpcm_ops,
-	.probe = msm_dai_q6_dai_auxpcm_probe,
-	.remove = msm_dai_q6_dai_auxpcm_remove,
-};
-
-static struct snd_soc_dai_driver msm_dai_q6_aux_pcm_tx_dai = {
 	.capture = {
-		.rates = SNDRV_PCM_RATE_8000,
+		.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),
 		.formats = SNDRV_PCM_FMTBIT_S16_LE,
 		.channels_min = 1,
 		.channels_max = 1,
-		.rate_max = 8000,
+		.rate_max = 16000,
 		.rate_min = 8000,
 	},
 	.ops = &msm_dai_q6_auxpcm_ops,
-	.probe = msm_dai_q6_dai_auxpcm_probe,
 	.remove = msm_dai_q6_dai_auxpcm_remove,
 };
 
@@ -1090,72 +1056,38 @@ static struct snd_soc_dai_driver msm_dai_q6_incall_record_dai = {
 
 static int msm_auxpcm_dev_probe(struct platform_device *pdev)
 {
-	int id;
-	void *plat_data;
+	struct msm_dai_q6_auxpcm_dai_data *dai_data;
+	struct msm_dai_auxpcm_pdata *auxpcm_pdata;
+	uint32_t val_array[RATE_MAX_NUM_OF_AUX_PCM_RATES];
+	const char *intf_name;
 	int rc = 0;
 
-	if (pdev->dev.parent == NULL)
-		return -ENODEV;
-
-	plat_data = dev_get_drvdata(pdev->dev.parent);
-
-	rc = of_property_read_u32(pdev->dev.of_node,
-			"qcom,msm-auxpcm-dev-id", &id);
-	if (rc) {
-		dev_err(&pdev->dev, "%s: qcom,msm-auxpcm-dev-id missing in DT node\n",
-				__func__);
-		return rc;
-	}
-
-	pdev->id = id;
-	dev_set_name(&pdev->dev, "%s.%d", "msm-dai-q6", id);
-	dev_dbg(&pdev->dev, "dev name %s\n", dev_name(&pdev->dev));
-
-	dev_set_drvdata(&pdev->dev, plat_data);
-	pdev->dev.id = id;
-
-	switch (id) {
-	case AFE_PORT_ID_PRIMARY_PCM_RX:
-	case AFE_PORT_ID_SECONDARY_PCM_RX:
-		rc = snd_soc_register_dai(&pdev->dev,
-					&msm_dai_q6_aux_pcm_rx_dai);
-		break;
-	case AFE_PORT_ID_PRIMARY_PCM_TX:
-	case AFE_PORT_ID_SECONDARY_PCM_TX:
-		rc = snd_soc_register_dai(&pdev->dev,
-					&msm_dai_q6_aux_pcm_tx_dai);
-		break;
-	default:
-		rc = -ENODEV;
-		break;
+	dai_data = kzalloc(sizeof(struct msm_dai_q6_auxpcm_dai_data),
+			   GFP_KERNEL);
+	if (!dai_data) {
+		dev_err(&pdev->dev,
+			"Failed to allocate memory for auxpcm DAI data\n");
+		return -ENOMEM;
 	}
 
-	return rc;
-}
-
-static int msm_auxpcm_resource_probe(
-			struct platform_device *pdev)
-{
-	int rc = 0;
-	struct msm_dai_auxpcm_pdata *auxpcm_pdata = NULL;
-	struct afe_clk_cfg *clk_cfg = NULL;
-	uint32_t val_array[RATE_MAX_NUM_OF_AUX_PCM_RATES];
-
 	auxpcm_pdata = kzalloc(sizeof(struct msm_dai_auxpcm_pdata),
 				GFP_KERNEL);
 
 	if (!auxpcm_pdata) {
 		dev_err(&pdev->dev, "Failed to allocate memory for platform data\n");
-		return -ENOMEM;
+		goto fail_pdata_nomem;
 	}
 
+	dev_dbg(&pdev->dev, "%s: dev %p, dai_data %p, auxpcm_pdata %p\n",
+		__func__, &pdev->dev, dai_data, auxpcm_pdata);
+
 	rc = of_property_read_u32_array(pdev->dev.of_node,
 			"qcom,msm-cpudai-auxpcm-mode",
 			val_array, RATE_MAX_NUM_OF_AUX_PCM_RATES);
 	if (rc) {
 		dev_err(&pdev->dev, "%s: qcom,msm-cpudai-auxpcm-mode missing in DT node\n",
 			__func__);
-		goto fail_free_plat;
+		goto fail_invalid_dt;
 	}
 	auxpcm_pdata->mode_8k.mode = (u16)val_array[RATE_8KHZ];
 	auxpcm_pdata->mode_16k.mode = (u16)val_array[RATE_16KHZ];
@@ -1166,7 +1098,7 @@ static int msm_auxpcm_resource_probe(
 	if (rc) {
 		dev_err(&pdev->dev, "%s: qcom,msm-cpudai-auxpcm-sync missing in DT node\n",
 			__func__);
-		goto fail_free_plat;
+		goto fail_invalid_dt;
 	}
 	auxpcm_pdata->mode_8k.sync = (u16)val_array[RATE_8KHZ];
 	auxpcm_pdata->mode_16k.sync = (u16)val_array[RATE_16KHZ];
@@ -1178,7 +1110,7 @@ static int msm_auxpcm_resource_probe(
 	if (rc) {
 		dev_err(&pdev->dev, "%s: qcom,msm-cpudai-auxpcm-frame missing in DT node\n",
 			__func__);
-		goto fail_free_plat;
+		goto fail_invalid_dt;
 	}
 	auxpcm_pdata->mode_8k.frame = (u16)val_array[RATE_8KHZ];
 	auxpcm_pdata->mode_16k.frame = (u16)val_array[RATE_16KHZ];
@@ -1189,7 +1121,7 @@ static int msm_auxpcm_resource_probe(
 	if (rc) {
 		dev_err(&pdev->dev, "%s: qcom,msm-cpudai-auxpcm-quant missing in DT node\n",
 			__func__);
-		goto fail_free_plat;
+		goto fail_invalid_dt;
 	}
 	auxpcm_pdata->mode_8k.quant = (u16)val_array[RATE_8KHZ];
 	auxpcm_pdata->mode_16k.quant = (u16)val_array[RATE_16KHZ];
@@ -1200,7 +1132,7 @@ static int msm_auxpcm_resource_probe(
 	if (rc) {
 		dev_err(&pdev->dev, "%s: qcom,msm-cpudai-auxpcm-slot missing in DT node\n",
 			__func__);
-		goto fail_free_plat;
+		goto fail_invalid_dt;
 	}
 	auxpcm_pdata->mode_8k.slot = (u16)val_array[RATE_8KHZ];
 	auxpcm_pdata->mode_16k.slot = (u16)val_array[RATE_16KHZ];
@@ -1211,7 +1143,7 @@ static int msm_auxpcm_resource_probe(
 	if (rc) {
 		dev_err(&pdev->dev, "%s: qcom,msm-cpudai-auxpcm-data missing in DT node\n",
 			__func__);
-		goto fail_free_plat;
+		goto fail_invalid_dt;
 	}
 	auxpcm_pdata->mode_8k.data = (u16)val_array[RATE_8KHZ];
 	auxpcm_pdata->mode_16k.data = (u16)val_array[RATE_16KHZ];
@@ -1219,60 +1151,79 @@ static int msm_auxpcm_resource_probe(
 	rc = of_property_read_u32_array(pdev->dev.of_node,
 			"qcom,msm-cpudai-auxpcm-pcm-clk-rate",
 			val_array, RATE_MAX_NUM_OF_AUX_PCM_RATES);
-
+	if (rc) {
+		dev_err(&pdev->dev,
+			"%s: qcom,msm-cpudai-auxpcm-pcm-clk-rate missing in DT\n",
+			__func__);
+		goto fail_invalid_dt;
+	}
 	auxpcm_pdata->mode_8k.pcm_clk_rate = (int)val_array[RATE_8KHZ];
 	auxpcm_pdata->mode_16k.pcm_clk_rate = (int)val_array[RATE_16KHZ];
 
-	clk_cfg = kzalloc(sizeof(struct afe_clk_cfg), GFP_KERNEL);
-	if (clk_cfg == NULL) {
-		pr_err("%s: Failed to allocate memory for clk cfg\n", __func__);
-		goto fail_free_plat;
+	rc = of_property_read_string(pdev->dev.of_node,
+			"qcom,msm-auxpcm-interface", &intf_name);
+	if (rc) {
+		dev_err(&pdev->dev,
+			"%s: qcom,msm-auxpcm-interface missing in DT node\n",
+			__func__);
+		goto fail_nodev_intf;
 	}
-	auxpcm_pdata->clk_cfg = clk_cfg;
 
-	platform_set_drvdata(pdev, auxpcm_pdata);
+	if (!strncmp(intf_name, "primary", sizeof("primary"))) {
+		dai_data->rx_pid = AFE_PORT_ID_PRIMARY_PCM_RX;
+		dai_data->tx_pid = AFE_PORT_ID_PRIMARY_PCM_TX;
+		pdev->id = MSM_DAI_PRI_AUXPCM_DT_DEV_ID;
+	} else if (!strncmp(intf_name, "secondary", sizeof("secondary"))) {
+		dai_data->rx_pid = AFE_PORT_ID_SECONDARY_PCM_RX;
+		dai_data->tx_pid = AFE_PORT_ID_SECONDARY_PCM_TX;
+		pdev->id = MSM_DAI_SEC_AUXPCM_DT_DEV_ID;
+	} else {
+		dev_err(&pdev->dev, "%s: invalid DT intf name %s\n",
+			__func__, intf_name);
+		goto fail_invalid_intf;
+	}
 
-	rc = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
+	mutex_init(&dai_data->rlock);
+	dev_set_name(&pdev->dev, "%s.%d", "msm-dai-q6-auxpcm", pdev->id);
+	dev_dbg(&pdev->dev, "dev name %s\n", dev_name(&pdev->dev));
+
+	dev_set_drvdata(&pdev->dev, dai_data);
+	pdev->dev.platform_data = (void *) auxpcm_pdata;
+
+	rc = snd_soc_register_dai(&pdev->dev, &msm_dai_q6_aux_pcm_dai);
 	if (rc) {
-		dev_err(&pdev->dev, "%s: failed to add child nodes, rc=%d\n",
+		dev_err(&pdev->dev, "%s: auxpcm dai reg failed, rc=%d\n",
 				__func__, rc);
-		goto fail_free_plat1;
+		goto fail_reg_dai;
 	}
 
 	return rc;
 
-fail_free_plat1:
-	kfree(clk_cfg);
-fail_free_plat:
+fail_reg_dai:
+fail_invalid_intf:
+fail_nodev_intf:
+fail_invalid_dt:
 	kfree(auxpcm_pdata);
+fail_pdata_nomem:
+	kfree(dai_data);
 	return rc;
 }
 
 static int msm_auxpcm_dev_remove(struct platform_device *pdev)
 {
-	snd_soc_unregister_dai(&pdev->dev);
-	return 0;
-}
+	struct msm_dai_q6_auxpcm_dai_data *dai_data;
 
-static int msm_auxpcm_resource_remove(
-				struct platform_device *pdev)
-{
-	struct msm_dai_auxpcm_pdata *auxpcm_pdata;
-	struct afe_clk_cfg *clk_cfg;
+	dai_data = dev_get_drvdata(&pdev->dev);
 
-	auxpcm_pdata = dev_get_drvdata(&pdev->dev);
-	clk_cfg = (struct afe_clk_cfg *)auxpcm_pdata->clk_cfg;
-	kfree(clk_cfg);
-	kfree(auxpcm_pdata);
+	snd_soc_unregister_dai(&pdev->dev);
+
+	mutex_destroy(&dai_data->rlock);
+	kfree(dai_data);
+	kfree(pdev->dev.platform_data);
 
 	return 0;
 }
 
-static struct of_device_id msm_auxpcm_resource_dt_match[] = {
-	{ .compatible = "qcom,msm-auxpcm-resource", },
-	{}
-};
-
 static struct of_device_id msm_auxpcm_dev_dt_match[] = {
 	{ .compatible = "qcom,msm-auxpcm-dev", },
 	{}
@@ -1289,16 +1240,6 @@ static struct platform_driver msm_auxpcm_dev_driver = {
 	},
 };
 
-static struct platform_driver msm_auxpcm_resource_driver = {
-	.probe  = msm_auxpcm_resource_probe,
-	.remove  = msm_auxpcm_resource_remove,
-	.driver = {
-		.name = "msm-auxpcm-resource",
-		.owner = THIS_MODULE,
-		.of_match_table = msm_auxpcm_resource_dt_match,
-	},
-};
-
 static struct snd_soc_dai_driver msm_dai_q6_slimbus_rx_dai = {
 	.playback = {
 		.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
@@ -2210,14 +2151,9 @@ static int __init msm_dai_q6_init(void)
 	int rc;
 
 	rc = platform_driver_register(&msm_auxpcm_dev_driver);
-	if (rc)
-		goto fail;
-
-	rc = platform_driver_register(&msm_auxpcm_resource_driver);
-
 	if (rc) {
-		pr_err("%s: fail to register cpu dai driver\n", __func__);
-		goto aux_pcm_resource_fail;
+		pr_err("%s: fail to register auxpcm dev driver", __func__);
+		goto fail;
 	}
 
 	rc = platform_driver_register(&msm_dai_q6);
@@ -2252,8 +2188,6 @@ dai_q6_mi2s_drv_fail:
 dai_q6_dev_fail:
 	platform_driver_unregister(&msm_dai_q6);
 dai_q6_fail:
-	platform_driver_unregister(&msm_auxpcm_resource_driver);
-aux_pcm_resource_fail:
 	platform_driver_unregister(&msm_auxpcm_dev_driver);
 fail:
 	return rc;
@@ -2265,7 +2199,6 @@ static void __exit msm_dai_q6_exit(void)
 	platform_driver_unregister(&msm_dai_q6_dev);
 	platform_driver_unregister(&msm_dai_q6);
 	platform_driver_unregister(&msm_auxpcm_dev_driver);
-	platform_driver_unregister(&msm_auxpcm_resource_driver);
 }
 module_exit(msm_dai_q6_exit);