diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:32 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:32 +0100 |
| commit | 675d276b322b45e7bf7c616a2847bdc425745b99 (patch) | |
| tree | c61e7108034bf1230024880ec8ae46a9617077c2 /Documentation/devicetree/bindings/sound/fsl-asoc-card.txt | |
| parent | e9ddd77a31e6ba2867b9c33547f6f079d55f7a72 (diff) | |
| parent | 73beece9ca07c003e0e4f4825b12be167334d4ad (diff) | |
| download | blackbird-obmc-linux-675d276b322b45e7bf7c616a2847bdc425745b99.tar.gz blackbird-obmc-linux-675d276b322b45e7bf7c616a2847bdc425745b99.zip | |
Merge branch 'foreign/liubo/replace-lockup' into for-chris-4.6
Diffstat (limited to 'Documentation/devicetree/bindings/sound/fsl-asoc-card.txt')
| -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. |
