Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c570b82c authored by Maxime Ripard's avatar Maxime Ripard Committed by Mark Brown
Browse files

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: default avatarPriit Laes <plaes@plaes.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent debb9724

Documentation/devicetree/bindings/sound/sun4i-codec.txt

+0 −6
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ Required properties: 
- clock-names: should contain followings:

   - "apb": the parent APB clock for this controller

   - "codec": the parent module clock

- routing : A list of the connections between audio components.  Each

  entry is a pair of strings, the first being the connection's sink,

  the second being the connection's source.





Example:

codec: codec@01c22c00 {
@@ -28,6 +24,4 @@ codec: codec@01c22c00 { 
	clock-names = "apb", "codec";

	dmas = <&dma 0 19>, <&dma 0 19>;

	dma-names = "rx", "tx";

	routing = "Headphone Jack", "HP Right",

		  "Headphone Jack", "HP Left";

};

sound/soc/sunxi/sun4i-codec.c

+0 −7
Original line number Diff line number Diff line
@@ -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;

};