diff options
-rw-r--r-- | Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt | 11 | ||||
-rw-r--r-- | sound/soc/samsung/odroidx2_max98090.c | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt index 73a8914ea75..7e1d0a7ae4a 100644 --- a/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt +++ b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt @@ -1,11 +1,11 @@ Samsung OdroidX2/U3 audio complex Required properties: - - compatible: - "samsung,odroidx2-audio" - for odroidx2 board - "samsung,odroidu3-audio" - for odroidu3 board - - samsung,i2s-controller: the phandle of the I2S controller - - samsung,audio-codec: the phandle of the max98090 audio codec + - compatible : "samsung,odroidx2-audio" - for odroidx2 board, + "samsung,odroidu3-audio" - for odroidu3 board + - samsung,model : the user-visible name of this sound complex. + - samsung,i2s-controller : the phandle of the I2S controller + - samsung,audio-codec : the phandle of the MAX98090 audio codec Example: @@ -14,4 +14,3 @@ sound { samsung,i2s-controller = <&i2s0>; samsung,audio-codec = <&max98090>; }; - diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c index 1e5f09b2ca6..6a83f609691 100644 --- a/sound/soc/samsung/odroidx2_max98090.c +++ b/sound/soc/samsung/odroidx2_max98090.c @@ -70,7 +70,6 @@ static struct snd_soc_dai_link odroidx2_dai[] = { }; static struct snd_soc_card odroidx2 = { - .name = "odroidx2", .owner = THIS_MODULE, .dai_link = odroidx2_dai, .num_links = ARRAY_SIZE(odroidx2_dai), @@ -84,6 +83,10 @@ static int odroidx2_audio_probe(struct platform_device *pdev) card->dev = &pdev->dev; + ret = snd_soc_of_parse_card_name(card, "samsung,model"); + if (ret < 0) + return ret; + odroidx2_dai[0].codec_of_node = of_parse_phandle(np, "samsung,audio-codec", 0); if (!odroidx2_dai[0].codec_of_node) { |