diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-02-26 20:26:09 +0100 |
| commit | d61b04f801e6005182d432ebe4a0211c1d6feadd (patch) | |
| tree | aa085e56e1be528917212f41c485eebdfc072930 /Documentation | |
| parent | 30ff5957c3f1887d04ca01d839dc382739e48bde (diff) | |
| parent | 473f414564528a819f0c2bb6b4bf26366b64c9ab (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/fsl-asoc-card.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt index ce55c0a6f757..4da41bf1888e 100644 --- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt @@ -30,6 +30,8 @@ The compatible list for this generic sound card currently: "fsl,imx-audio-sgtl5000" (compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt) + "fsl,imx-audio-wm8960" + Required properties: - compatible : Contains one of entries in the compatible list. |