ARM: dts: imx6ul-14x14-evk: Switch to fsl-asoc-card sound card

There is issue with simple sound card, the simple sound
card can't configure the pll of codec.

[  115.352669] wm8960 1-001a: failed to configure clock
[  115.358843] wm8960 1-001a: ASoC: error at snd_soc_dai_hw_params on wm8960-hifi: -22

So Switch to fsl-asoc-card and the fsl-asoc-card can support
asrc module as front-end component.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
index 5a1e10d..779cc53 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
@@ -60,38 +60,26 @@
                gpios = <&gpio_spi 3 GPIO_ACTIVE_LOW>;
        };
 
-       sound {
-               compatible = "simple-audio-card";
-               simple-audio-card,name = "mx6ul-wm8960";
-               simple-audio-card,format = "i2s";
-               simple-audio-card,bitclock-master = <&dailink_master>;
-               simple-audio-card,frame-master = <&dailink_master>;
-               simple-audio-card,widgets =
-                       "Microphone", "Mic Jack",
-                       "Line", "Line In",
-                       "Line", "Line Out",
-                       "Speaker", "Speaker",
-                       "Headphone", "Headphone Jack";
-               simple-audio-card,routing =
+       sound-wm8960 {
+               compatible = "fsl,imx-audio-wm8960";
+               model = "wm8960-audio";
+               audio-cpu = <&sai2>;
+               audio-codec = <&codec>;
+               audio-asrc = <&asrc>;
+               hp-det-gpio = <&gpio5 4 0>;
+               audio-routing =
                        "Headphone Jack", "HP_L",
                        "Headphone Jack", "HP_R",
-                       "Speaker", "SPK_LP",
-                       "Speaker", "SPK_LN",
-                       "Speaker", "SPK_RP",
-                       "Speaker", "SPK_RN",
-                       "LINPUT1", "Mic Jack",
+                       "Ext Spk", "SPK_LP",
+                       "Ext Spk", "SPK_LN",
+                       "Ext Spk", "SPK_RP",
+                       "Ext Spk", "SPK_RN",
+                       "LINPUT2", "Mic Jack",
                        "LINPUT3", "Mic Jack",
-                       "RINPUT1", "Mic Jack",
-                       "RINPUT2", "Mic Jack";
-
-               simple-audio-card,cpu {
-                       sound-dai = <&sai2>;
-               };
-
-               dailink_master: simple-audio-card,codec {
-                       sound-dai = <&codec>;
-                       clocks = <&clks IMX6UL_CLK_SAI2>;
-               };
+                       "RINPUT1", "AMIC",
+                       "RINPUT2", "AMIC",
+                       "Mic Jack", "MICB",
+                       "AMIC", "MICB";
        };
 
        spi4 {
@@ -145,6 +133,10 @@
                compatible = "wlf,wm8960";
                reg = <0x1a>;
                wlf,shared-lrclk;
+               wlf,hp-cfg = <3 2 3>;
+               wlf,gpio-cfg = <1 3>;
+               clocks = <&clks IMX6UL_CLK_SAI2>;
+               clock-names = "mclk";
        };
 
        camera@3c {