mx53: imx-wm8711

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 5b428b060d418da78286a605060c4cb4c019801b..fff7d57bc5389a254a6952c4958fa2671fa88315 100644 (file)
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -90,7 +90,7 @@ SND_SOC_DAPM_OUTPUT("RHPOUT"),
 
 static const struct snd_soc_dapm_route wm8711_intercon[] = {
        /* output mixer */
-       {"Output Mixer", "Line Bypass Switch", "Line Input"},
+       //{"Output Mixer", "Line Bypass Switch", "Line Input"},
        {"Output Mixer", "HiFi Playback Switch", "DAC"},
 
        /* outputs */

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index aa438546c91271f69c26beb1646b85f4b34357cf..590faf2adb992bf600d47d6e69dfae45070c04c6 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -180,6 +180,18 @@ config SND_SOC_IMX_WM8962
          Say Y if you want to add support for SoC audio on an i.MX board with
          a wm8962 codec.
 
+config SND_SOC_IMX_WM8711
+       tristate "SoC Audio support for i.MX boards with wm8711"
+       depends on OF && I2C
+       select SND_SOC_WM8711
+       select SND_SOC_IMX_PCM_DMA
+       select SND_SOC_IMX_AUDMUX
+       select SND_SOC_FSL_SSI
+       select SND_SOC_FSL_UTILS
+       help
+         Say Y if you want to add support for SoC audio on an i.MX board with
+         a wm8711 codec.
+
 config SND_SOC_IMX_SGTL5000
        tristate "SoC Audio support for i.MX boards with sgtl5000"
        depends on OF && I2C

diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile
index d4b4aa8b5649d3ccefdedc6a51852dafacf2286f..dafc3439bd0a87646d4fa769c603b7e5a35ae337 100644 (file)
--- a/sound/soc/fsl/Makefile
+++ b/sound/soc/fsl/Makefile
@@ -42,6 +42,7 @@ snd-soc-phycore-ac97-objs := phycore-ac97.o
 snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o
 snd-soc-wm1133-ev1-objs := wm1133-ev1.o
 snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
+snd-soc-imx-wm8711-objs := imx-wm8711.o
 snd-soc-imx-wm8962-objs := imx-wm8962.o
 snd-soc-imx-mc13783-objs := imx-mc13783.o
 
@@ -50,5 +51,6 @@ obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
 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_SGTL5000) += snd-soc-imx-sgtl5000.o
+obj-$(CONFIG_SND_SOC_IMX_WM8711) += snd-soc-imx-wm8711.o
 obj-$(CONFIG_SND_SOC_IMX_WM8962) += snd-soc-imx-wm8962.o
 obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o

