From 94dc32841c85c112ca24dfbbe76dea7f3ed371c3 Mon Sep 17 00:00:00 2001 From: Nitin Pai Date: Fri, 6 Jul 2012 16:31:11 +0530 Subject: asoc: tegra: p852: Added machine driver for P852 Renamed P1852 machine driver to VCM so that can be used for P1852/P852 and E1853 as well. Bug 1008391 Signed-off-by: Nitin Pai Reviewed-on: http://git-master/r/113886 (cherry picked from commit 5eb23e30bab716b28146b85438989e58761c7136) Change-Id: I8d1363a6419c6381b8d23ebd38d625fb482084dc Reviewed-on: http://git-master/r/116056 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Scott Peterson --- sound/soc/tegra/Makefile | 5 +- sound/soc/tegra/tegra_p1852.c | 303 ---------------------------------------- sound/soc/tegra/tegra_vcm.c | 312 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 315 insertions(+), 305 deletions(-) delete mode 100644 sound/soc/tegra/tegra_p1852.c create mode 100644 sound/soc/tegra/tegra_vcm.c (limited to 'sound') diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile index 7af02a69b8ae..83f30054a085 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile @@ -33,7 +33,7 @@ snd-soc-tegra-max98088-objs := tegra_max98088.o snd-soc-tegra-aic326x-objs := tegra_aic326x.o snd-soc-tegra-rt5640-objs := tegra_rt5640.o snd-soc-tegra-max98095-objs := tegra_max98095.o -snd-soc-tegra-p1852-objs := tegra_p1852.o +snd-soc-tegra-vcm-objs := tegra_vcm.o obj-$(CONFIG_SND_SOC_TEGRA_WM8903) += snd-soc-tegra-wm8903.o obj-$(CONFIG_SND_SOC_TEGRA_TRIMSLICE) += snd-soc-tegra-trimslice.o @@ -42,4 +42,5 @@ obj-$(CONFIG_SND_SOC_TEGRA_MAX98088) += snd-soc-tegra-max98088.o obj-$(CONFIG_SND_SOC_TEGRA_TLV320AIC326X) += snd-soc-tegra-aic326x.o obj-$(CONFIG_SND_SOC_TEGRA_RT5640) += snd-soc-tegra-rt5640.o obj-$(CONFIG_SND_SOC_TEGRA_MAX98095) += snd-soc-tegra-max98095.o -obj-$(CONFIG_SND_SOC_TEGRA_P1852) += snd-soc-tegra-p1852.o +obj-$(CONFIG_SND_SOC_TEGRA_P1852) += snd-soc-tegra-vcm.o +obj-$(CONFIG_SND_SOC_TEGRA_P852) += snd-soc-tegra-vcm.o diff --git a/sound/soc/tegra/tegra_p1852.c b/sound/soc/tegra/tegra_p1852.c deleted file mode 100644 index 199bb8046636..000000000000 --- a/sound/soc/tegra/tegra_p1852.c +++ /dev/null @@ -1,303 +0,0 @@ -/* - * tegra_p1852.c - Tegra machine ASoC driver for P1852 Boards. - * - * Author: Nitin Pai - * Copyright (C) 2010-2012 - NVIDIA, Inc. - * - * Based on code copyright/by: - * Copyright (c) 2009-2010, NVIDIA Corporation. - * Stephen Warren - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - -#include - -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include "tegra_pcm.h" -#include "tegra_asoc_utils.h" - -#define DRV_NAME "tegra-snd-p1852" - -struct tegra_p1852 { - struct tegra_asoc_utils_data util_data; - struct tegra_p1852_platform_data *pdata; -}; - -static int tegra_p1852_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - int codec_id) -{ - 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 = codec->card; - struct tegra_p1852 *machine = snd_soc_card_get_drvdata(card); - int srate, mclk; - int i2s_daifmt = 0; - int err; - struct tegra_p1852_platform_data *pdata; - - pdata = machine->pdata; - - srate = params_rate(params); - switch (srate) { - case 64000: - case 88200: - case 96000: - mclk = 128 * srate; - break; - default: - mclk = 256 * srate; - break; - } - - err = tegra_asoc_utils_set_rate(&machine->util_data, srate, mclk); - if (err < 0) { - if (!(machine->util_data.set_mclk % mclk)) - mclk = machine->util_data.set_mclk; - else { - dev_err(card->dev, "Can't configure clocks\n"); - return err; - } - } - - tegra_asoc_utils_lock_clk_rate(&machine->util_data, 1); - - if (pdata->codec_info[codec_id].master) - i2s_daifmt |= SND_SOC_DAIFMT_CBM_CFM; - else - i2s_daifmt |= SND_SOC_DAIFMT_CBS_CFS; - - switch (pdata->codec_info[codec_id].i2s_format) { - case format_tdm: - i2s_daifmt |= SND_SOC_DAIFMT_DSP_A; - break; - case format_i2s: - i2s_daifmt |= SND_SOC_DAIFMT_I2S; - break; - case format_rjm: - i2s_daifmt |= SND_SOC_DAIFMT_RIGHT_J; - break; - case format_ljm: - i2s_daifmt |= SND_SOC_DAIFMT_LEFT_J; - break; - default: - break; - } - - err = snd_soc_dai_set_fmt(codec_dai, i2s_daifmt); - if (err < 0) - dev_info(card->dev, "codec_dai fmt not set\n"); - - err = snd_soc_dai_set_fmt(cpu_dai, i2s_daifmt); - if (err < 0) { - dev_err(card->dev, "cpu_dai fmt not set\n"); - return err; - } - err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, - SND_SOC_CLOCK_IN); - if (err < 0) - dev_info(card->dev, "codec_dai clock not set\n"); - - if (pdata->codec_info[codec_id].i2s_format == - format_tdm) { - err = snd_soc_dai_set_tdm_slot(cpu_dai, - pdata->codec_info[codec_id].rx_mask, - pdata->codec_info[codec_id].tx_mask, - pdata->codec_info[codec_id].num_slots, - pdata->codec_info[codec_id].slot_width); - if (err < 0) - dev_err(card->dev, "cpu_dai tdm mode setting not done\n"); - } - - return 0; -} - -static int tegra_p1852_hw_params_controller1( - struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - return tegra_p1852_hw_params(substream, params, 0); -} - -static int tegra_p1852_hw_params_controller2( - struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - return tegra_p1852_hw_params(substream, params, 1); -} - -static int tegra_hw_free(struct snd_pcm_substream *substream) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct tegra_p1852 *machine = snd_soc_card_get_drvdata(rtd->card); - - tegra_asoc_utils_lock_clk_rate(&machine->util_data, 0); - - return 0; -} - -static struct snd_soc_ops tegra_p1852_ops_controller1 = { - .hw_params = tegra_p1852_hw_params_controller1, - .hw_free = tegra_hw_free, -}; -static struct snd_soc_ops tegra_p1852_ops_controller2 = { - .hw_params = tegra_p1852_hw_params_controller2, - .hw_free = tegra_hw_free, -}; - -static struct snd_soc_dai_link tegra_p1852_dai_link[] = { - { - .name = "I2S-TDM-1", - .stream_name = "TEGRA PCM", - .platform_name = "tegra-pcm-audio", - .ops = &tegra_p1852_ops_controller1, - }, - { - .name = "I2S-TDM-2", - .stream_name = "TEGRA PCM", - .platform_name = "tegra-pcm-audio", - .ops = &tegra_p1852_ops_controller2, - } -}; - -static struct snd_soc_card snd_soc_tegra_p1852 = { - .name = "tegra-p1852", - .dai_link = tegra_p1852_dai_link, - .num_links = ARRAY_SIZE(tegra_p1852_dai_link), -}; - -static __devinit int tegra_p1852_driver_probe(struct platform_device *pdev) -{ - struct snd_soc_card *card = &snd_soc_tegra_p1852; - struct tegra_p1852 *machine; - struct tegra_p1852_platform_data *pdata; - int ret; - int i; - - pdata = pdev->dev.platform_data; - if (!pdata) { - dev_err(&pdev->dev, "No platform data supplied\n"); - return -EINVAL; - } - - machine = kzalloc(sizeof(struct tegra_p1852), GFP_KERNEL); - if (!machine) { - dev_err(&pdev->dev, "Can't allocate tegra_p1852 struct\n"); - return -ENOMEM; - } - - machine->pdata = pdata; - - /* The codec driver and codec dai have to come from the system - * level board configuration file - * */ - for (i = 0; i < ARRAY_SIZE(tegra_p1852_dai_link); i++) { - tegra_p1852_dai_link[i].codec_name = - pdata->codec_info[i].codec_name; - tegra_p1852_dai_link[i].cpu_dai_name = - pdata->codec_info[i].cpu_dai_name; - tegra_p1852_dai_link[i].codec_dai_name = - pdata->codec_info[i].codec_dai_name; - tegra_p1852_dai_link[i].name = - pdata->codec_info[i].name; - if (pdata->codec_info[i].pcm_driver) - tegra_p1852_dai_link[i].platform_name = - pdata->codec_info[i].pcm_driver; - } - - ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); - if (ret) - goto err_free_machine; - - card->dev = &pdev->dev; - platform_set_drvdata(pdev, card); - snd_soc_card_set_drvdata(card, machine); - - ret = snd_soc_register_card(card); - if (ret) { - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", - ret); - } - - if (!card->instantiated) { - ret = -ENODEV; - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", - ret); - goto err_unregister_card; - } - - return 0; - -err_unregister_card: - snd_soc_unregister_card(card); - tegra_asoc_utils_fini(&machine->util_data); -err_free_machine: - kfree(machine); - return ret; -} - -static int __devexit tegra_p1852_driver_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - struct tegra_p1852 *machine = snd_soc_card_get_drvdata(card); - - snd_soc_unregister_card(card); - tegra_asoc_utils_fini(&machine->util_data); - kfree(machine); - - return 0; -} - -static struct platform_driver tegra_p1852_driver = { - .driver = { - .name = DRV_NAME, - .owner = THIS_MODULE, - .pm = &snd_soc_pm_ops, - }, - .probe = tegra_p1852_driver_probe, - .remove = __devexit_p(tegra_p1852_driver_remove), -}; - -static int __init tegra_p1852_modinit(void) -{ - return platform_driver_register(&tegra_p1852_driver); -} -module_init(tegra_p1852_modinit); - -static void __exit tegra_p1852_modexit(void) -{ - platform_driver_unregister(&tegra_p1852_driver); -} -module_exit(tegra_p1852_modexit); - -MODULE_AUTHOR("Nitin Pai "); -MODULE_DESCRIPTION("Tegra+P1852 machine ASoC driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/tegra/tegra_vcm.c b/sound/soc/tegra/tegra_vcm.c new file mode 100644 index 000000000000..afb444e3f19f --- /dev/null +++ b/sound/soc/tegra/tegra_vcm.c @@ -0,0 +1,312 @@ +/* + * tegra_vcm.c - Tegra machine ASoC driver for P852/P1852/P1853 Boards. + * + * Author: Nitin Pai + * Copyright (C) 2010-2012 - NVIDIA, Corporation. All rights reserved. + * + * Based on code copyright/by: + * Copyright (c) 2009-2010, NVIDIA Corporation. + * Stephen Warren + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#include + +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include "tegra_pcm.h" +#include "tegra_asoc_utils.h" + +#ifdef CONFIG_MACH_P1852 +#define DRV_NAME "tegra-snd-p1852" +#endif +#ifdef CONFIG_MACH_E1853 +#define DRV_NAME "tegra-snd-e1853" +#endif +#ifdef CONFIG_MACH_P852 +#define DRV_NAME "tegra-snd-p852" +#endif + + +struct tegra_vcm { + struct tegra_asoc_utils_data util_data; + struct tegra_p1852_platform_data *pdata; +}; + +static int tegra_vcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + int codec_id) +{ + 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 = codec->card; + struct tegra_vcm *machine = snd_soc_card_get_drvdata(card); + int srate, mclk; + int i2s_daifmt = 0; + int err; + struct tegra_p1852_platform_data *pdata; + + pdata = machine->pdata; + + srate = params_rate(params); + switch (srate) { + case 64000: + case 88200: + case 96000: + mclk = 128 * srate; + break; + default: + mclk = 256 * srate; + break; + } + + err = tegra_asoc_utils_set_rate(&machine->util_data, srate, mclk); + if (err < 0) { + if (!(machine->util_data.set_mclk % mclk)) + mclk = machine->util_data.set_mclk; + else { + dev_err(card->dev, "Can't configure clocks\n"); + return err; + } + } + + tegra_asoc_utils_lock_clk_rate(&machine->util_data, 1); + + if (pdata->codec_info[codec_id].master) + i2s_daifmt |= SND_SOC_DAIFMT_CBM_CFM; + else + i2s_daifmt |= SND_SOC_DAIFMT_CBS_CFS; + + switch (pdata->codec_info[codec_id].i2s_format) { + case format_tdm: + i2s_daifmt |= SND_SOC_DAIFMT_DSP_A; + break; + case format_i2s: + i2s_daifmt |= SND_SOC_DAIFMT_I2S; + break; + case format_rjm: + i2s_daifmt |= SND_SOC_DAIFMT_RIGHT_J; + break; + case format_ljm: + i2s_daifmt |= SND_SOC_DAIFMT_LEFT_J; + break; + default: + break; + } + + err = snd_soc_dai_set_fmt(codec_dai, i2s_daifmt); + if (err < 0) + dev_info(card->dev, "codec_dai fmt not set\n"); + + err = snd_soc_dai_set_fmt(cpu_dai, i2s_daifmt); + if (err < 0) { + dev_err(card->dev, "cpu_dai fmt not set\n"); + return err; + } + err = snd_soc_dai_set_sysclk(codec_dai, 0, mclk, + SND_SOC_CLOCK_IN); + if (err < 0) + dev_info(card->dev, "codec_dai clock not set\n"); + + if (pdata->codec_info[codec_id].i2s_format == + format_tdm) { + err = snd_soc_dai_set_tdm_slot(cpu_dai, + pdata->codec_info[codec_id].rx_mask, + pdata->codec_info[codec_id].tx_mask, + pdata->codec_info[codec_id].num_slots, + pdata->codec_info[codec_id].slot_width); + if (err < 0) + dev_err(card->dev, "cpu_dai tdm mode setting not done\n"); + } + + return 0; +} + +static int tegra_vcm_hw_params_controller1( + struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + return tegra_vcm_hw_params(substream, params, 0); +} + +static int tegra_vcm_hw_params_controller2( + struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + return tegra_vcm_hw_params(substream, params, 1); +} + +static int tegra_hw_free(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct tegra_vcm *machine = snd_soc_card_get_drvdata(rtd->card); + + tegra_asoc_utils_lock_clk_rate(&machine->util_data, 0); + + return 0; +} + +static struct snd_soc_ops tegra_vcm_ops_controller1 = { + .hw_params = tegra_vcm_hw_params_controller1, + .hw_free = tegra_hw_free, +}; +static struct snd_soc_ops tegra_vcm_ops_controller2 = { + .hw_params = tegra_vcm_hw_params_controller2, + .hw_free = tegra_hw_free, +}; + +static struct snd_soc_dai_link tegra_vcm_dai_link[] = { + { + .name = "I2S-TDM-1", + .stream_name = "TEGRA PCM", + .platform_name = "tegra-pcm-audio", + .ops = &tegra_vcm_ops_controller1, + }, + { + .name = "I2S-TDM-2", + .stream_name = "TEGRA PCM", + .platform_name = "tegra-pcm-audio", + .ops = &tegra_vcm_ops_controller2, + } +}; + +static struct snd_soc_card snd_soc_tegra_vcm = { + .name = "tegra-vcm", + .dai_link = tegra_vcm_dai_link, + .num_links = ARRAY_SIZE(tegra_vcm_dai_link), +}; + +static __devinit int tegra_vcm_driver_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &snd_soc_tegra_vcm; + struct tegra_vcm *machine; + struct tegra_p1852_platform_data *pdata; + int ret; + int i; + + pdata = pdev->dev.platform_data; + if (!pdata) { + dev_err(&pdev->dev, "No platform data supplied\n"); + return -EINVAL; + } + + machine = kzalloc(sizeof(struct tegra_vcm), GFP_KERNEL); + if (!machine) { + dev_err(&pdev->dev, "Can't allocate tegra_vcm struct\n"); + return -ENOMEM; + } + + machine->pdata = pdata; + + /* The codec driver and codec dai have to come from the system + * level board configuration file + * */ + for (i = 0; i < ARRAY_SIZE(tegra_vcm_dai_link); i++) { + tegra_vcm_dai_link[i].codec_name = + pdata->codec_info[i].codec_name; + tegra_vcm_dai_link[i].cpu_dai_name = + pdata->codec_info[i].cpu_dai_name; + tegra_vcm_dai_link[i].codec_dai_name = + pdata->codec_info[i].codec_dai_name; + tegra_vcm_dai_link[i].name = + pdata->codec_info[i].name; + if (pdata->codec_info[i].pcm_driver) + tegra_vcm_dai_link[i].platform_name = + pdata->codec_info[i].pcm_driver; + } + + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev, card); + if (ret) + goto err_free_machine; + + card->dev = &pdev->dev; + platform_set_drvdata(pdev, card); + snd_soc_card_set_drvdata(card, machine); + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", + ret); + } + + if (!card->instantiated) { + ret = -ENODEV; + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", + ret); + goto err_unregister_card; + } + + return 0; + +err_unregister_card: + snd_soc_unregister_card(card); + tegra_asoc_utils_fini(&machine->util_data); +err_free_machine: + kfree(machine); + return ret; +} + +static int __devexit tegra_vcm_driver_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + struct tegra_vcm *machine = snd_soc_card_get_drvdata(card); + + snd_soc_unregister_card(card); + tegra_asoc_utils_fini(&machine->util_data); + kfree(machine); + + return 0; +} + +static struct platform_driver tegra_vcm_driver = { + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + }, + .probe = tegra_vcm_driver_probe, + .remove = __devexit_p(tegra_vcm_driver_remove), +}; + +static int __init tegra_vcm_modinit(void) +{ + return platform_driver_register(&tegra_vcm_driver); +} +module_init(tegra_vcm_modinit); + +static void __exit tegra_vcm_modexit(void) +{ + platform_driver_unregister(&tegra_vcm_driver); +} +module_exit(tegra_vcm_modexit); + +MODULE_AUTHOR("Nitin Pai "); +MODULE_DESCRIPTION("Tegra+VCM machine ASoC driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:" DRV_NAME); -- cgit v1.2.3