Commit 14954ee8 authored by Shengjiu Wang's avatar Shengjiu Wang Committed by Shawn Guo

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: default avatarShengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 445ae16a
...@@ -60,38 +60,26 @@ reg_can_3v3: regulator-can-3v3 { ...@@ -60,38 +60,26 @@ reg_can_3v3: regulator-can-3v3 {
gpios = <&gpio_spi 3 GPIO_ACTIVE_LOW>; gpios = <&gpio_spi 3 GPIO_ACTIVE_LOW>;
}; };
sound { sound-wm8960 {
compatible = "simple-audio-card"; compatible = "fsl,imx-audio-wm8960";
simple-audio-card,name = "mx6ul-wm8960"; model = "wm8960-audio";
simple-audio-card,format = "i2s"; audio-cpu = <&sai2>;
simple-audio-card,bitclock-master = <&dailink_master>; audio-codec = <&codec>;
simple-audio-card,frame-master = <&dailink_master>; audio-asrc = <&asrc>;
simple-audio-card,widgets = hp-det-gpio = <&gpio5 4 0>;
"Microphone", "Mic Jack", audio-routing =
"Line", "Line In",
"Line", "Line Out",
"Speaker", "Speaker",
"Headphone", "Headphone Jack";
simple-audio-card,routing =
"Headphone Jack", "HP_L", "Headphone Jack", "HP_L",
"Headphone Jack", "HP_R", "Headphone Jack", "HP_R",
"Speaker", "SPK_LP", "Ext Spk", "SPK_LP",
"Speaker", "SPK_LN", "Ext Spk", "SPK_LN",
"Speaker", "SPK_RP", "Ext Spk", "SPK_RP",
"Speaker", "SPK_RN", "Ext Spk", "SPK_RN",
"LINPUT1", "Mic Jack", "LINPUT2", "Mic Jack",
"LINPUT3", "Mic Jack", "LINPUT3", "Mic Jack",
"RINPUT1", "Mic Jack", "RINPUT1", "AMIC",
"RINPUT2", "Mic Jack"; "RINPUT2", "AMIC",
"Mic Jack", "MICB",
simple-audio-card,cpu { "AMIC", "MICB";
sound-dai = <&sai2>;
};
dailink_master: simple-audio-card,codec {
sound-dai = <&codec>;
clocks = <&clks IMX6UL_CLK_SAI2>;
};
}; };
spi4 { spi4 {
...@@ -145,6 +133,10 @@ codec: wm8960@1a { ...@@ -145,6 +133,10 @@ codec: wm8960@1a {
compatible = "wlf,wm8960"; compatible = "wlf,wm8960";
reg = <0x1a>; reg = <0x1a>;
wlf,shared-lrclk; wlf,shared-lrclk;
wlf,hp-cfg = <3 2 3>;
wlf,gpio-cfg = <1 3>;
clocks = <&clks IMX6UL_CLK_SAI2>;
clock-names = "mclk";
}; };
camera@3c { camera@3c {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment