Skip to content

Commit

Permalink
ASoC: samsung: Make card name for Snow configurable
Browse files Browse the repository at this point in the history
Snow sound-card driver supports multiple boards with different
audio codecs. Updating the sound card name per board basis would provide
some more information to the end-user.

Signed-off-by: Tushar Behera <tushar.b@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Tushar Behera authored and Mark Brown committed Jul 4, 2014
1 parent 46aed59 commit 00ad93e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Documentation/devicetree/bindings/sound/snow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ Required properties:
- samsung,i2s-controller: The phandle of the Samsung I2S controller
- samsung,audio-codec: The phandle of the audio codec

Optional:
- samsung,model: The name of the sound-card

Example:

sound {
compatible = "google,snow-audio-max98095";

samsung,model = "Snow-I2S-MAX98095";
samsung,i2s-controller = <&i2s0>;
samsung,audio-codec = <&max98095>;
};
3 changes: 3 additions & 0 deletions sound/soc/samsung/snow.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ static int snow_probe(struct platform_device *pdev)

card->dev = &pdev->dev;

/* Update card-name if provided through DT, else use default name */
snd_soc_of_parse_card_name(card, "samsung,model");

ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret) {
dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
Expand Down

0 comments on commit 00ad93e

Please sign in to comment.