diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-28 10:47:54 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-28 15:14:20 +0100 |
| commit | 418e12fcaa53532aeeaf502dc787eb2a26b11f17 (patch) | |
| tree | 3081a18434ae12c63f3c5213648d90fbe754bafd /sound/soc/rockchip | |
| parent | 9522e94749d1eb2e88ca4fb1ed20dbbf6ac381d1 (diff) | |
ASoC: rockchip: rk3288_hdmi_analog: consider CPU-Platform possibility
commit 9c21e82c165c ("ASoC: rockchip: rk3288_hdmi_analog: don't select
unnecessary Platform")
Current ALSA SoC avoid to add duplicate component to rtd,
and this driver was selecting CPU component as Platform component.
Thus, above patch removed Platform settings from this driver,
because it assumed these are same component.
But, some CPU driver is using generic DMAEngine, in such case, both
CPU component and Platform component will have same of_node/name.
In other words, there are some components which are different but
have same of_node/name.
In such case, Card driver definitely need to select Platform even
though it is same as CPU.
It is depends on CPU driver, but is difficult to know it from Card driver.
This patch reverts above patch.
Fixes: commit 9c21e82c165c ("ASoC: rockchip: rk3288_hdmi_analog: don't select unnecessary Platform")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/rockchip')
| -rw-r--r-- | sound/soc/rockchip/rk3288_hdmi_analog.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rk3288_hdmi_analog.c b/sound/soc/rockchip/rk3288_hdmi_analog.c index 731f75d5dc7d..767700c34ee2 100644 --- a/sound/soc/rockchip/rk3288_hdmi_analog.c +++ b/sound/soc/rockchip/rk3288_hdmi_analog.c @@ -142,7 +142,8 @@ static const struct snd_soc_ops rk_ops = { SND_SOC_DAILINK_DEFS(audio, DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_CODEC(NULL, NULL), - COMP_CODEC("hdmi-audio-codec.2.auto", "i2s-hifi"))); + COMP_CODEC("hdmi-audio-codec.2.auto", "i2s-hifi")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); static struct snd_soc_dai_link rk_dailink = { .name = "Codecs", @@ -236,6 +237,8 @@ static int snd_rk_mc_probe(struct platform_device *pdev) return -EINVAL; } + rk_dailink.platforms->of_node = rk_dailink.cpus->of_node; + ret = snd_soc_of_parse_audio_routing(card, "rockchip,routing"); if (ret) { dev_err(&pdev->dev, |