| Message ID | CAOMZO5CU+Y8cGJsn4O1ccFZUSjLM1iH3QN2fAv4UyaLMk5yAEg@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
With those changes: [ 8.656319] wm8731 2-001a: simple-card: set_sysclk error [ 8.661964] asoc-simple-card sound: ASoC: failed to init 202c000.ssi-wm8731-hifi: -22 [ 8.670067] asoc-simple-card sound: ASoC: failed to instantiate card -22 [ 8.678063] Bluetooth: vendor=0x2df, device=0x911b, class=255, fn=3 [ 8.679996] asoc-simple-card: probe of sound failed with error -22 Looking at the 3.10 driver file and digging through some documentation, it looks like the wm8731 can be used in either slave or master mode. According to Compulab's driver, the supplying clocks when the wm8731 is in slave mode are pll4 (IMX6QDL_CLK_PLL4_AUDIO) and ssi.1 (IMX6QDL_CLK_SSI2) In master mode, it's IMX6QDL_CLK_CKO and IMX6QDL_CLK_CKO2. I have not found an actual schematic to see how it is physically wired. Popped open the case, and the codec is on the bottom side of the board with the cpu on it, 100% unaccessible during operations. Even at that, the cpu and codec are bga, so no probing of pins. Looking at their driver file, I am also wondering if we need to tweak the audmux init. I've played with this some in the dts, but hasn't made much difference. On Mon, Oct 20, 2014 at 11:29 AM, Fabio Estevam <festevam@gmail.com> wrote: > On Mon, Oct 20, 2014 at 10:06 AM, Fabio Estevam <festevam@gmail.com> > wrote: > > >> clocks = <&clks IMX6QDL_CLK_SSI2>; > > > > This 'clocks' entry does not seem correct. > > > > IMX6QDL_CLK_SSI2 is the clock from SSI2 module, which is turned on by > > the ssi driver. > > > > Who provides the MCLK for wm8731 on utilite board? Isn't it mx6 CLKO pin? > > > > Are you able to monitor this clock with a scope and make sure that it > > is actually being turned on? > > > > We use CLKO output to drive MCLK pins on mx6qdl-sabresd board with > > wm8762 codec. You can use it as a reference. > > > > Adding the Compulab's folks on Cc. > > Do the changes below help? (using IMX6QDL_CLK_CKO) > > codec: wm8731@1a { > #sound-dai-cells = <0>; > compatible = "wlf,wm8731"; > reg = <0x1a>; > AVDD-supply = <®_3p3v>; > HPVDD-supply = <®_3p3v>; > DCVDD-supply = <®_3p3v>; > DBVDD-supply = <®_3p3v>; > clocks = <&clks IMX6QDL_CLK_CKO>; > > with this one applied: > > --- a/sound/soc/codecs/wm8731.c > +++ b/sound/soc/codecs/wm8731.c > @@ -13,6 +13,7 @@ > * published by the Free Software Foundation. > */ > > +#include <linux/clk.h> > #include <linux/module.h> > #include <linux/moduleparam.h> > #include <linux/init.h> > @@ -46,6 +47,7 @@ struct wm8731_priv { > struct regmap *regmap; > struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES]; > const struct snd_pcm_hw_constraint_list *constraints; > + struct clk *mclk; > unsigned int sysclk; > int sysclk_type; > int playback_fs; > @@ -742,6 +744,21 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, > return ret; > } > > + wm8731->mclk = devm_clk_get(&i2c->dev, NULL); > + if (IS_ERR(wm8731->mclk)) { > + ret = PTR_ERR(wm8731->mclk); > + dev_err(&i2c->dev, "Failed to get mclock: %d\n", ret); > + /* Defer the probe to see if the clk will be provided later */ > + if (ret == -ENOENT) > + return -EPROBE_DEFER; > + } > + > + if (!IS_ERR(wm8731->mclk)) { > + ret = clk_prepare_enable(wm8731->mclk); > + if (ret) > + return ret; > + } > + > i2c_set_clientdata(i2c, wm8731); > > ret = snd_soc_register_codec(&i2c->dev, >
Hi Jonathan, See my comments in line. Moreover, I'd appreciate it if you could try the CompuLab 3.10.17 kernel on your board in order to rule out a hw problem. Take the latest 3.10.17 source from here: https://github.com/utilite-computer/linux-kernel tag: v3.10.17-cm-fx6-1-beta1 Build instructions: # export LOADADDR=0x10008000 # make cm_fx6_defconfig # make zImage modules -j8 CONFIG_DEBUG_SECTION_MISMATCH=y # make imx6q-sbc-fx6m.dtb # make imx6q-sbc-fx6.dtb imx6q-sbc-fx6m.dtb - Utilite imx6q-sbc-fx6.dtb - Evaluation Board Regards, Valentin. On 10/20/2014 10:59 PM, Jonathan Bennett wrote: > With those changes: > [ 8.656319] wm8731 2-001a: simple-card: set_sysclk error > [ 8.661964] asoc-simple-card sound: ASoC: failed to init > 202c000.ssi-wm8731-hifi: -22 > [ 8.670067] asoc-simple-card sound: ASoC: failed to instantiate card -22 > [ 8.678063] Bluetooth: vendor=0x2df, device=0x911b, class=255, fn=3 > [ 8.679996] asoc-simple-card: probe of sound failed with error -22 > > > Looking at the 3.10 driver file and digging through some documentation, > it looks like the wm8731 can be used in either slave or master mode. > According to Compulab's driver, the supplying clocks when the wm8731 is > in slave mode are pll4 (IMX6QDL_CLK_PLL4_AUDIO) and ssi.1 (IMX6QDL_CLK_SSI2) These clocks are correct for slave mode. > > In master mode, it's IMX6QDL_CLK_CKO and IMX6QDL_CLK_CKO2. These clocks are correct for master mode, but do not try make it work. Master mode requires a hw change on the module. > > I have not found an actual schematic to see how it is physically wired. > Popped open the case, and the codec is on the bottom side of the board > with the cpu on it, 100% unaccessible during operations. Even at that, > the cpu and codec are bga, so no probing of pins. > > Looking at their driver file, I am also wondering if we need to tweak > the audmux init. I've played with this some in the dts, but hasn't made > much difference. > > On Mon, Oct 20, 2014 at 11:29 AM, Fabio Estevam <festevam@gmail.com > <mailto:festevam@gmail.com>> wrote: > > On Mon, Oct 20, 2014 at 10:06 AM, Fabio Estevam <festevam@gmail.com > <mailto:festevam@gmail.com>> wrote: > > >> clocks = <&clks IMX6QDL_CLK_SSI2>; > > > > This 'clocks' entry does not seem correct. > > > > IMX6QDL_CLK_SSI2 is the clock from SSI2 module, which is turned on by > > the ssi driver. > > > > Who provides the MCLK for wm8731 on utilite board? Isn't it mx6 CLKO pin? > > > > Are you able to monitor this clock with a scope and make sure that it > > is actually being turned on? > > > > We use CLKO output to drive MCLK pins on mx6qdl-sabresd board with > > wm8762 codec. You can use it as a reference. > > > > Adding the Compulab's folks on Cc. > > Do the changes below help? (using IMX6QDL_CLK_CKO) > > codec: wm8731@1a { > #sound-dai-cells = <0>; > compatible = "wlf,wm8731"; > reg = <0x1a>; > AVDD-supply = <®_3p3v>; > HPVDD-supply = <®_3p3v>; > DCVDD-supply = <®_3p3v>; > DBVDD-supply = <®_3p3v>; > clocks = <&clks IMX6QDL_CLK_CKO>; > > with this one applied: > > --- a/sound/soc/codecs/wm8731.c > +++ b/sound/soc/codecs/wm8731.c > @@ -13,6 +13,7 @@ > * published by the Free Software Foundation. > */ > > +#include <linux/clk.h> > #include <linux/module.h> > #include <linux/moduleparam.h> > #include <linux/init.h> > @@ -46,6 +47,7 @@ struct wm8731_priv { > struct regmap *regmap; > struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES]; > const struct snd_pcm_hw_constraint_list *constraints; > + struct clk *mclk; > unsigned int sysclk; > int sysclk_type; > int playback_fs; > @@ -742,6 +744,21 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, > return ret; > } > > + wm8731->mclk = devm_clk_get(&i2c->dev, NULL); > + if (IS_ERR(wm8731->mclk)) { > + ret = PTR_ERR(wm8731->mclk); > + dev_err(&i2c->dev, "Failed to get mclock: %d\n", ret); > + /* Defer the probe to see if the clk will be provided later */ > + if (ret == -ENOENT) > + return -EPROBE_DEFER; > + } > + > + if (!IS_ERR(wm8731->mclk)) { > + ret = clk_prepare_enable(wm8731->mclk); > + if (ret) > + return ret; > + } > + > i2c_set_clientdata(i2c, wm8731); > > ret = snd_soc_register_codec(&i2c->dev, > >
On Tue, Oct 21, 2014 at 7:06 AM, Valentin Raevsky <valentin@compulab.co.il> wrote: > Hi Jonathan, > > See my comments in line. > > Moreover, I'd appreciate it if you could try the CompuLab 3.10.17 kernel > on your board in order to rule out a hw problem. > > Take the latest 3.10.17 source from here: > https://github.com/utilite-computer/linux-kernel > tag: v3.10.17-cm-fx6-1-beta1 > > Build instructions: > > # export LOADADDR=0x10008000 > # make cm_fx6_defconfig > # make zImage modules -j8 CONFIG_DEBUG_SECTION_MISMATCH=y > # make imx6q-sbc-fx6m.dtb > # make imx6q-sbc-fx6.dtb > > imx6q-sbc-fx6m.dtb - Utilite > imx6q-sbc-fx6.dtb - Evaluation Board > > Regards, > Valentin. Hey. I have pulled the Ubuntu image and booted it up. Sound worked without a hitch there. I think we can rule out an actual HW problem. > > > On 10/20/2014 10:59 PM, Jonathan Bennett wrote: > >> With those changes: >> [ 8.656319] wm8731 2-001a: simple-card: set_sysclk error >> [ 8.661964] asoc-simple-card sound: ASoC: failed to init >> 202c000.ssi-wm8731-hifi: -22 >> [ 8.670067] asoc-simple-card sound: ASoC: failed to instantiate card >> -22 >> [ 8.678063] Bluetooth: vendor=0x2df, device=0x911b, class=255, fn=3 >> [ 8.679996] asoc-simple-card: probe of sound failed with error -22 >> >> >> Looking at the 3.10 driver file and digging through some documentation, >> it looks like the wm8731 can be used in either slave or master mode. >> According to Compulab's driver, the supplying clocks when the wm8731 is >> in slave mode are pll4 (IMX6QDL_CLK_PLL4_AUDIO) and ssi.1 >> (IMX6QDL_CLK_SSI2) >> > These clocks are correct for slave mode. > >> >> I realized something just last night. I was grabbing changes from the devel branch of github.com/utilite-computer, thinking that those changes were based off the vanilla 3.10 kernel. Those changes are actually based on the Freescale 3.10 kernel. I pulled a Freescale patch that is obviously missing: "ENGR00276249-1 ARM: imx6q: Add missing baud clock for ssi" I also switched back to imx-wm8731.c for the driver. With this setup, the driver registers, and speaker-test thinks it plays, however there is no actual sound output. I call it progress. My previous ldiv0 was apparently a result of the missing baudclock in clk-imx6q.c. s > In master mode, it's IMX6QDL_CLK_CKO and IMX6QDL_CLK_CKO2. >> > These clocks are correct for master mode, but do not try make it work. > Master mode requires a hw change on the module. > >> I have not found an actual schematic to see how it is physically wired. >> Popped open the case, and the codec is on the bottom side of the board >> with the cpu on it, 100% unaccessible during operations. Even at that, >> the cpu and codec are bga, so no probing of pins. >> >> Looking at their driver file, I am also wondering if we need to tweak >> the audmux init. I've played with this some in the dts, but hasn't made >> much difference. >> >> On Mon, Oct 20, 2014 at 11:29 AM, Fabio Estevam <festevam@gmail.com >> <mailto:festevam@gmail.com>> wrote: >> >> On Mon, Oct 20, 2014 at 10:06 AM, Fabio Estevam <festevam@gmail.com >> <mailto:festevam@gmail.com>> wrote: >> >> >> clocks = <&clks IMX6QDL_CLK_SSI2>; >> > >> > This 'clocks' entry does not seem correct. >> > >> > IMX6QDL_CLK_SSI2 is the clock from SSI2 module, which is turned on >> by >> > the ssi driver. >> > >> > Who provides the MCLK for wm8731 on utilite board? Isn't it mx6 >> CLKO pin? >> > >> > Are you able to monitor this clock with a scope and make sure that >> it >> > is actually being turned on? >> > >> > We use CLKO output to drive MCLK pins on mx6qdl-sabresd board with >> > wm8762 codec. You can use it as a reference. >> > >> > Adding the Compulab's folks on Cc. >> >> Do the changes below help? (using IMX6QDL_CLK_CKO) >> >> codec: wm8731@1a { >> #sound-dai-cells = <0>; >> compatible = "wlf,wm8731"; >> reg = <0x1a>; >> AVDD-supply = <®_3p3v>; >> HPVDD-supply = <®_3p3v>; >> DCVDD-supply = <®_3p3v>; >> DBVDD-supply = <®_3p3v>; >> clocks = <&clks IMX6QDL_CLK_CKO>; >> >> with this one applied: >> >> --- a/sound/soc/codecs/wm8731.c >> +++ b/sound/soc/codecs/wm8731.c >> @@ -13,6 +13,7 @@ >> * published by the Free Software Foundation. >> */ >> >> +#include <linux/clk.h> >> #include <linux/module.h> >> #include <linux/moduleparam.h> >> #include <linux/init.h> >> @@ -46,6 +47,7 @@ struct wm8731_priv { >> struct regmap *regmap; >> struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES]; >> const struct snd_pcm_hw_constraint_list *constraints; >> + struct clk *mclk; >> unsigned int sysclk; >> int sysclk_type; >> int playback_fs; >> @@ -742,6 +744,21 @@ static int wm8731_i2c_probe(struct i2c_client >> *i2c, >> return ret; >> } >> >> + wm8731->mclk = devm_clk_get(&i2c->dev, NULL); >> + if (IS_ERR(wm8731->mclk)) { >> + ret = PTR_ERR(wm8731->mclk); >> + dev_err(&i2c->dev, "Failed to get mclock: %d\n", ret); >> + /* Defer the probe to see if the clk will be provided later >> */ >> + if (ret == -ENOENT) >> + return -EPROBE_DEFER; >> + } >> + >> + if (!IS_ERR(wm8731->mclk)) { >> + ret = clk_prepare_enable(wm8731->mclk); >> + if (ret) >> + return ret; >> + } >> + >> i2c_set_clientdata(i2c, wm8731); >> >> ret = snd_soc_register_codec(&i2c->dev, >> >> >> >
On Tue, Oct 21, 2014 at 4:04 PM, Jonathan Bennett <jbscience87@gmail.com> wrote: > I realized something just last night. I was grabbing changes from the devel > branch of github.com/utilite-computer, thinking that those changes were > based off the vanilla 3.10 kernel. Those changes are actually based on the > Freescale 3.10 kernel. I pulled a Freescale patch that is obviously missing: > "ENGR00276249-1 ARM: imx6q: Add missing baud clock for ssi" I also switched The baud clock patch is present in 3.18-rc1: commit 935632e9938e3e286b9c62a7e54d35c428533cc9 Author: Shengjiu Wang <shengjiu.wang@freescale.com> Date: Tue Sep 9 17:13:26 2014 +0800 ARM: dts: imx6qdl: add baud clock and clock-names for ssi Baud clock is used for bit clock generation in master mode. Ipg clock is peripheral clock and peripheral access clock. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@freescale.c > back to imx-wm8731.c for the driver. With this setup, the driver registers, > and speaker-test thinks it plays, however there is no actual sound output. I > call it progress. Great progress: some things to check : 1. audmux settings 2. Can you try to run 'alsamixer' and make sure that the volume is not at the lowest level?
On Tue, Oct 21, 2014 at 1:12 PM, Fabio Estevam <festevam@gmail.com> wrote: > On Tue, Oct 21, 2014 at 4:04 PM, Jonathan Bennett <jbscience87@gmail.com> > wrote: > > > I realized something just last night. I was grabbing changes from the > devel > > branch of github.com/utilite-computer, thinking that those changes were > > based off the vanilla 3.10 kernel. Those changes are actually based on > the > > Freescale 3.10 kernel. I pulled a Freescale patch that is obviously > missing: > > "ENGR00276249-1 ARM: imx6q: Add missing baud clock for ssi" I also > switched > > The baud clock patch is present in 3.18-rc1: > > commit 935632e9938e3e286b9c62a7e54d35c428533cc9 > Author: Shengjiu Wang <shengjiu.wang@freescale.com> > Date: Tue Sep 9 17:13:26 2014 +0800 > > ARM: dts: imx6qdl: add baud clock and clock-names for ssi > > Baud clock is used for bit clock generation in master mode. Ipg clock > is peripheral clock and peripheral access clock. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> > Signed-off-by: Shawn Guo <shawn.guo@freescale.c > Awesome! It's great to see this stuff go mainline. > > > back to imx-wm8731.c for the driver. With this setup, the driver > registers, > > and speaker-test thinks it plays, however there is no actual sound > output. I > > call it progress. > > Great progress: some things to check : > > 1. audmux settings > Well, the imx-wm8731 driver (It's really just glue for loading wm8731) does have audmux settings in it. These get called during the module probe. Not sure what might need to change there. My thoughts are that they should be correct. > > 2. Can you try to run 'alsamixer' and make sure that the volume is not > at the lowest level? > Yeah, I've made sure to check alsamixer and turn the volume up. Still no joy.
On Tue, Oct 21, 2014 at 1:49 PM, Jonathan Bennett <jbscience87@gmail.com> wrote: > > > On Tue, Oct 21, 2014 at 1:12 PM, Fabio Estevam <festevam@gmail.com> wrote: > >> On Tue, Oct 21, 2014 at 4:04 PM, Jonathan Bennett <jbscience87@gmail.com> >> wrote: >> >> > I realized something just last night. I was grabbing changes from the >> devel >> > branch of github.com/utilite-computer, thinking that those changes were >> > based off the vanilla 3.10 kernel. Those changes are actually based on >> the >> > Freescale 3.10 kernel. I pulled a Freescale patch that is obviously >> missing: >> > "ENGR00276249-1 ARM: imx6q: Add missing baud clock for ssi" I also >> switched >> >> The baud clock patch is present in 3.18-rc1: >> >> commit 935632e9938e3e286b9c62a7e54d35c428533cc9 >> Author: Shengjiu Wang <shengjiu.wang@freescale.com> >> Date: Tue Sep 9 17:13:26 2014 +0800 >> >> ARM: dts: imx6qdl: add baud clock and clock-names for ssi >> >> Baud clock is used for bit clock generation in master mode. Ipg clock >> is peripheral clock and peripheral access clock. >> >> Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> >> Signed-off-by: Shawn Guo <shawn.guo@freescale.c >> > Awesome! > It's great to see this stuff go mainline. > I have rebased to 3.18 rc-1. It has simplified the patch set a bit, as more of the Freescale things have hit mainline. http://pastebin.com/C652GKe3 is my patchset. Again, the card registers and thinks it plays, but there is no actual output. >> > back to imx-wm8731.c for the driver. With this setup, the driver >> registers, >> > and speaker-test thinks it plays, however there is no actual sound >> output. I >> > call it progress. >> >> Great progress: some things to check : >> >> 1. audmux settings >> > Well, the imx-wm8731 driver (It's really just glue for loading wm8731) > does have audmux settings in it. These get called during the module probe. > Not sure what might need to change there. My thoughts are that they should > be correct. > > >> >> 2. Can you try to run 'alsamixer' and make sure that the volume is not >> at the lowest level? >> > Yeah, I've made sure to check alsamixer and turn the volume up. Still no > joy. >
On 10/22/2014 01:37 AM, Jonathan Bennett wrote: > > > On Tue, Oct 21, 2014 at 1:49 PM, Jonathan Bennett <jbscience87@gmail.com > <mailto:jbscience87@gmail.com>> wrote: > > > > On Tue, Oct 21, 2014 at 1:12 PM, Fabio Estevam <festevam@gmail.com > <mailto:festevam@gmail.com>> wrote: > > On Tue, Oct 21, 2014 at 4:04 PM, Jonathan Bennett > <jbscience87@gmail.com <mailto:jbscience87@gmail.com>> wrote: > > > I realized something just last night. I was grabbing changes from the devel > > branch ofgithub.com/utilite-computer > <http://github.com/utilite-computer>, thinking that those > changes were > > based off the vanilla 3.10 kernel. Those changes are actually based on the > > Freescale 3.10 kernel. I pulled a Freescale patch that is obviously missing: > > "ENGR00276249-1 ARM: imx6q: Add missing baud clock for ssi" I also switched > > The baud clock patch is present in 3.18-rc1: > > commit 935632e9938e3e286b9c62a7e54d35c428533cc9 > Author: Shengjiu Wang <shengjiu.wang@freescale.com > <mailto:shengjiu.wang@freescale.com>> > Date: Tue Sep 9 17:13:26 2014 +0800 > > ARM: dts: imx6qdl: add baud clock and clock-names for ssi > > Baud clock is used for bit clock generation in master mode. > Ipg clock > is peripheral clock and peripheral access clock. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com > <mailto:shengjiu.wang@freescale.com>> > Signed-off-by: Shawn Guo <shawn.guo@freescale.c > > Awesome! > It's great to see this stuff go mainline. > > > I have rebased to 3.18 rc-1. It has simplified the patch set a bit, as > more of the Freescale things have hit mainline. > http://pastebin.com/C652GKe3 is my patchset. > Again, the card registers and thinks it plays, but there is no actual > output. Make sure that "Output Mixer HiFi Playback Switch" is on Issue: # amixer cset numid=14,iface=MIXER,name='Output Mixer HiFi Playback Switch' on # alsactl store wm8731audio > > > > back to imx-wm8731.c for the driver. With this setup, the driver registers, > > and speaker-test thinks it plays, however there is no actual sound output. I > > call it progress. > > Great progress: some things to check : > > 1. audmux settings > > Well, the imx-wm8731 driver (It's really just glue for loading > wm8731) does have audmux settings in it. These get called during the > module probe. Not sure what might need to change there. My thoughts > are that they should be correct. > > > 2. Can you try to run 'alsamixer' and make sure that the volume > is not > at the lowest level? > > Yeah, I've made sure to check alsamixer and turn the volume up. > Still no joy. > >
On Wed, Oct 22, 2014 at 3:04 AM, Valentin Raevsky <valentin@compulab.co.il> wrote: > On 10/22/2014 01:37 AM, Jonathan Bennett wrote: > >> >> >> On Tue, Oct 21, 2014 at 1:49 PM, Jonathan Bennett <jbscience87@gmail.com >> <mailto:jbscience87@gmail.com>> wrote: >> >> >> >> On Tue, Oct 21, 2014 at 1:12 PM, Fabio Estevam <festevam@gmail.com >> <mailto:festevam@gmail.com>> wrote: >> >> On Tue, Oct 21, 2014 at 4:04 PM, Jonathan Bennett >> <jbscience87@gmail.com <mailto:jbscience87@gmail.com>> wrote: >> >> > I realized something just last night. I was grabbing changes >> from the devel >> > branch ofgithub.com/utilite-computer >> <http://github.com/utilite-computer>, thinking that those >> changes were >> > based off the vanilla 3.10 kernel. Those changes are actually >> based on the >> > Freescale 3.10 kernel. I pulled a Freescale patch that is >> obviously missing: >> > "ENGR00276249-1 ARM: imx6q: Add missing baud clock for ssi" I >> also switched >> >> The baud clock patch is present in 3.18-rc1: >> >> commit 935632e9938e3e286b9c62a7e54d35c428533cc9 >> Author: Shengjiu Wang <shengjiu.wang@freescale.com >> <mailto:shengjiu.wang@freescale.com>> >> Date: Tue Sep 9 17:13:26 2014 +0800 >> >> ARM: dts: imx6qdl: add baud clock and clock-names for ssi >> >> Baud clock is used for bit clock generation in master mode. >> Ipg clock >> is peripheral clock and peripheral access clock. >> >> Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com >> <mailto:shengjiu.wang@freescale.com>> >> Signed-off-by: Shawn Guo <shawn.guo@freescale.c >> >> Awesome! >> It's great to see this stuff go mainline. >> >> >> I have rebased to 3.18 rc-1. It has simplified the patch set a bit, as >> more of the Freescale things have hit mainline. >> http://pastebin.com/C652GKe3 is my patchset. >> Again, the card registers and thinks it plays, but there is no actual >> output. >> > Make sure that "Output Mixer HiFi Playback Switch" is on > Issue: > # amixer cset numid=14,iface=MIXER,name='Output Mixer HiFi Playback > Switch' on > # alsactl store wm8731audio > BRILLIANT!!! We've got sound. Thank you for the answer. Questions: First, what is the best way to set that to on by default? I know "alsactl store wm8731audio" Makes it survive reboots. On a fresh install, though, that should probably default to on. Second: I would love to see support for this get mainlined. Should I go back and try to get simple-audio-card working, or stick with the compulab glue driver? > >> >> > back to imx-wm8731.c for the driver. With this setup, the >> driver registers, >> > and speaker-test thinks it plays, however there is no actual >> sound output. I >> > call it progress. >> >> Great progress: some things to check : >> >> 1. audmux settings >> >> Well, the imx-wm8731 driver (It's really just glue for loading >> wm8731) does have audmux settings in it. These get called during the >> module probe. Not sure what might need to change there. My thoughts >> are that they should be correct. >> >> >> 2. Can you try to run 'alsamixer' and make sure that the volume >> is not >> at the lowest level? >> >> Yeah, I've made sure to check alsamixer and turn the volume up. >> Still no joy. >> >> >> >
Hi Jonathan, On Wed, Oct 22, 2014 at 10:13 AM, Jonathan Bennett <jbscience87@gmail.com> wrote: > BRILLIANT!!! > We've got sound. Thank you for the answer. Good job :-) > Questions: > First, what is the best way to set that to on by default? I know "alsactl > store wm8731audio" Makes it survive reboots. On a fresh install, though, > that should probably default to on. > > Second: I would love to see support for this get mainlined. Should I go back > and try to get simple-audio-card working, or stick with the compulab glue > driver? Yes, please try implementing simple-audio-card support.
On Wed, Oct 22, 2014 at 7:17 AM, Fabio Estevam <festevam@gmail.com> wrote: > Hi Jonathan, > > On Wed, Oct 22, 2014 at 10:13 AM, Jonathan Bennett > <jbscience87@gmail.com> wrote: > > > BRILLIANT!!! > > We've got sound. Thank you for the answer. > > Good job :-) > > > Questions: > > First, what is the best way to set that to on by default? I know "alsactl > > store wm8731audio" Makes it survive reboots. On a fresh install, though, > > that should probably default to on. > > > > Second: I would love to see support for this get mainlined. Should I go > back > > and try to get simple-audio-card working, or stick with the compulab glue > > driver? > > Yes, please try implementing simple-audio-card support. > Applying what I've learned back to the simple-audio-card, I can get a muffled pop in the headphones, like something is powering up. That's about it. When playing to the card, things think they play fine, but no real audio. I've checked volume levels, and also used Valentin's hint. Sound bits from dts: sound { compatible = "simple-audio-card"; simple-audio-card,model = "wm8731-audio"; simple-audio-card,format = "i2s"; simple-audio-card,audio-routing = "Line Out", "LOUT", "Line Out", "ROUT", "LLINEIN","Line In", "RLINEIN","Line In"; simple-audio-card,cpu { sound-dai = <&ssi2>; bitclock-master; frame-master; }; simple-audio-card,codec { sound-dai = <&codec>; }; }; /* i2c3 */ &i2c3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c3>; status = "okay"; eeprom@50 { compatible = "at24,24c02"; reg = <0x50>; pagesize = <16>; }; codec: wm8731@1a { #sound-dai-cells = <0>; compatible = "wlf,wm8731"; reg = <0x1a>; AVDD-supply = <®_3p3v>; HPVDD-supply = <®_3p3v>; DCVDD-supply = <®_3p3v>; DBVDD-supply = <®_3p3v>; }; }; &ssi2 { status = "okay"; #sound-dai-cells = <0>; }; &audmux { status = "okay"; ssi2 { fsl,audmux-port = <1>; fsl,port-config = < (IMX_AUDMUX_V2_PTCR_SYN | IMX_AUDMUX_V2_PTCR_TFSDIR | IMX_AUDMUX_V2_PTCR_TFSEL(3) | IMX_AUDMUX_V2_PTCR_RCLKDIR | IMX_AUDMUX_V2_PTCR_RCSEL(3 | 0x8) | IMX_AUDMUX_V2_PTCR_TCLKDIR | IMX_AUDMUX_V2_PTCR_TCSEL(3)) IMX_AUDMUX_V2_PDCR_RXDSEL(3) >; }; pins4 { fsl,audmux-port = <3>; fsl,port-config = < (IMX_AUDMUX_V2_PTCR_SYN | IMX_AUDMUX_V2_PTCR_RCLKDIR | IMX_AUDMUX_V2_PTCR_RCSEL(1 | 0x8) | IMX_AUDMUX_V2_PTCR_TCLKDIR | IMX_AUDMUX_V2_PTCR_TCSEL(1)) IMX_AUDMUX_V2_PDCR_RXDSEL(1) >; }; };
On Wed, Oct 22, 2014 at 11:32 AM, Jonathan Bennett <jbscience87@gmail.com> wrote: > Applying what I've learned back to the simple-audio-card, I can get a > muffled pop in the headphones, like something is powering up. That's about > it. When playing to the card, things think they play fine, but no real > audio. I've checked volume levels, and also used Valentin's hint. > > Sound bits from dts: > > sound { > compatible = "simple-audio-card"; > simple-audio-card,model = "wm8731-audio"; > simple-audio-card,format = "i2s"; > simple-audio-card,audio-routing = > "Line Out", "LOUT", > "Line Out", "ROUT", > "LLINEIN","Line In", > "RLINEIN","Line In"; > simple-audio-card,cpu { > sound-dai = <&ssi2>; > bitclock-master; > frame-master; > }; > simple-audio-card,codec { > sound-dai = <&codec>; > }; > }; What about changing this part to? sound { compatible = "simple-audio-card"; simple-audio-card,model = "wm8731-audio"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&dailink0_master>; simple-audio-card,frame-master = <&dailink0_master>; simple-audio-card,audio-routing = "Line Out", "LOUT", "Line Out", "ROUT", "LLINEIN","Line In", "RLINEIN","Line In"; simple-audio-card,cpu { sound-dai = <&ssi2>; }; dailink0_master: simple-audio-card,codec { sound-dai = <&codec>; clocks = <&clks IMX6QDL_CLK_CKO>; }; };
On Wed, Oct 22, 2014 at 12:29 PM, Fabio Estevam <festevam@gmail.com> wrote:
> What about changing this part to?
Forgot that you use ssi as master and codec as slave, so something
like this maybe:
sound {
compatible = "simple-audio-card";
simple-audio-card,model = "wm8731-audio";
simple-audio-card,format = "i2s";
simple-audio-card,bitclock-master = <&dailink0_master>;
simple-audio-card,frame-master = <&dailink0_master>;
simple-audio-card,audio-routing =
"Line Out", "LOUT",
"Line Out", "ROUT",
"LLINEIN","Line In",
"RLINEIN","Line In";
dailink0_master: simple-audio-card,cpu {
sound-dai = <&ssi2>;
clocks = <&clks IMX6QDL_CLK_CKO>;
};
simple-audio-card,codec {
sound-dai = <&codec>;
};
};
On Wed, Oct 22, 2014 at 11:02 AM, Fabio Estevam <festevam@gmail.com> wrote: > On Wed, Oct 22, 2014 at 12:29 PM, Fabio Estevam <festevam@gmail.com> > wrote: > > > What about changing this part to? > > Forgot that you use ssi as master and codec as slave, so something > like this maybe: > > sound { > compatible = "simple-audio-card"; > simple-audio-card,model = "wm8731-audio"; > simple-audio-card,format = "i2s"; > simple-audio-card,bitclock-master = <&dailink0_master>; > simple-audio-card,frame-master = <&dailink0_master>; > simple-audio-card,audio-routing = > "Line Out", "LOUT", > "Line Out", "ROUT", > "LLINEIN","Line In", > "RLINEIN","Line In"; > > dailink0_master: simple-audio-card,cpu { > sound-dai = <&ssi2>; > clocks = <&clks IMX6QDL_CLK_CKO>; > Tried several different clocks here, didn't seem to make a difference. Open to thoughts here, but I'm beginning to be inclined to stick with the glue driver that works. I'd eventually like to get this stuff mainlined, but want to make sure to do it correctly. > }; > > simple-audio-card,codec { > sound-dai = <&codec>; > > }; > }; >
Jonathan, could you please tell me how did you connect WM8731 to development board? I have Carambola2 and am trying to play .wav file. Have downloaded and build this module: https://github.com/sonnyyu/ar9331-i2s-alsa No I just don't know how to connect pins on http://www.mikroe.com/add-on-boards/audio-voice/audio-codec-proto/ and Carambola...
--- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -13,6 +13,7 @@ * published by the Free Software Foundation. */ +#include <linux/clk.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/init.h> @@ -46,6 +47,7 @@ struct wm8731_priv { struct regmap *regmap; struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES]; const struct snd_pcm_hw_constraint_list *constraints; + struct clk *mclk; unsigned int sysclk; int sysclk_type; int playback_fs; @@ -742,6 +744,21 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, return ret; } + wm8731->mclk = devm_clk_get(&i2c->dev, NULL); + if (IS_ERR(wm8731->mclk)) { + ret = PTR_ERR(wm8731->mclk); + dev_err(&i2c->dev, "Failed to get mclock: %d\n", ret); + /* Defer the probe to see if the clk will be provided later */ + if (ret == -ENOENT) + return -EPROBE_DEFER; + } + + if (!IS_ERR(wm8731->mclk)) { + ret = clk_prepare_enable(wm8731->mclk); + if (ret) + return ret; + } + i2c_set_clientdata(i2c, wm8731); ret = snd_soc_register_codec(&i2c->dev,