forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branches 'asoc/topic/rt5665', 'asoc/topic/rt567…
…0', 'asoc/topic/rt5677', 'asoc/topic/samsung' and 'asoc/topic/simple' into asoc-next
- Loading branch information
Showing
22 changed files
with
751 additions
and
1,210 deletions.
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
Documentation/devicetree/bindings/sound/samsung,tm2-audio.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
Samsung Exynos5433 TM2(E) audio complex with WM5110 codec | ||
|
||
Required properties: | ||
|
||
- compatible : "samsung,tm2-audio" | ||
- model : the user-visible name of this sound complex | ||
- audio-codec : the phandle of the wm5110 audio codec node, | ||
as described in ../mfd/arizona.txt | ||
- i2s-controller : the phandle of the I2S controller | ||
- audio-amplifier : the phandle of the MAX98504 amplifier | ||
- samsung,audio-routing : a list of the connections between audio components; | ||
each entry is a pair of strings, the first being the | ||
connection's sink, the second being the connection's | ||
source; valid names for sources and sinks are the | ||
WM5110's and MAX98504's pins and the jacks on the | ||
board: HP, SPK, Main Mic, Sub Mic, Third Mic, | ||
Headset Mic | ||
- mic-bias-gpios : GPIO pin that enables the Main Mic bias regulator | ||
|
||
|
||
Example: | ||
|
||
sound { | ||
compatible = "samsung,tm2-audio"; | ||
audio-codec = <&wm5110>; | ||
i2s-controller = <&i2s0>; | ||
audio-amplifier = <&max98504>; | ||
mic-bias-gpios = <&gpr3 2 0>; | ||
model = "wm5110"; | ||
samsung,audio-routing = | ||
"HP", "HPOUT1L", | ||
"HP", "HPOUT1R", | ||
"SPK", "SPKOUT", | ||
"SPKOUT", "HPOUT2L", | ||
"SPKOUT", "HPOUT2R", | ||
"Main Mic", "MICBIAS2", | ||
"IN1R", "Main Mic"; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
/* | ||
* simple_card_core.h | ||
* simple_card_utils.h | ||
* | ||
* Copyright (c) 2016 Kuninori Morimoto <[email protected]> | ||
* | ||
* This program is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License version 2 as | ||
* published by the Free Software Foundation. | ||
*/ | ||
#ifndef __SIMPLE_CARD_CORE_H | ||
#define __SIMPLE_CARD_CORE_H | ||
#ifndef __SIMPLE_CARD_UTILS_H | ||
#define __SIMPLE_CARD_UTILS_H | ||
|
||
#include <sound/soc.h> | ||
|
||
|
@@ -68,4 +68,4 @@ void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link, | |
|
||
int asoc_simple_card_clean_reference(struct snd_soc_card *card); | ||
|
||
#endif /* __SIMPLE_CARD_CORE_H */ | ||
#endif /* __SIMPLE_CARD_UTILS_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* simple-card-core.c | ||
* simple-card-utils.c | ||
* | ||
* Copyright (c) 2016 Kuninori Morimoto <[email protected]> | ||
* | ||
|
@@ -195,9 +195,6 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai); | |
|
||
int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link) | ||
{ | ||
if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) | ||
return -EINVAL; | ||
|
||
/* Assumes platform == cpu */ | ||
if (!dai_link->platform_of_node) | ||
dai_link->platform_of_node = dai_link->cpu_of_node; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.