Commit 92e014a9296b273f68782cb375b9961bff9ad843
Committed by
Jacob Stiffler
1 parent
0280fc21cc
Exists in
smarc-ti-linux-3.14.y
and in
1 other branch
ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio support
The sound support consist only Headset output on the board and can be handled by "simple-audio-card" Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Showing 1 changed file with 22 additions and 8 deletions Side-by-side Diff
arch/arm/boot/dts/am437x-sk-evm.dts
... | ... | @@ -32,14 +32,26 @@ |
32 | 32 | }; |
33 | 33 | |
34 | 34 | sound { |
35 | - compatible = "ti,da830-evm-audio"; | |
36 | - ti,model = "AM437x-SK-EVM"; | |
37 | - ti,audio-codec = <&tlv320aic3106>; | |
38 | - ti,mcasp-controller = <&mcasp1>; | |
39 | - ti,codec-clock-rate = <24000000>; | |
40 | - ti,audio-routing = | |
41 | - "Headphone Jack", "HPLOUT", | |
42 | - "Headphone Jack", "HPROUT"; | |
35 | + compatible = "simple-audio-card"; | |
36 | + simple-audio-card,name = "AM437x-SK-EVM"; | |
37 | + simple-audio-card,widgets = | |
38 | + "Headphone", "Headphone Jack"; | |
39 | + simple-audio-card,routing = | |
40 | + "Headphone Jack", "HPLOUT", | |
41 | + "Headphone Jack", "HPROUT"; | |
42 | + simple-audio-card,format = "dsp_b"; | |
43 | + simple-audio-card,bitclock-master = <&sound_master>; | |
44 | + simple-audio-card,frame-master = <&sound_master>; | |
45 | + simple-audio-card,bitclock-inversion; | |
46 | + | |
47 | + simple-audio-card,cpu { | |
48 | + sound-dai = <&mcasp1>; | |
49 | + }; | |
50 | + | |
51 | + sound_master: simple-audio-card,codec { | |
52 | + sound-dai = <&tlv320aic3106>; | |
53 | + system-clock-frequency = <24000000>; | |
54 | + }; | |
43 | 55 | }; |
44 | 56 | |
45 | 57 | matrix_keypad: matrix_keypad@0 { |
... | ... | @@ -517,6 +529,7 @@ |
517 | 529 | }; |
518 | 530 | |
519 | 531 | tlv320aic3106: tlv320aic3106@1b { |
532 | + #sound-dai-cells = <0>; | |
520 | 533 | compatible = "ti,tlv320aic3106"; |
521 | 534 | reg = <0x1b>; |
522 | 535 | status = "okay"; |
... | ... | @@ -677,6 +690,7 @@ |
677 | 690 | }; |
678 | 691 | |
679 | 692 | &mcasp1 { |
693 | + #sound-dai-cells = <0>; | |
680 | 694 | pinctrl-names = "default"; |
681 | 695 | pinctrl-0 = <&mcasp1_pins>; |
682 | 696 |