MLK-13897: ARM: dts: imx6ul-14x14-evk: revert to fsl,imx-audio-wm8960

Upstream commit bf3251e ("ARM: dts: imx6ul-14x14-evk: Add audio
support") switched to using the simple sound card driver.

This does not seem to work anymore on vanilla 4.9.5 (aplay gets stuck
with no sound output). Adding the rest of our out internal patches
from 4.1 causes even greater issues, the card does not even enumerate.

While we eventually want to switch to using simple sound card, lets
revert to using the fsl,imx-audio-wm8960 driver for the time being,
while investigating what it takes to switch to the simple sound card
driver.

Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>

diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
index 3a2b0ee..785f5bb 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
@@ -85,37 +85,40 @@
        };
 
        sound: 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 =
+               compatible = "fsl,imx6ul-evk-wm8960",
+                          "fsl,imx-audio-wm8960";
+               model = "wm8960-audio";
+               cpu-dai = <&sai2>;
+               audio-codec = <&codec>;
+               asrc-controller = <&asrc>;
+               codec-master;
+               gpr = <&gpr 4 0x100000 0x100000>;
+               /*
+                 * hp-det = <hp-det-pin hp-det-polarity>;
+                * hp-det-pin: JD1 JD2  or JD3
+                * hp-det-polarity = 0: hp detect high for headphone
+                * hp-det-polarity = 1: hp detect high for speaker
+                */
+               hp-det = <3 0>;
+               hp-det-gpios = <&gpio5 4 0>;
+               mic-det-gpios = <&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", "Main MIC",
+                       "RINPUT2", "Main MIC",
+                       "Mic Jack", "MICB",
+                       "Main MIC", "MICB",
+                       "CPU-Playback", "ASRC-Playback",
+                       "Playback", "CPU-Playback",
+                       "ASRC-Capture", "CPU-Capture",
+                       "CPU-Capture", "Capture";
        };
 
        spi4 {