| Message ID | 6f90780124a7f5bf31452623fdf04225873fc711.1456457898.git.zidan.wang@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Feb 26, 2016 at 11:42:42AM +0800, Zidan Wang wrote: > This is the initial imx-wm8958 device-tree-only machine driver working > with fsl_sai driver. This sound card has three dai link, HIFI, VOICE > and BT dai. HIFI dai link will support codec master and slave mode. > VOICE an BT dai link have dummy cpu dai, and just support codec > master mode. Why VOICE and BT are using dummy cpu dai? Where can I find the schematics for wm8958 from NXP website? > diff --git a/Documentation/devicetree/bindings/sound/imx-audio-wm8958.txt > +Example: > + > +sound { > + compatible = "fsl,imx6ul-evk-wm8958", > + "fsl,imx-audio-wm8958"; > + model = "wm8960-audio"; 8960? > diff --git a/arch/arm/configs/imx_v6_v7_defconfig > +config SND_SOC_IMX_WM8958 > + tristate "SoC Audio support for i.MX boards with wm8958" > + depends on OF && I2C > + select MFD_WM8994 > + select SND_SOC_WM8994 > + select SND_SOC_IMX_PCM_DMA > + select SND_SOC_FSL_SAI > + select SND_SOC_FSL_UTILS > + select SND_KCTL_JACK The driver doesn't seem to use kcontrol.... > +static u32 imx_wm8958_rates[] = { 8000, 16000, 32000, 48000 }; > + > +static struct snd_pcm_hw_constraint_list imx_wm8958_rate_constraints = { > + .count = ARRAY_SIZE(imx_wm8958_rates), > + .list = imx_wm8958_rates, > +}; Where are these rate constraints coming from? > +static int imx_wm8958_hw_params(struct snd_pcm_substream *substream, > + struct snd_pcm_hw_params *params) > +{ > + if (data->mclk_freq[id]) > + mclk_id = WM8994_FLL_SRC_MCLK(id); > + else if (id == HIFI_DAI) > + mclk_id = WM8994_FLL_SRC_MCLK2; > + else > + mclk_id = WM8994_FLL_SRC_MCLK1; I can barely follow the MCLK assigning logic here... Is it trying to use the alternative MCLK if the corresponding one is unavailable? (Since id could be only 0 or 1). And what if both are unavailable? > + if (id == HIFI_DAI) { > + /* > + * Set GPIO1 pin function to reserve, so that DAC1 and ADC1 > + * using shared LRCLK from DACLRCK1. > + */ > + snd_soc_update_bits(codec, WM8994_GPIO_1, 0x1f, 0x2); I don't see any reverse operation against this GPIO configuration here. So is it really an operation that has to be done every hw_params()? > + } else if (id == VOICE_DAI) { > + /* > + * Set GPIO6 pin function to reserve, so that DAC2 and ADC2 > + * using shared LRCLK from DACLRCK2. > + */ > + snd_soc_update_bits(codec, WM8994_GPIO_6, 0x1f, 0x2); Same here. > +static int imx_wm8958_set_bias_level(struct snd_soc_card *card, > + struct snd_soc_dapm_context *dapm, > + enum snd_soc_bias_level level) > +{ > + struct snd_soc_pcm_runtime *rtd; > + struct snd_soc_dai *codec_dai; > + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); > + int ret, i; > + > + rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); > + codec_dai = rtd->codec_dai; > + > + if (dapm->dev != codec_dai->dev) > + return 0; > + > + switch (level) { > + case SND_SOC_BIAS_STANDBY: > + if (card->dapm.bias_level == SND_SOC_BIAS_OFF) { Using if (card->dapm.bias_level != SND_SOC_BIAS_OFF) break; may save one \t for each line below. > + /* need to enable mclk to write/read wm8958 register */ > + for (i = 0; i < WM8958_MCLK_MAX; i++) { > + if (!IS_ERR(data->mclk[i])) { > + ret = clk_prepare_enable(data->mclk[i]); > + if (ret) > + dev_warn(card->dev, > + "Failed to enable MCLK%d: %d\n", > + i + 1, ret); > + } > + } > + } > + break; > + default: > + break; > + } > + > + return 0; > +} > + > +static int imx_wm8958_set_bias_level_post(struct snd_soc_card *card, > + struct snd_soc_dapm_context *dapm, > + enum snd_soc_bias_level level) > +{ > + struct snd_soc_pcm_runtime *rtd; > + struct snd_soc_dai *codec_dai; > + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); > + int i; > + > + rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); > + codec_dai = rtd->codec_dai; > + > + if (dapm->dev != codec_dai->dev) > + return 0; > + > + switch (level) { > + case SND_SOC_BIAS_OFF: > + if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) > + for (i = 0; i < WM8958_MCLK_MAX; i++) { > + if (!IS_ERR(data->mclk[i])) > + clk_disable_unprepare(data->mclk[i]); The set_bias() funcs are merely en/disabling mclk. Would be possible to do it in the codec driver? > +static struct snd_soc_dai_link imx_wm8958_dai_link[] = { > + [HIFI_DAI] = { > + .name = "HiFi", > + .stream_name = "HiFi", > + .codec_name = "wm8994-codec", > + .codec_dai_name = "wm8994-aif1", > + .ops = &imx_hifi_ops, > + .dai_fmt = SND_SOC_DAIFMT_I2S | > + SND_SOC_DAIFMT_NB_NF, > + }, > + [VOICE_DAI] = { > + .name = "Voice", > + .stream_name = "Voice", > + .cpu_dai_name = "snd-soc-dummy-dai", > + .codec_name = "wm8994-codec", > + .codec_dai_name = "wm8994-aif2", > + .platform_name = "snd-soc-dummy", > + .ignore_pmdown_time = 1, > + .ops = &imx_voice_ops, > + .dai_fmt = SND_SOC_DAIFMT_I2S | > + SND_SOC_DAIFMT_NB_NF | > + SND_SOC_DAIFMT_CBM_CFM, > + }, > + [BT_DAI] = { > + .name = "Bluetooth", > + .stream_name = "Bluetooth", > + .cpu_dai_name = "snd-soc-dummy-dai", > + .codec_name = "wm8994-codec", > + .codec_dai_name = "wm8994-aif3", > + .platform_name = "snd-soc-dummy", > + .ignore_pmdown_time = 1, > + }, A little curious...how is the BT gonna work for you? > +}; > + > +static int imx_wm8958_probe(struct platform_device *pdev) > +{ > + for (i = 0; i < WM8958_MCLK_MAX; i++) { > + sprintf(tmp, "mclk%d", i + 1); > + data->mclk[i] = devm_clk_get(&codec_dev->dev, tmp); > + if (IS_ERR(data->mclk[i])) { > + ret = PTR_ERR(data->mclk[i]); > + dev_err(&pdev->dev, "failed to get mclk%d clock: %d\n", > + i + 1, ret); What's the point to have ret = PTR_ERR without doing any error out? > + } else { > + data->mclk_freq[i] = clk_get_rate(data->mclk[i]); > + } > + } Thanks Nicolin
It looks like you replied me off the maillist. So I just add the maillist and related TO/CCs back. On Tue, Mar 01, 2016 at 05:43:22AM +0000, Zidan Wang wrote: > On Fri, Feb 26, 2016 at 11:42:42AM +0800, Zidan Wang wrote: > > This is the initial imx-wm8958 device-tree-only machine driver working > > with fsl_sai driver. This sound card has three dai link, HIFI, VOICE > > and BT dai. HIFI dai link will support codec master and slave mode. > > VOICE an BT dai link have dummy cpu dai, and just support codec master > > mode. > > Why VOICE and BT are using dummy cpu dai? Where can I find the schematics > for wm8958 from NXP website? > [Wang Zidan-B50113] I have attached the schematics for wm8958. In our > release, we can't support VOICE and BT, and just using AIF1. But in > order to upstream, I add the voice and bt dai. The way to support the other two AIFs are not very graceful -- looks like you will have to hard code the CPU DAIs in the driver. I personally suggest you to use fsl-asoc-card. Since the Codec IC provides three DAIs. And in the schematics, you do have three DAI links. It sounds plausible to me that we might treat these three DAI links as three different cards. Then use different compatible names: "imx-audio-wm8958-aif1" and so on. And each one can also has ASRC back-end support. If you really have big trouble to integrate it into fsl-asoc-card (not 100% sure if the 3 cards methodology is totally feasible), I will be okay with a dedicated driver for wm8958. But you will need to refine the DT binding to support three CPU DAIs in my opinion. > > +static u32 imx_wm8958_rates[] = { 8000, 16000, 32000, 48000 }; > > + > > +static struct snd_pcm_hw_constraint_list imx_wm8958_rate_constraints = { > > + .count = ARRAY_SIZE(imx_wm8958_rates), > > + .list = imx_wm8958_rates, > > +}; > > Where are these rate constraints coming from? > [Wang Zidan-B50113] these rates are restricted by the SAI MCLK. If the SAI MCLK runs at a different rate, it would be invalid. So there should be at least two constraints depending on the MCLK rate. And I think it might be better to have this in the SAI driver as a refinement since the current driver only errors out for those unsupported rates. > > + if (id == HIFI_DAI) { > > + /* > > + * Set GPIO1 pin function to reserve, so that DAC1 and ADC1 > > + * using shared LRCLK from DACLRCK1. > > + */ > > + snd_soc_update_bits(codec, WM8994_GPIO_1, 0x1f, 0x2); > > I don't see any reverse operation against this GPIO configuration here. > So is it really an operation that has to be done every hw_params()? > > > + } else if (id == VOICE_DAI) { > > + /* > > + * Set GPIO6 pin function to reserve, so that DAC2 and ADC2 > > + * using shared LRCLK from DACLRCK2. > > + */ > > + snd_soc_update_bits(codec, WM8994_GPIO_6, 0x1f, 0x2); > > Same here. Actually I just took a look at the DT binding doc of WM8994. It supports GPIO configurations in the codec DT nodes. So you may not need to do these over here at all. > > +static int imx_wm8958_set_bias_level_post(struct snd_soc_card *card, > > + struct snd_soc_dapm_context *dapm, > > + enum snd_soc_bias_level level) { > > + switch (level) { > > + case SND_SOC_BIAS_OFF: > > + if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) > > + for (i = 0; i < WM8958_MCLK_MAX; i++) { > > + if (!IS_ERR(data->mclk[i])) > > + clk_disable_unprepare(data->mclk[i]); > > The set_bias() funcs are merely en/disabling mclk. > Would be possible to do it in the codec driver? > [Wang Zidan-B50113] It can be moved to codec driver, > but the wm8994 driver can support wm8958 wm8994 wm1811 codec, > it's hard for me to do like that, and I also can't test them. Sending a patch to the maillist is a way to let people be aware of the change and then test it. The driver maintainer will review it and give you feedback. If it really causes compatible issues, you can then limit the code for wm8958 only. > > +static struct snd_soc_dai_link imx_wm8958_dai_link[] = { > > + [BT_DAI] = { > > + .name = "Bluetooth", > > + .stream_name = "Bluetooth", > > + .cpu_dai_name = "snd-soc-dummy-dai", > > + .codec_name = "wm8994-codec", > > + .codec_dai_name = "wm8994-aif3", > > + .platform_name = "snd-soc-dummy", > > + .ignore_pmdown_time = 1, > > + }, > > A little curious...how is the BT gonna work for you? > [Wang Zidan-B50113] I have not test the BT dai. The BT is directly > connect to AIF3, when AIF3 receive date from BT, it will route the > date to AIF1 or AIF2. And the date from AIF1 and AIF2 can also route > to AIF3 to BT. So we just need to set the amixer setting to open the > audio route. Sounds interesting. So the Codec totally becomes a router. If this design can not be supported by using three cards via the fsl-asoc-card, you may continue this driver as I can see the situation here. But I encourage you to try that first so as to avoid duplicated code/driver.
On Tue, Mar 01, 2016 at 01:06:16AM -0800, Nicolin Chen wrote: > I personally suggest you to use fsl-asoc-card. Since the Codec IC > provides three DAIs. And in the schematics, you do have three DAI > links. It sounds plausible to me that we might treat these three > DAI links as three different cards. Then use different compatible > names: "imx-audio-wm8958-aif1" and so on. And each one can also > has ASRC back-end support. No, that's really not going to work very well - having the same CODEC with very tightly coupled clocking connected into three cards is just going to be a mess, especially for the WM8958 where AIF3 is mostly just a pinmux to the other two DAIs rather than something that could ever be fully independent.
On Wed, Mar 02, 2016 at 10:34:39AM +0900, Mark Brown wrote: > On Tue, Mar 01, 2016 at 01:06:16AM -0800, Nicolin Chen wrote: > > > I personally suggest you to use fsl-asoc-card. Since the Codec IC > > provides three DAIs. And in the schematics, you do have three DAI > > links. It sounds plausible to me that we might treat these three > > DAI links as three different cards. Then use different compatible > > names: "imx-audio-wm8958-aif1" and so on. And each one can also > > has ASRC back-end support. > > No, that's really not going to work very well - having the same CODEC > with very tightly coupled clocking connected into three cards is just > going to be a mess, especially for the WM8958 where AIF3 is mostly just > a pinmux to the other two DAIs rather than something that could ever be > fully independent. I see. Thanks for the input.
On Fri, Feb 26, 2016 at 11:42:42AM +0800, Zidan Wang wrote: > + if (id == HIFI_DAI) { > + /* > + * Set GPIO1 pin function to reserve, so that DAC1 and ADC1 > + * using shared LRCLK from DACLRCK1. > + */ > + snd_soc_update_bits(codec, WM8994_GPIO_1, 0x1f, 0x2); No, this is broken - if you're writing directly into the register map of a device without the driver that's just asking for breakage. > + } else if (id == VOICE_DAI) { > + /* This looks like you're writing a switch statement... > + if (card->dapm.bias_level == SND_SOC_BIAS_OFF) { > + /* need to enable mclk to write/read wm8958 register */ > + for (i = 0; i < WM8958_MCLK_MAX; i++) { > + if (!IS_ERR(data->mclk[i])) { > + ret = clk_prepare_enable(data->mclk[i]); The CODEC needs to look after its own clocks. > + [VOICE_DAI] = { > + .name = "Voice", > + .stream_name = "Voice", > + .cpu_dai_name = "snd-soc-dummy-dai", > + .codec_name = "wm8994-codec", > + .codec_dai_name = "wm8994-aif2", > + .platform_name = "snd-soc-dummy", Why are you mapping in dummy DAIs? If these devices aren't connected then they're not connected and you shouldn't represent them. If they are connected to something then describe those connections, possibly in followup patches if you have other devices you need to support upstream first.
On Wed, Mar 02, 2016 at 01:11:01PM +0900, Mark Brown wrote: > > + [VOICE_DAI] = { > > + .name = "Voice", > > + .stream_name = "Voice", > > + .cpu_dai_name = "snd-soc-dummy-dai", > > + .codec_name = "wm8994-codec", > > + .codec_dai_name = "wm8994-aif2", > > + .platform_name = "snd-soc-dummy", > > Why are you mapping in dummy DAIs? If these devices aren't connected > then they're not connected and you shouldn't represent them. If they > are connected to something then describe those connections, possibly in > followup patches if you have other devices you need to support upstream > first. From his previous reply to me (he forgot to use reply-all), he told me that he only tested the aif1 path in the release while leaving aif2 and aif3 for future use. In his schematics of the reference board, I found all three aifs are "connected" but AIF2 and AIF3 are optional through jumpers. So I think it might be better for him to make the driver flexible by including all three aifs while creating dai-links depending on the presence of corresponding cpu-dais. Thanks Nicolin
diff --git a/Documentation/devicetree/bindings/sound/imx-audio-wm8958.txt b/Documentation/devicetree/bindings/sound/imx-audio-wm8958.txt new file mode 100644 index 0000000..50bad12 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/imx-audio-wm8958.txt @@ -0,0 +1,49 @@ +Freescale i.MX audio complex with WM8958 codec + +Required properties: + + - compatible : "fsl,imx-audio-wm8958" + + - model : The user-visible name of this sound complex + + - cpu-dai : The phandle of an CPU DAI controller + + - audio-codec : The phandle of the WM8958 audio codec + + - audio-routing : A list of the connections between audio components. + Each entry is a pair of strings, the first being + the connection's sink, the second being the + connection's source. Valid names could be power + supplies, WM8958 pins, and the jacks on the board: + + Power supplies: + * MICBIAS1 + * MICBIAS2 + + Board connectors: + * Headphone Jack + * Ext Spk + + - fsl,hifi-dai-master : If present, hifi dai works as master, and will + provide bit clock and frame clock. Otherwise, + hifi dai works as slave. + +Example: + +sound { + compatible = "fsl,imx6ul-evk-wm8958", + "fsl,imx-audio-wm8958"; + model = "wm8960-audio"; + cpu-dai = <&sai1>; + audio-codec = <&codec>; + audio-routing = + "Headphone Jack", "HPOUT1L", + "Headphone Jack", "HPOUT1R", + "Ext Spk", "SPKOUTLP", + "Ext Spk", "SPKOUTLN", + "Ext Spk", "SPKOUTRP", + "Ext Spk", "SPKOUTRN", + "IN1LN", "MICBIAS2"; + + fsl,hifi-dai-master; +}; diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 978c5de..7ac5856 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -251,6 +251,7 @@ CONFIG_SND_SOC_FSL_ASRC=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_PHYCORE_AC97=y CONFIG_SND_SOC_EUKREA_TLV320=y +CONFIG_SND_SOC_IMX_WM8958=y CONFIG_SND_SOC_IMX_WM8962=y CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_SPDIF=y diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 35aabf9..f6e5d96 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -229,6 +229,20 @@ config SND_SOC_EUKREA_TLV320 Enable I2S based access to the TLV320AIC23B codec attached to the SSI interface +config SND_SOC_IMX_WM8958 + tristate "SoC Audio support for i.MX boards with wm8958" + depends on OF && I2C + select MFD_WM8994 + select SND_SOC_WM8994 + select SND_SOC_IMX_PCM_DMA + select SND_SOC_FSL_SAI + select SND_SOC_FSL_UTILS + select SND_KCTL_JACK + help + SoC Audio support for i.MX boards with WM8958 + Say Y if you want to add support for SoC audio on an i.MX board with + a wm8958 codec. + config SND_SOC_IMX_WM8962 tristate "SoC Audio support for i.MX boards with wm8962" depends on OF && I2C && INPUT diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index d28dc25..2a781c0 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile @@ -54,6 +54,7 @@ snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o snd-soc-wm1133-ev1-objs := wm1133-ev1.o snd-soc-imx-es8328-objs := imx-es8328.o snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o +snd-soc-imx-wm8958-objs := imx-wm8958.o snd-soc-imx-wm8962-objs := imx-wm8962.o snd-soc-imx-spdif-objs := imx-spdif.o snd-soc-imx-mc13783-objs := imx-mc13783.o @@ -64,6 +65,7 @@ obj-$(CONFIG_SND_SOC_MX27VIS_AIC32X4) += snd-soc-mx27vis-aic32x4.o obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o obj-$(CONFIG_SND_SOC_IMX_ES8328) += snd-soc-imx-es8328.o obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o +obj-$(CONFIG_SND_SOC_IMX_WM8958) += snd-soc-imx-wm8958.o obj-$(CONFIG_SND_SOC_IMX_WM8962) += snd-soc-imx-wm8962.o obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o diff --git a/sound/soc/fsl/imx-wm8958.c b/sound/soc/fsl/imx-wm8958.c new file mode 100644 index 0000000..24eb66f --- /dev/null +++ b/sound/soc/fsl/imx-wm8958.c @@ -0,0 +1,432 @@ +/* + * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/i2c.h> +#include <linux/of_gpio.h> +#include <linux/gpio.h> +#include <linux/clk.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include <sound/control.h> +#include <sound/pcm_params.h> +#include <sound/soc-dapm.h> +#include <linux/mfd/wm8994/registers.h> +#include "../fsl/fsl_sai.h" +#include "../codecs/wm8994.h" + +#define DAI_NAME_SIZE 32 + +#define DAI_LINK_NUM (3) +#define HIFI_DAI (0) +#define VOICE_DAI (1) +#define BT_DAI (2) + +#define WM8958_MCLK_MAX (2) + +#define WM8994_FLL(id) (id == HIFI_DAI ? WM8994_FLL1 : WM8994_FLL2) +#define WM8994_SYSCLK_FLL(id) (id == HIFI_DAI ? WM8994_SYSCLK_FLL1 : WM8994_SYSCLK_FLL2) +#define WM8994_FLL_SRC_MCLK(id) (id == HIFI_DAI ? WM8994_FLL_SRC_MCLK1 : WM8994_FLL_SRC_MCLK2) + +struct imx_wm8958_data { + struct snd_soc_dai_link *dai_link; + struct snd_soc_card card; + struct clk *mclk[WM8958_MCLK_MAX]; + u32 mclk_freq[WM8958_MCLK_MAX]; + bool is_hifi_dai_master; + bool is_stream_in_use[DAI_LINK_NUM][2]; +}; + +static const struct snd_soc_dapm_widget imx_wm8958_dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_SPK("Ext Spk", NULL), +}; + +static u32 imx_wm8958_rates[] = { 8000, 16000, 32000, 48000 }; + +static struct snd_pcm_hw_constraint_list imx_wm8958_rate_constraints = { + .count = ARRAY_SIZE(imx_wm8958_rates), + .list = imx_wm8958_rates, +}; + +static int imx_wm8958_hifi_startup(struct snd_pcm_substream *substream) +{ + int ret = 0; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_card *card = rtd->card; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + + if (!data->is_hifi_dai_master) + ret = snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &imx_wm8958_rate_constraints); + + return ret; +} +static int imx_wm8958_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_card *card = rtd->card; + struct device *dev = card->dev; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; + bool hifi_dai_sysclk_dir = SND_SOC_CLOCK_OUT; + u32 mclk_id, id = codec_dai->id - 1; + u32 pll_out; + int ret; + + data->is_stream_in_use[id][tx] = true; + + if (data->mclk_freq[id]) + mclk_id = WM8994_FLL_SRC_MCLK(id); + else if (id == HIFI_DAI) + mclk_id = WM8994_FLL_SRC_MCLK2; + else + mclk_id = WM8994_FLL_SRC_MCLK1; + + if (id == HIFI_DAI) { + /* + * Set GPIO1 pin function to reserve, so that DAC1 and ADC1 + * using shared LRCLK from DACLRCK1. + */ + snd_soc_update_bits(codec, WM8994_GPIO_1, 0x1f, 0x2); + + if (!data->is_hifi_dai_master) + hifi_dai_sysclk_dir = SND_SOC_CLOCK_IN; + + ret = snd_soc_dai_set_sysclk(cpu_dai, + 0, 0, !hifi_dai_sysclk_dir); + + if (ret) { + dev_err(dev, "failed to set cpu sysclk: %d\n", ret); + return ret; + } + + if (!data->is_hifi_dai_master) { + ret = snd_soc_dai_set_sysclk(codec_dai, mclk_id, + data->mclk_freq[mclk_id - 1], + hifi_dai_sysclk_dir); + if (ret) { + dev_err(dev, + "failed to set codec sysclk: %d\n", + ret); + return ret; + } + + return 0; + } + } else if (id == VOICE_DAI) { + /* + * Set GPIO6 pin function to reserve, so that DAC2 and ADC2 + * using shared LRCLK from DACLRCK2. + */ + snd_soc_update_bits(codec, WM8994_GPIO_6, 0x1f, 0x2); + } + + if (params_width(params) == 24) + pll_out = params_rate(params) * 384; + else + pll_out = params_rate(params) * 256; + + ret = snd_soc_dai_set_pll(codec_dai, + WM8994_FLL(id), + mclk_id, + data->mclk_freq[mclk_id - 1], + pll_out); + if (ret) { + dev_err(dev, "failed to set codec pll: %d\n", ret); + return ret; + } + + ret = snd_soc_dai_set_sysclk(codec_dai, + WM8994_SYSCLK_FLL(id), + pll_out, + SND_SOC_CLOCK_OUT); + if (ret) { + dev_err(dev, "failed to set codec sysclk: %d\n", ret); + return ret; + } + + return 0; +} + +static int imx_wm8958_hw_free(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_card *card = rtd->card; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; + int id = codec_dai->id - 1; + + data->is_stream_in_use[id][tx] = false; + + if (id == HIFI_DAI && !data->is_hifi_dai_master) + return 0; + + if (!data->is_stream_in_use[id][!tx]) { + /* + * We should connect AIFxCLK source to FLL after enable FLL, + * and disconnect AIF1CLK source to FLL before disable FLL, + * otherwise FLL worked abnormal. + */ + snd_soc_dai_set_sysclk(codec_dai, WM8994_FLL_SRC_MCLK(id), + data->mclk_freq[id], SND_SOC_CLOCK_OUT); + + /* Disable FLL1 after all stream finished. */ + snd_soc_dai_set_pll(codec_dai, WM8994_FLL(id), 0, 0, 0); + } + + return 0; +} + +static int imx_wm8958_set_bias_level(struct snd_soc_card *card, + struct snd_soc_dapm_context *dapm, + enum snd_soc_bias_level level) +{ + struct snd_soc_pcm_runtime *rtd; + struct snd_soc_dai *codec_dai; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + int ret, i; + + rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); + codec_dai = rtd->codec_dai; + + if (dapm->dev != codec_dai->dev) + return 0; + + switch (level) { + case SND_SOC_BIAS_STANDBY: + if (card->dapm.bias_level == SND_SOC_BIAS_OFF) { + /* need to enable mclk to write/read wm8958 register */ + for (i = 0; i < WM8958_MCLK_MAX; i++) { + if (!IS_ERR(data->mclk[i])) { + ret = clk_prepare_enable(data->mclk[i]); + if (ret) + dev_warn(card->dev, + "Failed to enable MCLK%d: %d\n", + i + 1, ret); + } + } + } + break; + default: + break; + } + + return 0; +} + +static int imx_wm8958_set_bias_level_post(struct snd_soc_card *card, + struct snd_soc_dapm_context *dapm, + enum snd_soc_bias_level level) +{ + struct snd_soc_pcm_runtime *rtd; + struct snd_soc_dai *codec_dai; + struct imx_wm8958_data *data = snd_soc_card_get_drvdata(card); + int i; + + rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); + codec_dai = rtd->codec_dai; + + if (dapm->dev != codec_dai->dev) + return 0; + + switch (level) { + case SND_SOC_BIAS_OFF: + if (card->dapm.bias_level == SND_SOC_BIAS_STANDBY) + for (i = 0; i < WM8958_MCLK_MAX; i++) { + if (!IS_ERR(data->mclk[i])) + clk_disable_unprepare(data->mclk[i]); + } + break; + default: + break; + } + + card->dapm.bias_level = level; + + return 0; +} + +static struct snd_soc_ops imx_hifi_ops = { + .hw_params = imx_wm8958_hw_params, + .hw_free = imx_wm8958_hw_free, + .startup = imx_wm8958_hifi_startup, +}; + +static struct snd_soc_ops imx_voice_ops = { + .hw_params = imx_wm8958_hw_params, + .hw_free = imx_wm8958_hw_free, +}; + +static struct snd_soc_dai_link imx_wm8958_dai_link[] = { + [HIFI_DAI] = { + .name = "HiFi", + .stream_name = "HiFi", + .codec_name = "wm8994-codec", + .codec_dai_name = "wm8994-aif1", + .ops = &imx_hifi_ops, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF, + }, + [VOICE_DAI] = { + .name = "Voice", + .stream_name = "Voice", + .cpu_dai_name = "snd-soc-dummy-dai", + .codec_name = "wm8994-codec", + .codec_dai_name = "wm8994-aif2", + .platform_name = "snd-soc-dummy", + .ignore_pmdown_time = 1, + .ops = &imx_voice_ops, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, + }, + [BT_DAI] = { + .name = "Bluetooth", + .stream_name = "Bluetooth", + .cpu_dai_name = "snd-soc-dummy-dai", + .codec_name = "wm8994-codec", + .codec_dai_name = "wm8994-aif3", + .platform_name = "snd-soc-dummy", + .ignore_pmdown_time = 1, + }, +}; + +static int imx_wm8958_probe(struct platform_device *pdev) +{ + struct device_node *cpu_np, *codec_np; + struct device_node *np = pdev->dev.of_node; + struct platform_device *cpu_pdev; + struct i2c_client *codec_dev; + struct imx_wm8958_data *data; + char tmp[8]; + int ret, i; + + cpu_np = of_parse_phandle(np, "cpu-dai", 0); + if (!cpu_np) { + dev_err(&pdev->dev, "cpu dai phandle missing or invalid\n"); + return -EINVAL; + } + + codec_np = of_parse_phandle(np, "audio-codec", 0); + if (!codec_np) { + dev_err(&pdev->dev, "phandle missing or invalid\n"); + ret = -EINVAL; + goto fail; + } + + cpu_pdev = of_find_device_by_node(cpu_np); + if (!cpu_pdev) { + dev_err(&pdev->dev, "failed to find cpu dai platform device\n"); + ret = -EINVAL; + goto fail; + } + + codec_dev = of_find_i2c_device_by_node(codec_np); + if (!codec_dev || !codec_dev->dev.driver) { + dev_err(&pdev->dev, "failed to find codec platform device\n"); + ret = -EINVAL; + goto fail; + } + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->dai_link = imx_wm8958_dai_link; + + /* + * AIF1 support codec master and slave mode + * AIF2 and AIF3 just support codec master mode + */ + if (of_property_read_bool(pdev->dev.of_node, "fsl,hifi-dai-master")) { + data->is_hifi_dai_master = true; + data->dai_link[HIFI_DAI].dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; + } else { + data->is_hifi_dai_master = false; + data->dai_link[HIFI_DAI].dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; + } + + for (i = 0; i < WM8958_MCLK_MAX; i++) { + sprintf(tmp, "mclk%d", i + 1); + data->mclk[i] = devm_clk_get(&codec_dev->dev, tmp); + if (IS_ERR(data->mclk[i])) { + ret = PTR_ERR(data->mclk[i]); + dev_err(&pdev->dev, "failed to get mclk%d clock: %d\n", + i + 1, ret); + } else { + data->mclk_freq[i] = clk_get_rate(data->mclk[i]); + } + } + + data->dai_link[HIFI_DAI].cpu_dai_name = dev_name(&cpu_pdev->dev); + data->dai_link[HIFI_DAI].platform_of_node = cpu_np; + + data->card.set_bias_level = imx_wm8958_set_bias_level; + data->card.set_bias_level_post = imx_wm8958_set_bias_level_post; + data->card.dev = &pdev->dev; + ret = snd_soc_of_parse_card_name(&data->card, "model"); + if (ret) + goto fail; + + data->card.num_links = DAI_LINK_NUM; + data->card.dai_link = data->dai_link; + data->card.dapm_widgets = imx_wm8958_dapm_widgets; + data->card.num_dapm_widgets = ARRAY_SIZE(imx_wm8958_dapm_widgets); + data->card.owner = THIS_MODULE; + + ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing"); + if (ret) + goto fail; + + platform_set_drvdata(pdev, &data->card); + snd_soc_card_set_drvdata(&data->card, data); + + ret = devm_snd_soc_register_card(&pdev->dev, &data->card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); + goto fail; + } + +fail: + of_node_put(cpu_np); + of_node_put(codec_np); + + return ret; +} + +static const struct of_device_id imx_wm8958_dt_ids[] = { + { .compatible = "fsl,imx-audio-wm8958", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, imx_wm8958_dt_ids); + +static struct platform_driver imx_wm8958_driver = { + .driver = { + .name = "imx-wm8958", + .pm = &snd_soc_pm_ops, + .of_match_table = imx_wm8958_dt_ids, + }, + .probe = imx_wm8958_probe, +}; +module_platform_driver(imx_wm8958_driver); + +MODULE_AUTHOR("Freescale Semiconductor, Inc."); +MODULE_DESCRIPTION("Freescale i.MX WM8958 ASoC machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:imx-wm8958");
This is the initial imx-wm8958 device-tree-only machine driver working with fsl_sai driver. This sound card has three dai link, HIFI, VOICE and BT dai. HIFI dai link will support codec master and slave mode. VOICE an BT dai link have dummy cpu dai, and just support codec master mode. Signed-off-by: Zidan Wang <zidan.wang@freescale.com> --- .../devicetree/bindings/sound/imx-audio-wm8958.txt | 49 +++ arch/arm/configs/imx_v6_v7_defconfig | 1 + sound/soc/fsl/Kconfig | 14 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/imx-wm8958.c | 432 +++++++++++++++++++++ 5 files changed, 498 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-wm8958.txt create mode 100644 sound/soc/fsl/imx-wm8958.c