diff options
| -rw-r--r-- | arch/arm/configs/colibri_t30_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30-power.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30.c | 176 | ||||
| -rw-r--r-- | sound/soc/tegra/Kconfig | 12 | ||||
| -rw-r--r-- | sound/soc/tegra/Makefile | 2 | ||||
| -rw-r--r-- | sound/soc/tegra/colibri_t30.c | 386 |
6 files changed, 442 insertions, 138 deletions
diff --git a/arch/arm/configs/colibri_t30_defconfig b/arch/arm/configs/colibri_t30_defconfig index ee5d496d19b6..bbeff8fa737c 100644 --- a/arch/arm/configs/colibri_t30_defconfig +++ b/arch/arm/configs/colibri_t30_defconfig @@ -299,6 +299,7 @@ CONFIG_SND=y # CONFIG_SND_PCI is not set CONFIG_SND_SOC=y CONFIG_SND_SOC_TEGRA=y +CONFIG_SND_SOC_TEGRA_COLIBRI_T30=y CONFIG_HIDRAW=y CONFIG_USB_HIDDEV=y CONFIG_USB=y diff --git a/arch/arm/mach-tegra/board-colibri_t30-power.c b/arch/arm/mach-tegra/board-colibri_t30-power.c index b5ad7956277c..67e01845ff3e 100644 --- a/arch/arm/mach-tegra/board-colibri_t30-power.c +++ b/arch/arm/mach-tegra/board-colibri_t30-power.c @@ -141,6 +141,9 @@ static struct regulator_consumer_supply tps6591x_ldo2_supply_0[] = { REGULATOR_SUPPLY("avdd_audio", NULL), REGULATOR_SUPPLY("avdd_usb", NULL), REGULATOR_SUPPLY("vddio_sd_slot", "sdhci-tegra.1"), + /* SGTL5000 */ + REGULATOR_SUPPLY("VDDA", "4-000a"), + REGULATOR_SUPPLY("VDDIO", "4-000a"), }; /* unused */ diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index 22f345cf9943..5abd67760304 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -66,117 +66,12 @@ #define ETHERNET_VBUS_GPIO TEGRA_GPIO_PDD2 #define ETHERNET_RESET_GPIO TEGRA_GPIO_PDD0 -#if 0 /* Audio */ - -static struct tegra_audio_platform_data tegra_i2s_pdata = { - .i2s_master = true, - .dma_on = true, /* use dma by default */ - .i2s_master_clk = 48000, - .dev_clk_rate = 12288000, - .mode = AUDIO_FRAME_FORMAT_I2S, - .fifo_fmt = AUDIO_FIFO_PACK_16, - .bit_size = AUDIO_BIT_SIZE_16, - .i2s_bus_width = 32, - .dsp_bus_width = 16, -}; - -static struct tegra_audio_platform_data tegra_spdif_pdata = { - .dma_on = true, /* use dma by default */ - .dev_clk_rate = 6144000, - .mode = SPDIF_BIT_MODE_MODE16BIT, - .fifo_fmt = AUDIO_FIFO_PACK_16, -}; - -//somehow required -struct wired_jack_conf audio_wr_jack_conf = { - .hp_det_n = TEGRA_GPIO_PW2, - .cdc_irq = TEGRA_GPIO_PW3, -// .en_spkr = WM8903_GP3, - .spkr_amp_reg = "vdd_3v3_spk_amp" -}; - -struct tegra_das_platform_data tegra_das_pdata = { - .tegra_dap_port_info_table = { - /* I2S0 <--> NULL */ - [0] = { - .dac_port = tegra_das_port_none, - .codec_type = tegra_audio_codec_type_none, - .device_property = { - .num_channels = 0, - .bits_per_sample = 0, - .rate = 0, - .master = 0, - .lrck_high_left = false, - .dac_dap_data_comm_format = 0, - }, - }, - /* I2S1 <--> NULL */ - [1] = { - .dac_port = tegra_das_port_none, - .codec_type = tegra_audio_codec_type_none, - .device_property = { - .num_channels = 0, - .bits_per_sample = 0, - .rate = 0, - .master = 0, - .lrck_high_left = false, - .dac_dap_data_comm_format = 0, - }, - }, - /* DAP3/I2S2 <--> Hifi Codec */ - [2] = { - .dac_port = tegra_das_port_i2s2, - .codec_type = tegra_audio_codec_type_hifi, - .device_property = { - .num_channels = 2, - .bits_per_sample = 16, - .rate = 48000, - .master = 0, - .lrck_high_left = false, - .dac_dap_data_comm_format = - dac_dap_data_format_i2s, - }, - }, - /* I2S3 <--> NULL */ - [3] = { - .dac_port = tegra_das_port_none, - .codec_type = tegra_audio_codec_type_none, - .device_property = { - .num_channels = 0, - .bits_per_sample = 0, - .rate = 0, - .master = 0, - .lrck_high_left = false, - .dac_dap_data_comm_format = 0, - }, - }, - /* I2S4 <--> NULL */ - [4] = { - .dac_port = tegra_das_port_none, - .codec_type = tegra_audio_codec_type_none, - .device_property = { - .num_channels = 0, - .bits_per_sample = 0, - .rate = 0, - .master = 0, - .lrck_high_left = false, - .dac_dap_data_comm_format = 0, - }, - }, - }, +static struct platform_device colibri_t30_audio_sgtl5000_device = { + .name = "tegra-snd-colibri_t30-sgtl5000", + .id = 0, }; -static void __init colibri_t30_audio_init(void) -{ - tegra_i2s_device2.dev.platform_data = &tegra_i2s_pdata; - platform_device_register(&tegra_i2s_device2); - - tegra_spdif_device.dev.platform_data = &tegra_spdif_pdata; - platform_device_register(&tegra_spdif_device); -} -#endif - /* Camera */ static struct platform_device tegra_camera = { .name = "tegra_camera", @@ -186,31 +81,33 @@ static struct platform_device tegra_camera = { /* Clocks */ static struct tegra_clk_init_table colibri_t30_clk_init_table[] __initdata = { /* name parent rate enabled */ - { "audio1", "i2s1_sync", 0, false}, - { "audio3", "i2s3_sync", 0, false}, - { "blink", "clk_32k", 32768, true}, - { "d_audio", "clk_m", 12000000, false}, -//{ "d_audio", "pll_a_out0", 12288000, false}, - { "dam0", "clk_m", 12000000, false}, - { "dam1", "clk_m", 12000000, false}, - { "dam2", "clk_m", 12000000, false}, - { "hda", "pll_p", 108000000, false}, - { "hda2codec_2x","pll_p", 48000000, false}, - { "i2c1", "pll_p", 3200000, false}, - { "i2c2", "pll_p", 3200000, false}, - { "i2c3", "pll_p", 3200000, false}, - { "i2c4", "pll_p", 3200000, false}, - { "i2c5", "pll_p", 3200000, false}, - { "i2s0", "pll_a_out0", 0, false}, - { "i2s1", "pll_a_out0", 0, false}, - { "i2s3", "pll_a_out0", 0, false}, -// { "pll_a", NULL, 552960000, false}, -// { "pll_a_out0", NULL, 12288000, false}, - { "pll_m", NULL, 0, false}, - { "pwm", "pll_p", 3187500, false}, - { "spdif_out", "pll_a_out0", 0, false}, - { "vi", "pll_p", 0, false}, - { "vi_sensor", "pll_p", 150000000, false}, + { "audio1", "i2s1_sync", 0, false}, + { "audio2", "i2s2_sync", 0, false}, + { "audio3", "i2s3_sync", 0, false}, + { "blink", "clk_32k", 32768, true}, + { "d_audio", "clk_m", 12000000, false}, + { "dam0", "clk_m", 12000000, false}, + { "dam1", "clk_m", 12000000, false}, + { "dam2", "clk_m", 12000000, false}, + +//required? + { "hda", "pll_p", 108000000, false}, + { "hda2codec_2x","pll_p", 48000000, false}, + + { "i2c1", "pll_p", 3200000, false}, + { "i2c2", "pll_p", 3200000, false}, + { "i2c3", "pll_p", 3200000, false}, + { "i2c4", "pll_p", 3200000, false}, + { "i2c5", "pll_p", 3200000, false}, + { "i2s0", "pll_a_out0", 0, false}, + { "i2s1", "pll_a_out0", 0, false}, + { "i2s2", "pll_a_out0", 0, false}, + { "i2s3", "pll_a_out0", 0, false}, + { "pll_m", NULL, 0, false}, + { "pwm", "pll_p", 3187500, false}, + { "spdif_out", "pll_a_out0", 0, false}, + { "vi", "pll_p", 0, false}, + { "vi_sensor", "pll_p", 150000000, false}, { NULL, NULL, 0, 0}, }; @@ -762,18 +659,17 @@ static struct platform_device *colibri_t30_devices[] __initdata = { #if defined(CONFIG_CRYPTO_DEV_TEGRA_AES) &tegra_aes_device, #endif -#if 0 + &tegra_ahub_device, &tegra_dam_device0, &tegra_dam_device1, &tegra_dam_device2, - &tegra_i2s_device0, - &tegra_i2s_device1, - &tegra_i2s_device3, + &tegra_i2s_device2, &tegra_spdif_device, &spdif_dit_device, &tegra_pcm_device, -#endif + &colibri_t30_audio_sgtl5000_device, + &tegra_cec_device, #if defined(CONFIG_CRYPTO_DEV_TEGRA_AES) &tegra_aes_device, @@ -811,6 +707,10 @@ static void __init colibri_t30_init(void) tegra_wdt_recovery_init(); #endif tegra_serial_debug_init(TEGRA_UARTD_BASE, INT_WDT_CPU, NULL, -1, -1); + + /* Activate Mic Bias */ + gpio_request(TEGRA_GPIO_PT1, "EN_MIC_GND"); + gpio_direction_output(TEGRA_GPIO_PT1, 1); } static void __init colibri_t30_reserve(void) diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index caecd66c199c..21513335eb49 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -98,6 +98,18 @@ config SND_SOC_TEGRA_COLIBRI_T20 Say Y or M here if you want to add support for SoC audio on the Toradex Colibri T20 module. +config SND_SOC_TEGRA_COLIBRI_T30 + tristate "SoC Audio support for Colibri T30 module" + depends on I2C && MACH_COLIBRI_T30 && SND_SOC_TEGRA + select SND_SOC_SGTL5000 + select SND_SOC_SPDIF + select SND_SOC_TEGRA30_DAM + select SND_SOC_TEGRA30_I2S + select SND_SOC_TEGRA30_SPDIF + help + Say Y or M here if you want to add support for SoC audio on the + Toradex Colibri T30 module. + config SND_SOC_TEGRA_TRIMSLICE tristate "SoC Audio support for TrimSlice board" depends on SND_SOC_TEGRA && MACH_TRIMSLICE && I2C diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile index 079a28ccbe99..d3d549a907a4 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_SND_SOC_TEGRA30_SPDIF) += snd-soc-tegra30-spdif.o # Tegra machine Support snd-soc-tegra-wm8903-objs := tegra_wm8903.o snd-soc-tegra-colibri_t20-objs := colibri_t20.o +snd-soc-tegra-colibri_t30-objs := colibri_t30.o snd-soc-tegra-trimslice-objs := trimslice.o snd-soc-tegra-wm8753-objs := tegra_wm8753.o snd-soc-tegra-max98088-objs := tegra_max98088.o @@ -40,6 +41,7 @@ snd-soc-tegra-p1852-objs := tegra_p1852.o obj-$(CONFIG_SND_SOC_TEGRA_WM8903) += snd-soc-tegra-wm8903.o obj-$(CONFIG_SND_SOC_TEGRA_COLIBRI_T20) += snd-soc-tegra-colibri_t20.o +obj-$(CONFIG_SND_SOC_TEGRA_COLIBRI_T30) += snd-soc-tegra-colibri_t30.o obj-$(CONFIG_SND_SOC_TEGRA_TRIMSLICE) += snd-soc-tegra-trimslice.o obj-$(CONFIG_SND_SOC_TEGRA_WM8753) += snd-soc-tegra-wm8753.o obj-$(CONFIG_SND_SOC_TEGRA_MAX98088) += snd-soc-tegra-max98088.o diff --git a/sound/soc/tegra/colibri_t30.c b/sound/soc/tegra/colibri_t30.c new file mode 100644 index 000000000000..c4a63357cb8c --- /dev/null +++ b/sound/soc/tegra/colibri_t30.c @@ -0,0 +1,386 @@ +/* + * SoC audio driver for Toradex Colibri T30 + * + * Copyright (C) 2012 Toradex Inc. + * + * 2012-02-12: Marcel Ziswiler <marcel.ziswiler@toradex.com> + * initial version + * + * Copied from tegra_wm8903.c + * Copyright (C) 2010-2011 - NVIDIA, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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 Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include <asm/mach-types.h> + +#include <linux/clk.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> + +#include "../codecs/sgtl5000.h" + +#include "tegra_pcm.h" +#include "tegra_asoc_utils.h" + +#define DRV_NAME "tegra-snd-colibri_t30-sgtl5000" + +struct colibri_t30_sgtl5000 { + struct tegra_asoc_utils_data util_data; + enum snd_soc_bias_level bias_level; +}; + +static int colibri_t30_sgtl5000_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 = codec->card; + struct colibri_t30_sgtl5000 *machine = snd_soc_card_get_drvdata(card); + int srate, mclk, i2s_daifmt; + int err; + struct clk *clk_m; + int rate; + + /* sgtl5000 does not support 512*rate when in 96000 fs */ + srate = params_rate(params); + switch (srate) { + case 96000: + mclk = 256 * srate; + break; + default: + mclk = 512 * srate; + break; + } + + /* Sgtl5000 sysclk should be >= 8MHz and <= 27M */ + if (mclk < 8000000 || mclk > 27000000) + return -EINVAL; + + clk_m = clk_get_sys(NULL, "clk_m"); + if (IS_ERR(clk_m)) { + dev_err(card->dev, "Can't retrieve clk clk_m\n"); + err = PTR_ERR(clk_m); + return err; + } + rate = clk_get_rate(clk_m); + printk("extern1 rate=%d\n", rate); + +#if TEGRA30_I2S_MASTER_PLAYBACK + /* FIXME: Codec only requires >= 3MHz if OSR==0 */ + while (mclk < 6000000) + mclk *= 2; + + i2s_daifmt = SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS; +#else + mclk = rate; + + i2s_daifmt = SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM; +#endif + + 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); + + /* Use DSP mode for mono on Tegra20 */ + if ((params_channels(params) != 2) && + (machine_is_ventana() || machine_is_harmony() || + machine_is_kaen() || machine_is_aebl())) + i2s_daifmt |= SND_SOC_DAIFMT_DSP_A; + else + i2s_daifmt |= SND_SOC_DAIFMT_I2S; + + err = snd_soc_dai_set_fmt(codec_dai, i2s_daifmt); + if (err < 0) { + dev_err(card->dev, "codec_dai fmt not set\n"); + return err; + } + + 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; + } + + /* Set SGTL5000's SYSCLK (provided by clk_out_1) */ + err = snd_soc_dai_set_sysclk(codec_dai, SGTL5000_SYSCLK, mclk, SND_SOC_CLOCK_IN); + if (err < 0) { + pr_err("codec_dai clock not set\n"); + return err; + } + + return 0; +} + +static int tegra_spdif_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_card *card = rtd->card; + struct colibri_t30_sgtl5000 *machine = snd_soc_card_get_drvdata(card); + int srate, mclk, min_mclk; + int err; + + srate = params_rate(params); + switch (srate) { + case 11025: + case 22050: + case 44100: + case 88200: + mclk = 11289600; + break; + case 8000: + case 16000: + case 32000: + case 48000: + case 64000: + case 96000: + mclk = 12288000; + break; + default: + return -EINVAL; + } + min_mclk = 128 * srate; + + err = tegra_asoc_utils_set_rate(&machine->util_data, srate, mclk); + if (err < 0) { + if (!(machine->util_data.set_mclk % min_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); + + return 0; +} + +static int tegra_hw_free(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct colibri_t30_sgtl5000 *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 colibri_t30_sgtl5000_ops = { + .hw_params = colibri_t30_sgtl5000_hw_params, + .hw_free = tegra_hw_free, +}; + +static struct snd_soc_ops tegra_spdif_ops = { + .hw_params = tegra_spdif_hw_params, + .hw_free = tegra_hw_free, +}; + +/* Colibri T30 machine DAPM widgets */ +static const struct snd_soc_dapm_widget colibri_t30_sgtl5000_dapm_widgets[] = { + SND_SOC_DAPM_HP("HEADPHONE", NULL), + SND_SOC_DAPM_LINE("LINEIN", NULL), + SND_SOC_DAPM_MIC("MIC_IN", NULL), +}; + +/* Colibri T30 machine audio map (connections to the codec pins) */ +static const struct snd_soc_dapm_route colibri_t30_sgtl5000_dapm_route[] = { + /* Colibri SODIMM pin 1 (MIC_IN) + Colibri Evaluation Board: Audio jack X26 bottom pink + Iris: Audio header X9 pin 2 + Orchid: Audio jack X11 bottom pink MIC in */ +//mic bias GPIO handling +// [ 9.359733] tegra-snd-colibri_t30-sgtl5000 tegra-snd-colibri_t30-sgtl5000.0: Failed to add route MICIN->MIC_IN +// { "MIC_IN", NULL, "MIC_IN" }, + + /* Colibri SODIMM pin 5 & 7 (LINEIN_L/R) + Colibri Evaluation Board: Audio jack X26 top blue + Iris: Audio header X9 pin 4 & 3 + MECS Tellurium: Audio jack X11 pin 1 & 2 + Orchid: Audio jack X11 top blue line in */ + { "LINEIN", NULL, "LINE_IN" }, + + /* Colibri SODIMM pin 15 & 17 (HEADPHONE_L/R) + Colibri Evaluation Board: Audio jack X26 middle green + Iris: Audio jack X8 + MECS Tellurium: Audio jack X11 pin 4 & 5 (HEADPHONE_LF/RF) + Orchid: Audio jack X11 middle green line out + Protea: Audio jack X53 line out */ +//HP PGA handling + { "HEADPHONE", NULL, "HP_OUT" }, +}; + +static int colibri_t30_sgtl5000_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_dapm_context *dapm = &codec->dapm; + struct snd_soc_card *card = codec->card; + struct colibri_t30_sgtl5000 *machine = snd_soc_card_get_drvdata(card); + int ret; + + machine->bias_level = SND_SOC_BIAS_STANDBY; + + ret = tegra_asoc_utils_register_ctls(&machine->util_data); + if (ret < 0) + return ret; + + snd_soc_dapm_nc_pin(dapm, "LINE_OUT"); + + snd_soc_dapm_sync(dapm); + + return 0; +} + +static struct snd_soc_dai_link colibri_t30_sgtl5000_dai[] = { + { + .name = "SGTL5000", + .stream_name = "SGTL5000 PCM", + .codec_name = "sgtl5000.4-000a", + .platform_name = "tegra-pcm-audio", + .cpu_dai_name = "tegra30-i2s.2", + .codec_dai_name = "sgtl5000", + .init = colibri_t30_sgtl5000_init, + .ops = &colibri_t30_sgtl5000_ops, + }, + { + .name = "SPDIF", + .stream_name = "SPDIF PCM", + .codec_name = "spdif-dit.0", + .platform_name = "tegra-pcm-audio", + .cpu_dai_name = "tegra30-spdif", + .codec_dai_name = "dit-hifi", + .ops = &tegra_spdif_ops, + }, +}; + +static struct snd_soc_card snd_soc_colibri_t30_sgtl5000 = { + .name = "colibri_t30-sgtl5000", + .dai_link = colibri_t30_sgtl5000_dai, + .num_links = ARRAY_SIZE(colibri_t30_sgtl5000_dai), +// .set_bias_level +// .set_bias_level_post +}; + +static __devinit int colibri_t30_sgtl5000_driver_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &snd_soc_colibri_t30_sgtl5000; + struct colibri_t30_sgtl5000 *machine; + int ret; + + machine = kzalloc(sizeof(struct colibri_t30_sgtl5000), GFP_KERNEL); + if (!machine) { + dev_err(&pdev->dev, "Can't allocate colibri_t30_sgtl5000 struct\n"); + return -ENOMEM; + } + + 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); + + card->dapm_widgets = colibri_t30_sgtl5000_dapm_widgets; + card->num_dapm_widgets = ARRAY_SIZE(colibri_t30_sgtl5000_dapm_widgets); + + card->dapm_routes = colibri_t30_sgtl5000_dapm_route; + card->num_dapm_routes = ARRAY_SIZE(colibri_t30_sgtl5000_dapm_route); + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", + ret); + goto err_fini_utils; + } + + 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); +err_fini_utils: + tegra_asoc_utils_fini(&machine->util_data); +err_free_machine: + kfree(machine); + return ret; +} + +static int __devexit colibri_t30_sgtl5000_driver_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + struct colibri_t30_sgtl5000 *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 colibri_t30_sgtl5000_driver = { + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + }, + .probe = colibri_t30_sgtl5000_driver_probe, + .remove = __devexit_p(colibri_t30_sgtl5000_driver_remove), +}; + +static int __init colibri_t30_sgtl5000_modinit(void) +{ + return platform_driver_register(&colibri_t30_sgtl5000_driver); +} +module_init(colibri_t30_sgtl5000_modinit); + +static void __exit colibri_t30_sgtl5000_modexit(void) +{ + platform_driver_unregister(&colibri_t30_sgtl5000_driver); +} +module_exit(colibri_t30_sgtl5000_modexit); + +/* Module information */ +MODULE_AUTHOR("Marcel Ziswiler <marcel.ziswiler@toradex.com>"); +MODULE_DESCRIPTION("ALSA SoC SGTL5000 on Toradex Colibri T30"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:" DRV_NAME); |