diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-11 07:50:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-11 07:50:33 +0100 |
| commit | 5e3a227a64a1c9add0a4091989ef490342f716cf (patch) | |
| tree | eb3394fc6b58ac26caaacca4f1e3c2e55aac057f /Documentation/devicetree/bindings/arm/omap/omap.txt | |
| parent | 9b745ab897199c2af9f21ca9681ef86d5b971002 (diff) | |
| parent | 7f35afd44b14a39307757629ebc0a199aade52d9 (diff) | |
Merge tag 'asoc-v3.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linussound-3.14-rc7
ASoC: Fixes for v3.14
A few things here:
- Avoid memory leaks in error cases with DPCM, this code has never been
that well tested in mainline due to the lack of mainline drivers but
we now have one queued for the merge window!
- Fix the N810 audio driver to load when booted with DT since the
platform was converted to DT during the merge window.
- Fixes for initialisation of some MFD drivers that are probably unused
in mainline
Diffstat (limited to 'Documentation/devicetree/bindings/arm/omap/omap.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/omap/omap.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index 34dc40cffdfd..af9b4a0d902b 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -91,7 +91,7 @@ Boards: compatible = "ti,omap3-beagle", "ti,omap3" - OMAP3 Tobi with Overo : Commercial expansion board with daughter board - compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3" + compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3" - OMAP4 SDP : Software Development Board compatible = "ti,omap4-sdp", "ti,omap4430" |