diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-10-07 11:59:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-07 12:13:42 +0100 |
| commit | c570b82c5e6ac78be35b4e72594c0f1b1888fce1 (patch) | |
| tree | 1926c4a0bba4931fbaa236ded52173e19e41f573 /sound | |
| parent | debb97248741597fa9f38f563f2b9a17250ee4c5 (diff) | |
| download | linux-c570b82c5e6ac78be35b4e72594c0f1b1888fce1.tar.gz linux-c570b82c5e6ac78be35b4e72594c0f1b1888fce1.tar.bz2 linux-c570b82c5e6ac78be35b4e72594c0f1b1888fce1.zip | |
ASoC: sun4i-codec: Remove the routing property
Most of the boards have their headphone jack directly connected to the
matching pins of the SoCs. Since most of the time we will have the same
routing path, it makes no sense to put that in the DTS, since it will only
be some useless duplication there.
It also fixes the following warning messages that were seen so far, on
boards where we were using the bindings in the documentation example.
sun4i-codec 1c22c00.codec: ASoC: no sink widget found for Headphone Jack
sun4i-codec 1c22c00.codec: ASoC: Failed to add route HP Left -> direct -> Headphone Jack
sun4i-codec 1c22c00.codec: ASoC: no sink widget found for Headphone Jack
sun4i-codec 1c22c00.codec: ASoC: Failed to add route HP Right -> direct -> Headphone Jack
Reported-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sunxi/sun4i-codec.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 47780552dcd0..bcbf4da168b6 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -571,7 +571,6 @@ static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev, static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) { struct snd_soc_card *card; - int ret; card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL); if (!card) @@ -584,12 +583,6 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) card->dev = dev; card->name = "sun4i-codec"; - ret = snd_soc_of_parse_audio_routing(card, "routing"); - if (ret) { - dev_err(dev, "Failed to create our audio routing\n"); - return NULL; - } - return card; }; |