diff --git a/sound/soc/fsl/imx-wm8711.c b/sound/soc/fsl/imx-wm8711.c
new file mode 100644 (file)
index 0000000..1a4780f
--- /dev/null
+++ b/sound/soc/fsl/imx-wm8711.c
@@ -0,0 +1,224 @@
+/*
+ * Copyright Pikron s.r.o 2013
+ *
+ * Based on imx-wm8711.c
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2012 Linaro Ltd.
+ *
+ * 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.h>
+#include <linux/of_platform.h>
+#include <linux/of_i2c.h>
+#include <linux/clk.h>
+#include <sound/soc.h>
+
+#include "../codecs/wm8711.h"
+#include "imx-audmux.h"
+
+#define DAI_NAME_SIZE  32
+
+struct imx_wm8711_data {
+       struct snd_soc_dai_link dai;
+       struct snd_soc_card card;
+       char codec_dai_name[DAI_NAME_SIZE];
+       char platform_name[DAI_NAME_SIZE];
+       struct clk *codec_clk;
+       unsigned int clk_frequency;
+};
+
+static int imx_wm8711_dai_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct imx_wm8711_data *data = container_of(rtd->card,
+                                       struct imx_wm8711_data, card);
+       struct device *dev = rtd->card->dev;
+       int ret;
+
+       printk("   ## clk_freq: %d\n", data->clk_frequency);
+       ret = snd_soc_dai_set_sysclk(rtd->codec_dai, WM8711_SYSCLK,
+                                    data->clk_frequency, SND_SOC_CLOCK_IN);
+       if (ret) {
+               dev_err(dev, "could not set codec driver clock params\n");
+               return ret;
+       }
+
+       return 0;
+}
+
+static const struct snd_kcontrol_new wm8711_output_mixer_controls[] = {
+       SOC_DAPM_SINGLE("Line Bypass Switch", WM8711_APANA, 3, 1, 0),
+       SOC_DAPM_SINGLE("HiFi Playback Switch", WM8711_APANA, 4, 1, 0),
+};
+
+static const struct snd_soc_dapm_widget imx_wm8711_dapm_widgets[] = {
+       SND_SOC_DAPM_MIXER("Output Mixer", WM8711_PWR, 4, 1,
+               &wm8711_output_mixer_controls[0],
+               ARRAY_SIZE(wm8711_output_mixer_controls)),
+       SND_SOC_DAPM_DAC("DAC", "HiFi Playback", WM8711_PWR, 3, 1),
+       SND_SOC_DAPM_OUTPUT("LOUT"),
+       SND_SOC_DAPM_OUTPUT("LHPOUT"),
+       SND_SOC_DAPM_OUTPUT("ROUT"),
+       SND_SOC_DAPM_OUTPUT("RHPOUT"),
+};
+
+static int imx_wm8711_probe(struct platform_device *pdev)
+{
+       struct device_node *np = pdev->dev.of_node;
+       struct device_node *ssi_np, *codec_np;
+       struct platform_device *ssi_pdev;
+       struct i2c_client *codec_dev;
+       struct imx_wm8711_data *data;
+       int int_port, ext_port;
+       int ret;
+
+       ret = of_property_read_u32(np, "mux-int-port", &int_port);
+       if (ret) {
+               dev_err(&pdev->dev, "mux-int-port missing or invalid\n");
+               return ret;
+       }
+       ret = of_property_read_u32(np, "mux-ext-port", &ext_port);
+       if (ret) {
+               dev_err(&pdev->dev, "mux-ext-port missing or invalid\n");
+               return ret;
+       }
+
+       /*
+        * The port numbering in the hardware manual starts at 1, while
+        * the audmux API expects it starts at 0.
+        */
+       int_port--;
+       ext_port--;
+       ret = imx_audmux_v2_configure_port(int_port,
+                       IMX_AUDMUX_V2_PTCR_SYN |
+                       IMX_AUDMUX_V2_PTCR_TFSEL(ext_port) |
+                       IMX_AUDMUX_V2_PTCR_TCSEL(ext_port) |
+                       IMX_AUDMUX_V2_PTCR_TFSDIR |
+                       IMX_AUDMUX_V2_PTCR_TCLKDIR,
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port));
+       if (ret) {
+               dev_err(&pdev->dev, "audmux internal port setup failed\n");
+               return ret;
+       }
+       ret = imx_audmux_v2_configure_port(ext_port,
+                       IMX_AUDMUX_V2_PTCR_SYN,
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(int_port));
+       if (ret) {
+               dev_err(&pdev->dev, "audmux external port setup failed\n");
+               return ret;
+       }
+
+       ssi_np = of_parse_phandle(pdev->dev.of_node, "ssi-controller", 0);
+       codec_np = of_parse_phandle(pdev->dev.of_node, "audio-codec", 0);
+       if (!ssi_np || !codec_np) {
+               dev_err(&pdev->dev, "phandle missing or invalid\n");
+               ret = -EINVAL;
+               goto fail;
+       }
+
+       ssi_pdev = of_find_device_by_node(ssi_np);
+       if (!ssi_pdev) {
+               dev_err(&pdev->dev, "failed to find SSI platform device\n");
+               ret = -EPROBE_DEFER;
+               goto fail;
+       }
+       codec_dev = of_find_i2c_device_by_node(codec_np);
+       if (!codec_dev) {
+               dev_err(&pdev->dev, "failed to find codec platform device\n");
+               return -EPROBE_DEFER;
+       }
+
+       data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+       if (!data) {
+               ret = -ENOMEM;
+               goto fail;
+       }
+
+       data->codec_clk = devm_clk_get(&codec_dev->dev, NULL);
+       if (IS_ERR(data->codec_clk))
+               goto fail;
+
+       // FIXME // data->clk_frequency = 12000000; // Codec chip has clock supplied by a fixed oscillator
+       data->clk_frequency = clk_get_rate(data->codec_clk);
+
+       data->dai.name = "HiFi";
+       data->dai.stream_name = "HiFi";
+       data->dai.codec_dai_name = "wm8711-hifi";
+       data->dai.codec_of_node = codec_np;
+       data->dai.cpu_of_node = ssi_np;
+       data->dai.platform_of_node = ssi_np;
+       data->dai.init = &imx_wm8711_dai_init;
+       data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                           SND_SOC_DAIFMT_CBM_CFM;
+
+       data->card.dev = &pdev->dev;
+       ret = snd_soc_of_parse_card_name(&data->card, "model");
+       if (ret)
+               goto fail;
+       ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing");
+       if (ret)
+               goto fail;
+       data->card.num_links = 1;
+       data->card.owner = THIS_MODULE;
+       data->card.dai_link = &data->dai;
+       data->card.dapm_widgets = imx_wm8711_dapm_widgets;
+       data->card.num_dapm_widgets = ARRAY_SIZE(imx_wm8711_dapm_widgets);
+
+printk("  AA\n");
+       ret = snd_soc_register_card(&data->card);
+printk("  BB\n");
+       if (ret) {
+               dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+               goto fail;
+       }
+
+       platform_set_drvdata(pdev, data);
+       of_node_put(ssi_np);
+       of_node_put(codec_np);
+
+       return 0;
+
+fail:
+       if (ssi_np)
+               of_node_put(ssi_np);
+       if (codec_np)
+               of_node_put(codec_np);
+
+       return ret;
+}
+
+static int imx_wm8711_remove(struct platform_device *pdev)
+{
+       struct imx_wm8711_data *data = platform_get_drvdata(pdev);
+
+       snd_soc_unregister_card(&data->card);
+
+       return 0;
+}
+
+static const struct of_device_id imx_wm8711_dt_ids[] = {
+       { .compatible = "fsl,imx-audio-wm8711", },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, imx_wm8711_dt_ids);
+
+static struct platform_driver imx_wm8711_driver = {
+       .driver = {
+               .name = "imx-wm8711",
+               .owner = THIS_MODULE,
+               .of_match_table = imx_wm8711_dt_ids,
+       },
+       .probe = imx_wm8711_probe,
+       .remove = imx_wm8711_remove,
+};
+module_platform_driver(imx_wm8711_driver);
+
+MODULE_DESCRIPTION("Freescale i.MX WM8711 ASoC machine driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:imx-wm8711");