diff options
| author | Zidan Wang <zidan.wang@freescale.com> | 2015-04-29 18:33:30 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-09-17 09:22:49 -0500 |
| commit | 380106f866572e9e02457be7a3b07078aae12327 (patch) | |
| tree | d23b206047f1db58acfde0c2a95ea26407c86b7e /sound | |
| parent | 9b0d83e7494acb7821fc3c882bfc64cf19980097 (diff) | |
MLK-10780-1 ASoC: imx-wm8960: add wm8960 support for imx6ul-evk board
add wm8960 support for imx6ul-evk board.
Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/imx-wm8960.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-wm8960.c b/sound/soc/fsl/imx-wm8960.c index 6184a276456f..eefd09cfe3f4 100644 --- a/sound/soc/fsl/imx-wm8960.c +++ b/sound/soc/fsl/imx-wm8960.c @@ -22,6 +22,7 @@ #include <sound/pcm_params.h> #include <sound/soc-dapm.h> #include <linux/pinctrl/consumer.h> +#include <linux/mfd/syscon.h> #include "../codecs/wm8960.h" #include "fsl_sai.h" @@ -38,6 +39,8 @@ struct imx_wm8960_data { bool is_codec_master; bool is_stream_in_use[2]; bool is_stream_opened[2]; + struct regmap *gpr; + unsigned int hp_det[2]; }; struct imx_priv { @@ -96,6 +99,12 @@ static int imx_hifi_hw_params(struct snd_pcm_substream *substream, return ret; } + /* + * set SAI2_MCLK_DIR to enable codec MCLK + */ + if (data->gpr) + regmap_update_bits(data->gpr, 4, 1<<20, 1<<20); + /** * codec ADCLRC pin configured as GPIO, DACLRC pin is used as a frame * clock for ADCs and DACs @@ -105,7 +114,8 @@ static int imx_hifi_hw_params(struct snd_pcm_substream *substream, /* Enable headphone jack detect */ snd_soc_update_bits(codec_dai->codec, WM8960_ADDCTL2, 1<<6, 1<<6); - snd_soc_update_bits(codec_dai->codec, WM8960_ADDCTL4, 3<<2, 2<<2); + snd_soc_update_bits(codec_dai->codec, WM8960_ADDCTL2, 1<<5, data->hp_det[1]<<5); + snd_soc_update_bits(codec_dai->codec, WM8960_ADDCTL4, 3<<2, data->hp_det[0]<<2); snd_soc_update_bits(codec_dai->codec, WM8960_ADDCTL1, 1, 1); /* @@ -249,7 +259,7 @@ static const struct snd_soc_dapm_route imx_wm8960_dapm_route[] = { static int imx_wm8960_probe(struct platform_device *pdev) { - struct device_node *cpu_np, *codec_np; + struct device_node *cpu_np, *codec_np, *gpr_np; struct platform_device *cpu_pdev; struct imx_priv *priv = &card_priv; struct i2c_client *codec_dev; @@ -305,6 +315,18 @@ static int imx_wm8960_probe(struct platform_device *pdev) goto fail; } + gpr_np = of_parse_phandle(pdev->dev.of_node, "gpr", 0); + if (gpr_np) { + data->gpr = syscon_node_to_regmap(gpr_np); + if (IS_ERR(data->gpr)) { + ret = PTR_ERR(data->gpr); + dev_err(&pdev->dev, "failed to get gpr regmap\n"); + goto fail; + } + } + + of_property_read_u32_array(pdev->dev.of_node, "hp-det", data->hp_det, 2); + data->dai.name = "HiFi"; data->dai.stream_name = "HiFi"; data->dai.codec_dai_name = "wm8960-hifi"; |