diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:11 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:11 +0900 |
| commit | 6a441c5c6031e4cac081f7c897f9def58544c05b (patch) | |
| tree | fddc7732f991e50fd27b611a273ee169dad5d712 /Documentation | |
| parent | d0f3ea4252a2b5b66b013ee161257782a37c535f (diff) | |
| parent | 1c08e7e3b2acc9f78bb5f478ffc7999007e309fc (diff) | |
| download | op-kernel-dev-6a441c5c6031e4cac081f7c897f9def58544c05b.zip op-kernel-dev-6a441c5c6031e4cac081f7c897f9def58544c05b.tar.gz | |
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt index 65dec87..fd40c85 100644 --- a/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt +++ b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt @@ -12,7 +12,7 @@ Required properties: Optional properties: - ti,dmic: phandle for the OMAP dmic node if the machine have it connected -- ti,jack_detection: Need to be set to <1> if the board capable to detect jack +- ti,jack_detection: Need to be present if the board capable to detect jack insertion, removal. Available audio endpoints for the audio-routing table: @@ -59,7 +59,7 @@ sound { compatible = "ti,abe-twl6040"; ti,model = "SDP4430"; - ti,jack-detection = <1>; + ti,jack-detection; ti,mclk-freq = <38400000>; ti,mcpdm = <&mcpdm>; |
