diff options
| author | Tushar Behera <tushar.b@samsung.com> | 2014-07-04 14:22:59 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-04 20:31:45 +0100 |
| commit | 00ad93e26375d974801886070738d0c7cf187fdf (patch) | |
| tree | cbb949692ab0ff4799fff14651656fe53a6f2eef | |
| parent | 46aed597527384b30a6d49bff1806f6b1ed1fd77 (diff) | |
| download | op-kernel-dev-00ad93e26375d974801886070738d0c7cf187fdf.zip op-kernel-dev-00ad93e26375d974801886070738d0c7cf187fdf.tar.gz | |
ASoC: samsung: Make card name for Snow configurable
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>
| -rw-r--r-- | Documentation/devicetree/bindings/sound/snow.txt | 4 | ||||
| -rw-r--r-- | sound/soc/samsung/snow.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/snow.txt b/Documentation/devicetree/bindings/sound/snow.txt index e0b7a82..6df74f1 100644 --- a/Documentation/devicetree/bindings/sound/snow.txt +++ b/Documentation/devicetree/bindings/sound/snow.txt @@ -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>; }; diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index 8bbd348..0acf5d0 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -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); |
