Commit bfa764ac authored by Jeeja KP's avatar Jeeja KP Committed by Mark Brown

ASoC: Intel: Skylake: Fix to set Non gateway copier cfg

If copier instance is connected to a DMA gateway then driver
needs to configure the gateway configuration otherwise set
it to invalid.
This patch sets the non gateway copier node value to invalid.
Signed-off-by: default avatarDharageswari.R <dharageswari.r@intel.com>
Signed-off-by: default avatarJeeja KP <jeeja.kp@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2ac454ff
...@@ -321,6 +321,7 @@ static void skl_copy_copier_caps(struct skl_module_cfg *mconfig, ...@@ -321,6 +321,7 @@ static void skl_copy_copier_caps(struct skl_module_cfg *mconfig,
(mconfig->formats_config.caps_size) / 4; (mconfig->formats_config.caps_size) / 4;
} }
#define SKL_NON_GATEWAY_CPR_NODE_ID 0xFFFFFFFF
/* /*
* Calculate the gatewat settings required for copier module, type of * Calculate the gatewat settings required for copier module, type of
* gateway and index of gateway to use * gateway and index of gateway to use
...@@ -367,13 +368,18 @@ static void skl_setup_cpr_gateway_cfg(struct skl_sst *ctx, ...@@ -367,13 +368,18 @@ static void skl_setup_cpr_gateway_cfg(struct skl_sst *ctx,
node_id.node.vindex = params->link_dma_id; node_id.node.vindex = params->link_dma_id;
break; break;
default: case SKL_DEVICE_HDAHOST:
node_id.node.dma_type = node_id.node.dma_type =
(SKL_CONN_SOURCE == mconfig->hw_conn_type) ? (SKL_CONN_SOURCE == mconfig->hw_conn_type) ?
SKL_DMA_HDA_HOST_OUTPUT_CLASS : SKL_DMA_HDA_HOST_OUTPUT_CLASS :
SKL_DMA_HDA_HOST_INPUT_CLASS; SKL_DMA_HDA_HOST_INPUT_CLASS;
node_id.node.vindex = params->host_dma_id; node_id.node.vindex = params->host_dma_id;
break; break;
default:
cpr_mconfig->gtw_cfg.node_id = SKL_NON_GATEWAY_CPR_NODE_ID;
cpr_mconfig->cpr_feature_mask = 0;
return;
} }
cpr_mconfig->gtw_cfg.node_id = node_id.val; cpr_mconfig->gtw_cfg.node_id = node_id.val;
......
...@@ -106,6 +106,7 @@ enum skl_dev_type { ...@@ -106,6 +106,7 @@ enum skl_dev_type {
SKL_DEVICE_I2S = 0x2, SKL_DEVICE_I2S = 0x2,
SKL_DEVICE_SLIMBUS = 0x3, SKL_DEVICE_SLIMBUS = 0x3,
SKL_DEVICE_HDALINK = 0x4, SKL_DEVICE_HDALINK = 0x4,
SKL_DEVICE_HDAHOST = 0x5,
SKL_DEVICE_NONE SKL_DEVICE_NONE
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment