diff options
author | Peter Ujfalusi | 2015-07-01 06:16:30 -0500 |
---|---|---|
committer | Jacob Stiffler | 2015-10-02 10:30:56 -0500 |
commit | 52c4aa7cdb93d61f8008f380135beaf7b8fa6593 (patch) | |
tree | b5faeb07d39ce30d9c6a3e0c50123da666caba44 | |
parent | f74ebd130812c9b08df481640e3db3a902776062 (diff) | |
download | wilink8-wlan-ti-linux-kernel-processor-sdk-linux-02.00.00.tar.gz wilink8-wlan-ti-linux-kernel-processor-sdk-linux-02.00.00.tar.xz wilink8-wlan-ti-linux-kernel-processor-sdk-linux-02.00.00.zip |
ARM: DTS: am437x-sk-evm: Switch using simple-audio-card for audio supportprocessor-sdk-linux-02.00.00
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>
-rw-r--r-- | arch/arm/boot/dts/am437x-sk-evm.dts | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts index 39cebb755a69..7ae9a17098cf 100644 --- a/arch/arm/boot/dts/am437x-sk-evm.dts +++ b/arch/arm/boot/dts/am437x-sk-evm.dts | |||
@@ -32,14 +32,26 @@ | |||
32 | }; | 32 | }; |
33 | 33 | ||
34 | sound { | 34 | sound { |
35 | compatible = "ti,da830-evm-audio"; | 35 | compatible = "simple-audio-card"; |
36 | ti,model = "AM437x-SK-EVM"; | 36 | simple-audio-card,name = "AM437x-SK-EVM"; |
37 | ti,audio-codec = <&tlv320aic3106>; | 37 | simple-audio-card,widgets = |
38 | ti,mcasp-controller = <&mcasp1>; | 38 | "Headphone", "Headphone Jack"; |
39 | ti,codec-clock-rate = <24000000>; | 39 | simple-audio-card,routing = |
40 | ti,audio-routing = | 40 | "Headphone Jack", "HPLOUT", |
41 | "Headphone Jack", "HPLOUT", | 41 | "Headphone Jack", "HPROUT"; |
42 | "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 | matrix_keypad: matrix_keypad@0 { | 57 | matrix_keypad: matrix_keypad@0 { |
@@ -535,6 +547,7 @@ | |||
535 | }; | 547 | }; |
536 | 548 | ||
537 | tlv320aic3106: tlv320aic3106@1b { | 549 | tlv320aic3106: tlv320aic3106@1b { |
550 | #sound-dai-cells = <0>; | ||
538 | compatible = "ti,tlv320aic3106"; | 551 | compatible = "ti,tlv320aic3106"; |
539 | reg = <0x1b>; | 552 | reg = <0x1b>; |
540 | status = "okay"; | 553 | status = "okay"; |
@@ -695,6 +708,7 @@ | |||
695 | }; | 708 | }; |
696 | 709 | ||
697 | &mcasp1 { | 710 | &mcasp1 { |
711 | #sound-dai-cells = <0>; | ||
698 | pinctrl-names = "default"; | 712 | pinctrl-names = "default"; |
699 | pinctrl-0 = <&mcasp1_pins>; | 713 | pinctrl-0 = <&mcasp1_pins>; |
700 | 714 | ||