diff mbox

[2/3] ASoC: mediatek: Add machine driver for MAX98090 codec

Message ID 1433946276-25969-3-git-send-email-koro.chen@mediatek.com (mailing list archive)
State New, archived
Headers show

Commit Message

Koro Chen June 10, 2015, 2:24 p.m. UTC
This is the DPCM based machine driver with MAX98090

Signed-off-by: Koro Chen <koro.chen@mediatek.com>
---
 .../devicetree/bindings/sound/mt8173-max98090.txt  |  17 ++
 sound/soc/mediatek/Kconfig                         |  11 +
 sound/soc/mediatek/Makefile                        |   2 +
 sound/soc/mediatek/mt8173-max98090.c               | 260 +++++++++++++++++++++
 4 files changed, 290 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/mt8173-max98090.txt
 create mode 100644 sound/soc/mediatek/mt8173-max98090.c

Comments

Mark Brown June 12, 2015, 1:13 p.m. UTC | #1
On Wed, Jun 10, 2015 at 10:24:35PM +0800, Koro Chen wrote:

> --- /dev/null
> +++ b/Documentation/devicetree/bindings/sound/mt8173-max98090.txt
> @@ -0,0 +1,17 @@
> +MT8173 with MAX98090 CODEC
> +
> +Required properties:
> +- compatible : "mediatek,mt8173-max98090"
> +- mediatek,audio-codec: the phandle of the MAX98090 audio codec
> +- dvdd-supply : the phandle of regulator to supply 1.2V
> +- avdd-supply : the phandle of regulator to supply 1.8V

Why are these supplies part of the machine driver?

> +config SND_SOC_MT8173_MAX98090
> +	bool "ASoC Audio driver for MT8173 with MAX98090 codec"

Why bool?

