diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-07-02 16:06:31 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-14 13:27:34 +0200 |
| commit | b3c616ef7fc0bff6d00d884845610d4eb59f556d (patch) | |
| tree | bef74be8bc527372affe576031dd195a6bf8a1d8 /arch/arm/boot/dts/am335x-evmsk.dts | |
| parent | ARM: dts: am335x-evmsk: Add sleep pin settings for mcasp1 (diff) | |
| download | linux-b3c616ef7fc0bff6d00d884845610d4eb59f556d.tar.xz linux-b3c616ef7fc0bff6d00d884845610d4eb59f556d.zip | |
ARM: dts: am335x-evmsk: 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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/boot/dts/am335x-evmsk.dts')
| -rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 8abfe2a2ff4a..315bb02c9920 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -141,14 +141,26 @@ }; sound { - compatible = "ti,da830-evm-audio"; - ti,model = "AM335x-EVMSK"; - ti,audio-codec = <&tlv320aic3106>; - ti,mcasp-controller = <&mcasp1>; - ti,codec-clock-rate = <24000000>; - ti,audio-routing = - "Headphone Jack", "HPLOUT", - "Headphone Jack", "HPROUT"; + compatible = "simple-audio-card"; + simple-audio-card,name = "AM335x-EVMSK"; + simple-audio-card,widgets = + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "Headphone Jack", "HPLOUT", + "Headphone Jack", "HPROUT"; + simple-audio-card,format = "dsp_b"; + simple-audio-card,bitclock-master = <&sound_master>; + simple-audio-card,frame-master = <&sound_master>; + simple-audio-card,bitclock-inversion; + + simple-audio-card,cpu { + sound-dai = <&mcasp1>; + }; + + sound_master: simple-audio-card,codec { + sound-dai = <&tlv320aic3106>; + system-clock-frequency = <24000000>; + }; }; panel { @@ -471,6 +483,7 @@ }; tlv320aic3106: tlv320aic3106@1b { + #sound-dai-cells = <0>; compatible = "ti,tlv320aic3106"; reg = <0x1b>; status = "okay"; @@ -670,6 +683,7 @@ }; &mcasp1 { + #sound-dai-cells = <0>; pinctrl-names = "default", "sleep"; pinctrl-0 = <&mcasp1_pins>; pinctrl-1 = <&mcasp1_pins_sleep>; |