ARM: dts: am335x-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>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 25 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index d4783e0a96f2..1942a5c8132d 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -136,16 +136,29 @@
         };
 
         sound {
-                compatible = "ti,da830-evm-audio";
-                ti,model = "AM335x-EVM";
-                ti,audio-codec = <&tlv320aic3106>;
-                ti,mcasp-controller = <&mcasp1>;
-                ti,codec-clock-rate = <12000000>;
-                ti,audio-routing =
-                        "Headphone Jack",       "HPLOUT",
-                        "Headphone Jack",       "HPROUT",
-                        "LINE1L",               "Line In",
-                        "LINE1R",               "Line In";
+                compatible = "simple-audio-card";
+                simple-audio-card,name = "AM335x-EVM";
+                simple-audio-card,widgets =
+                        "Headphone", "Headphone Jack",
+                        "Line", "Line In";
+                simple-audio-card,routing =
+                        "Headphone Jack",       "HPLOUT",
+                        "Headphone Jack",       "HPROUT",
+                        "LINE1L",               "Line In",
+                        "LINE1R",               "Line In";
+                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 = <12000000>;
+                };
         };
 };
 
@@ -469,6 +482,7 @@
         };
 
         tlv320aic3106: tlv320aic3106@1b {
+                #sound-dai-cells = <0>;
                 compatible = "ti,tlv320aic3106";
                 reg = <0x1b>;
                 status = "okay";
@@ -584,6 +598,7 @@
 #include "tps65910.dtsi"
 
 &mcasp1 {
+        #sound-dai-cells = <0>;
         pinctrl-names = "default", "sleep";
         pinctrl-0 = <&mcasp1_pins>;
         pinctrl-1 = <&mcasp1_pins_sleep>;