soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts xxx_only flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/fsl/imx-hdmi.c | 12 ++++++------ sound/soc/fsl/imx-rpmsg.c | 10 +++++----- sound/soc/fsl/imx-spdif.c | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sound/soc/fsl/imx-hdmi.c b/sound/soc/fsl/imx-hdmi.c index e454085c6e5c..53ae87a7b640 100644 --- a/sound/soc/fsl/imx-hdmi.c +++ b/sound/soc/fsl/imx-hdmi.c @@ -143,8 +143,8 @@ static int imx_hdmi_probe(struct platform_device *pdev) data->dai.cpus->dai_name = dev_name(&cpu_pdev->dev); data->dai.platforms->of_node = cpu_np; data->dai.ops = &imx_hdmi_ops; - data->dai.playback_only = true; - data->dai.capture_only = false; + data->dai.playback_assertion = true; + data->dai.capture_assertion = false; data->dai.init = imx_hdmi_init;
put_device(&cpu_pdev->dev); @@ -169,8 +169,8 @@ static int imx_hdmi_probe(struct platform_device *pdev) }
if (hdmi_out) { - data->dai.playback_only = true; - data->dai.capture_only = false; + data->dai.playback_assertion = true; + data->dai.capture_assertion = false; data->dai.codecs->dai_name = "i2s-hifi"; data->dai.codecs->name = "hdmi-audio-codec.1"; data->dai.dai_fmt = data->dai_fmt | @@ -179,8 +179,8 @@ static int imx_hdmi_probe(struct platform_device *pdev) }
if (hdmi_in) { - data->dai.playback_only = false; - data->dai.capture_only = true; + data->dai.playback_assertion = false; + data->dai.capture_assertion = true; data->dai.codecs->dai_name = "i2s-hifi"; data->dai.codecs->name = "hdmi-audio-codec.2"; data->dai.dai_fmt = data->dai_fmt | diff --git a/sound/soc/fsl/imx-rpmsg.c b/sound/soc/fsl/imx-rpmsg.c index 0f1ad7ad7d27..2254b7c0c3ff 100644 --- a/sound/soc/fsl/imx-rpmsg.c +++ b/sound/soc/fsl/imx-rpmsg.c @@ -185,18 +185,18 @@ static int imx_rpmsg_probe(struct platform_device *pdev) data->dai.platforms->name = platform_name; else data->dai.platforms->name = "rpmsg-audio-channel"; - data->dai.playback_only = true; - data->dai.capture_only = true; + data->dai.playback_assertion = true; + data->dai.capture_assertion = true; data->card.num_links = 1; data->card.dai_link = &data->dai;
if (of_property_read_bool(np, "fsl,rpmsg-out")) - data->dai.capture_only = false; + data->dai.capture_assertion = false;
if (of_property_read_bool(np, "fsl,rpmsg-in")) - data->dai.playback_only = false; + data->dai.playback_assertion = false;
- if (data->dai.playback_only && data->dai.capture_only) { + if (data->dai.playback_assertion && data->dai.capture_assertion) { dev_err(&pdev->dev, "no enabled rpmsg DAI link\n"); ret = -EINVAL; goto fail; diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c index 1e57939a7e29..aaf87eaf7607 100644 --- a/sound/soc/fsl/imx-spdif.c +++ b/sound/soc/fsl/imx-spdif.c @@ -47,16 +47,16 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) data->dai.name = "S/PDIF PCM"; data->dai.stream_name = "S/PDIF PCM"; data->dai.cpus->of_node = spdif_np; - data->dai.playback_only = true; - data->dai.capture_only = true; + data->dai.playback_assertion = true; + data->dai.capture_assertion = true;
if (of_property_read_bool(np, "spdif-out")) - data->dai.capture_only = false; + data->dai.capture_assertion = false;
if (of_property_read_bool(np, "spdif-in")) - data->dai.playback_only = false; + data->dai.playback_assertion = false;
- if (data->dai.playback_only && data->dai.capture_only) { + if (data->dai.playback_assertion && data->dai.capture_assertion) { dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n"); goto end; }