> +	codec_node = of_parse_phandle(pdev->dev.of_node,
> +				      "mediatek,audio-codec", 0);
> +	if (!codec_node) {
> +		dev_err(&pdev->dev,
> +			"Property 'audio-codec' missing or invalid\n");
> +	} else {

Isn't this a fatal error?

> +	/* set codec DVDD voltage */
> +	reg_dvdd = devm_regulator_get(&pdev->dev, "dvdd");
> +	if (IS_ERR(reg_dvdd)) {
> +		dev_err(&pdev->dev, "failed to get dvdd\n");
> +		return PTR_ERR(reg_dvdd);
> +	}
> +	ret = regulator_set_voltage(reg_dvdd, 1220000, 1220000);
> +	if (ret != 0) {
> +		dev_err(&pdev->dev, "Failed to set dvdd: %d\n", ret);
> +		return ret;
> +	}

No, this is not appropriate for a machine driver - this is something the
regulator constraints set for the board should do.

> +	dev_info(&pdev->dev, "dvdd = %d uv\n",
> +		 regulator_get_voltage(reg_dvdd));

Don't include debugging stuff like this please.

> +	ret = regulator_enable(reg_dvdd);
> +	if (ret != 0) {
> +		dev_err(&pdev->dev, "Failed to enable dvdd: %d\n", ret);
> +		return ret;
> +	}

IF this is for the CODEC then you should add regulator support to the
CODEC driver.
Koro Chen June 15, 2015, 2:31 a.m. UTC | #2
On Fri, 2015-06-12 at 14:13 +0100, Mark Brown wrote:
> On Wed, Jun 10, 2015 at 10:24:35PM +0800, Koro Chen wrote:
> 
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/sound/mt8173-max98090.txt
> > @@ -0,0 +1,17 @@
> > +MT8173 with MAX98090 CODEC
> > +
> > +Required properties:
> > +- compatible : "mediatek,mt8173-max98090"
> > +- mediatek,audio-codec: the phandle of the MAX98090 audio codec
> > +- dvdd-supply : the phandle of regulator to supply 1.2V
> > +- avdd-supply : the phandle of regulator to supply 1.8V
> 
> Why are these supplies part of the machine driver?
> 
These are for the codec as you said. I think I should remove all these
supplies as well as codes in machine drivers, since now the regulators
are configured during the board's bootloader stage.

> > +config SND_SOC_MT8173_MAX98090
> > +	bool "ASoC Audio driver for MT8173 with MAX98090 codec"
> 
> Why bool?
> 
This should be tristate as Paul mentioned before. I will fix it.
> > +	codec_node = of_parse_phandle(pdev->dev.of_node,
> > +				      "mediatek,audio-codec", 0);
> > +	if (!codec_node) {
> > +		dev_err(&pdev->dev,
> > +			"Property 'audio-codec' missing or invalid\n");
> > +	} else {
> 
> Isn't this a fatal error?
> 
Thank you and yes it should be fatal, I will fix it.
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/sound/mt8173-max98090.txt b/Documentation/devicetree/bindings/sound/mt8173-max98090.txt
new file mode 100644
index 0000000..8d6b84c
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/mt8173-max98090.txt
@@ -0,0 +1,17 @@ 
+MT8173 with MAX98090 CODEC
+
+Required properties:
+- compatible : "mediatek,mt8173-max98090"
+- mediatek,audio-codec: the phandle of the MAX98090 audio codec
+- dvdd-supply : the phandle of regulator to supply 1.2V
+- avdd-supply : the phandle of regulator to supply 1.8V
+
+Example:
+
+	sound {
+		compatible = "mediatek,mt8173-max98090";
+		mediatek,audio-codec = <&max98090>;
+		dvdd-supply = <&mt6397_vgp1_reg>;
+		avdd-supply = <&mt6397_vgp4_reg>;
+	};
+
diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig
index 38630d4..6fb337e 100644
--- a/sound/soc/mediatek/Kconfig
+++ b/sound/soc/mediatek/Kconfig
@@ -7,3 +7,14 @@  config SND_SOC_MEDIATEK
 	  Select Y if you have such device.
 	  Ex: MT8173
 
+config SND_SOC_MT8173_MAX98090
+	bool "ASoC Audio driver for MT8173 with MAX98090 codec"
+	depends on ARCH_MEDIATEK
+	select SND_SOC_MEDIATEK
+	select SND_SOC_MAX98090
+	help
+	  This adds ASoC driver for Mediatek MT8173 boards
+	  with the MAX98090 audio codec.
+	  Select Y if you have such device.
+	  If unsure select "N".
+
diff --git a/sound/soc/mediatek/Makefile b/sound/soc/mediatek/Makefile
index 5f27cc7..08fa765 100644
--- a/sound/soc/mediatek/Makefile
+++ b/sound/soc/mediatek/Makefile
@@ -1,2 +1,4 @@ 
 # MTK Platform Support
 obj-$(CONFIG_SND_SOC_MEDIATEK) += mtk-afe-pcm.o
+# Machine support
+obj-$(CONFIG_SND_SOC_MT8173_MAX98090) += mt8173-max98090.o
diff --git a/sound/soc/mediatek/mt8173-max98090.c b/sound/soc/mediatek/mt8173-max98090.c
new file mode 100644
index 0000000..5cb782a
--- /dev/null
+++ b/sound/soc/mediatek/mt8173-max98090.c
@@ -0,0 +1,260 @@ 
+/*
+ * mt8173-max98090.c  --  MT8173 MAX98090 ALSA SoC machine driver
+ *
+ * Copyright (c) 2015 MediaTek Inc.
+ * Author: Koro Chen <koro.chen@mediatek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <sound/soc.h>
+#include <sound/jack.h>
+#include <linux/gpio.h>
+#include <linux/regulator/consumer.h>
+#include "../codecs/max98090.h"
+
+static struct snd_soc_jack mt8173_max98090_jack;
+
+static struct snd_soc_jack_pin mt8173_max98090_jack_pins[] = {
+	{
+		.pin	= "Headphone",
+		.mask	= SND_JACK_HEADPHONE,
+	},
+	{
+		.pin	= "Headset Mic",
+		.mask	= SND_JACK_MICROPHONE,
+	},
+};
+
+static const struct snd_soc_dapm_widget mt8173_max98090_widgets[] = {
+	SND_SOC_DAPM_SPK("Speaker", NULL),
+	SND_SOC_DAPM_MIC("Int Mic", NULL),
+	SND_SOC_DAPM_HP("Headphone", NULL),
+	SND_SOC_DAPM_MIC("Headset Mic", NULL),
+};
+
+static const struct snd_soc_dapm_route mt8173_max98090_routes[] = {
+	{"Speaker", NULL, "SPKL"},
+	{"Speaker", NULL, "SPKR"},
+	{"DMICL", NULL, "Int Mic"},
+	{"Headphone", NULL, "HPL"},
+	{"Headphone", NULL, "HPR"},
+	{"Headset Mic", NULL, "MICBIAS"},
+	{"IN34", NULL, "Headset Mic"},
+};
+
+static const struct snd_kcontrol_new mt8173_max98090_controls[] = {
+	SOC_DAPM_PIN_SWITCH("Speaker"),
+	SOC_DAPM_PIN_SWITCH("Int Mic"),
+	SOC_DAPM_PIN_SWITCH("Headphone"),
+	SOC_DAPM_PIN_SWITCH("Headset Mic"),
+};
+
+static int mt8173_max98090_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;
+
+	return snd_soc_dai_set_sysclk(codec_dai, 0, params_rate(params) * 256,
+				      SND_SOC_CLOCK_IN);
+}
+
+static struct snd_soc_ops mt8173_max98090_ops = {
+	.hw_params = mt8173_max98090_hw_params,
+};
+
+static int mt8173_max98090_init(struct snd_soc_pcm_runtime *runtime)
+{
+	int ret;
+	struct snd_soc_card *card = runtime->card;
+	struct snd_soc_codec *codec = runtime->codec;
+
+	/* enable jack detection */
+	ret = snd_soc_card_jack_new(card, "Headphone", SND_JACK_HEADPHONE,
+				    &mt8173_max98090_jack, NULL, 0);
+	if (ret) {
+		dev_err(card->dev, "Can't snd_soc_jack_new %d\n", ret);
+		return ret;
+	}
+
+	ret = snd_soc_jack_add_pins(&mt8173_max98090_jack,
+				    ARRAY_SIZE(mt8173_max98090_jack_pins),
+				    mt8173_max98090_jack_pins);
+	if (ret) {
+		dev_err(card->dev, "Can't snd_soc_jack_add_pins %d\n", ret);
+		return ret;
+	}
+
+	return max98090_mic_detect(codec, &mt8173_max98090_jack);
+}
+
+/* Digital audio interface glue - connects codec <---> CPU */
+static struct snd_soc_dai_link mt8173_max98090_dais[] = {
+	/* Front End DAI links */
+	{
+		.name = "MAX98090 Playback",
+		.stream_name = "MAX98090 Playback",
+		.cpu_dai_name = "DL1",
+		.platform_name = "11220000.mt8173-afe-pcm",
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+		.dynamic = 1,
+		.dpcm_playback = 1,
+	},
+	{
+		.name = "MAX98090 Capture",
+		.stream_name = "MAX98090 Capture",
+		.cpu_dai_name = "VUL",
+		.platform_name = "11220000.mt8173-afe-pcm",
+		.codec_name = "snd-soc-dummy",
+		.codec_dai_name = "snd-soc-dummy-dai",
+		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+		.dynamic = 1,
+		.dpcm_capture = 1,
+	},
+	/* Back End DAI links */
+	{
+		.name = "Codec",
+		.cpu_dai_name = "I2S",
+		.platform_name = "11220000.mt8173-afe-pcm",
+		.no_pcm = 1,
+		.codec_dai_name = "HiFi",
+		.codec_name = "max98090.1-0010",
+		.init = mt8173_max98090_init,
+		.ops = &mt8173_max98090_ops,
+		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+			   SND_SOC_DAIFMT_CBS_CFS,
+		.dpcm_playback = 1,
+		.dpcm_capture = 1,
+	},
+};
+
+static struct snd_soc_card mt8173_max98090_card = {
+	.name = "mt8173-max98090",
+	.dai_link = mt8173_max98090_dais,
+	.num_links = ARRAY_SIZE(mt8173_max98090_dais),
+	.controls = mt8173_max98090_controls,
+	.num_controls = ARRAY_SIZE(mt8173_max98090_controls),
+	.dapm_widgets = mt8173_max98090_widgets,
+	.num_dapm_widgets = ARRAY_SIZE(mt8173_max98090_widgets),
+	.dapm_routes = mt8173_max98090_routes,
+	.num_dapm_routes = ARRAY_SIZE(mt8173_max98090_routes),
+};
+
+static int mt8173_max98090_dev_probe(struct platform_device *pdev)
+{
+	struct snd_soc_card *card = &mt8173_max98090_card;
+	struct device_node *codec_node;
+	struct regulator *reg_dvdd, *reg_avdd;
+	int ret, i;
+
+	codec_node = of_parse_phandle(pdev->dev.of_node,
+				      "mediatek,audio-codec", 0);
+	if (!codec_node) {
+		dev_err(&pdev->dev,
+			"Property 'audio-codec' missing or invalid\n");
+	} else {
+		for (i = 0; i < card->num_links; i++) {
+			if (mt8173_max98090_dais[i].codec_name &&
+			    !strcmp(mt8173_max98090_dais[i].codec_name,
+				    "snd-soc-dummy"))
+				continue;
+			mt8173_max98090_dais[i].codec_name = NULL;
+			mt8173_max98090_dais[i].codec_of_node = codec_node;
+		}
+	}
+
+	/* set codec DVDD voltage */
+	reg_dvdd = devm_regulator_get(&pdev->dev, "dvdd");
+	if (IS_ERR(reg_dvdd)) {
+		dev_err(&pdev->dev, "failed to get dvdd\n");
+		return PTR_ERR(reg_dvdd);
+	}
+	ret = regulator_set_voltage(reg_dvdd, 1220000, 1220000);
+	if (ret != 0) {
+		dev_err(&pdev->dev, "Failed to set dvdd: %d\n", ret);
+		return ret;
+	}
+	dev_info(&pdev->dev, "dvdd = %d uv\n",
+		 regulator_get_voltage(reg_dvdd));
+
+	ret = regulator_enable(reg_dvdd);
+	if (ret != 0) {
+		dev_err(&pdev->dev, "Failed to enable dvdd: %d\n", ret);
+		return ret;
+	}
+
+	/* set codec AVDD/HPVDD/DVDDIO voltage */
+	reg_avdd = devm_regulator_get(&pdev->dev, "avdd");
+	if (IS_ERR(reg_avdd)) {
+		dev_err(&pdev->dev, "failed to get avdd\n");
+		return PTR_ERR(reg_avdd);
+	}
+	ret = regulator_set_voltage(reg_avdd, 1800000, 1800000);
+	if (ret != 0) {
+		dev_err(&pdev->dev, "Failed to set avdd: %d\n", ret);
+		return ret;
+	}
+	dev_info(&pdev->dev, "avdd voltage = %d uv\n",
+		 regulator_get_voltage(reg_avdd));
+
+	ret = regulator_enable(reg_avdd);
+	if (ret != 0) {
+		dev_err(&pdev->dev, "Failed to enable avdd: %d\n", ret);
+		return ret;
+	}
+
+	card->dev = &pdev->dev;
+
+	ret = snd_soc_register_card(card);
+	if (ret)
+		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",
+			__func__, ret);
+	return ret;
+}
+
+static int mt8173_max98090_dev_remove(struct platform_device *pdev)
+{
+	struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+	snd_soc_unregister_card(card);
+	return 0;
+}
+
+static const struct of_device_id mt8173_max98090_dt_match[] = {
+	{ .compatible = "mediatek,mt8173-max98090", },
+	{ }
+};
+
+static struct platform_driver mt8173_max98090_driver = {
+	.driver = {
+		   .name = "mt8173-max98090",
+		   .owner = THIS_MODULE,
+		   .of_match_table = mt8173_max98090_dt_match,
+#ifdef CONFIG_PM
+		   .pm = &snd_soc_pm_ops,
+#endif
+	},
+	.probe = mt8173_max98090_dev_probe,
+	.remove = mt8173_max98090_dev_remove,
+};
+
+module_platform_driver(mt8173_max98090_driver);
+
+/* Module information */
+MODULE_DESCRIPTION("MT8173 MAX98090 ALSA SoC machine driver");
+MODULE_AUTHOR("Koro Chen <koro.chen@mediatek.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:mt8173-max98090");
+MODULE_DEVICE_TABLE(of, mt8173_max98090_dt_match);
+