diff options
| author | Nikesh Oswal <noswal@nvidia.com> | 2012-03-22 11:56:15 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-03-23 14:02:50 -0700 |
| commit | fe85cd24e6208ae9faa5ccce78f42dbd851a53db (patch) | |
| tree | 7ff6e7b97bad4da5fba012a6db7dd8ad8f882967 /sound/soc/tegra | |
| parent | 5415c74bd64109d153a2cbcf8e05f50028b60297 (diff) | |
asoc: tegra: max98088 machine: use common platform data
use common platform data instead of using codec specific platform
data for different codecs
Change-Id: I88ecb08f3945e0d9c5162ec2b2d3279a4da50099
Signed-off-by: Nikesh Oswal <noswal@nvidia.com>
Reviewed-on: http://git-master/r/91686
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'sound/soc/tegra')
| -rw-r--r-- | sound/soc/tegra/tegra_max98088.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/tegra/tegra_max98088.c b/sound/soc/tegra/tegra_max98088.c index 7f17667f41ac..bae2b7838955 100644 --- a/sound/soc/tegra/tegra_max98088.c +++ b/sound/soc/tegra/tegra_max98088.c @@ -40,7 +40,7 @@ #include <linux/switch.h> #endif -#include <mach/tegra_max98088_pdata.h> +#include <mach/tegra_asoc_pdata.h> #include <sound/core.h> #include <sound/jack.h> @@ -86,7 +86,7 @@ extern int g_is_call_mode; struct tegra_max98088 { struct tegra_asoc_utils_data util_data; - struct tegra_max98088_platform_data *pdata; + struct tegra_asoc_platform_data *pdata; int gpio_requested; bool init_done; int is_call_mode; @@ -845,7 +845,7 @@ static int tegra_max98088_event_int_spk(struct snd_soc_dapm_widget *w, struct snd_soc_dapm_context *dapm = w->dapm; struct snd_soc_card *card = dapm->card; struct tegra_max98088 *machine = snd_soc_card_get_drvdata(card); - struct tegra_max98088_platform_data *pdata = machine->pdata; + struct tegra_asoc_platform_data *pdata = machine->pdata; if (!(machine->gpio_requested & GPIO_SPKR_EN)) return 0; @@ -862,7 +862,7 @@ static int tegra_max98088_event_hp(struct snd_soc_dapm_widget *w, struct snd_soc_dapm_context *dapm = w->dapm; struct snd_soc_card *card = dapm->card; struct tegra_max98088 *machine = snd_soc_card_get_drvdata(card); - struct tegra_max98088_platform_data *pdata = machine->pdata; + struct tegra_asoc_platform_data *pdata = machine->pdata; if (!(machine->gpio_requested & GPIO_HP_MUTE)) return 0; @@ -908,7 +908,7 @@ static int tegra_max98088_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_dapm_context *dapm = &codec->dapm; struct snd_soc_card *card = codec->card; struct tegra_max98088 *machine = snd_soc_card_get_drvdata(card); - struct tegra_max98088_platform_data *pdata = machine->pdata; + struct tegra_asoc_platform_data *pdata = machine->pdata; #ifndef CONFIG_ARCH_TEGRA_2x_SOC struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(rtd->cpu_dai); #endif @@ -1102,7 +1102,7 @@ static __devinit int tegra_max98088_driver_probe(struct platform_device *pdev) { struct snd_soc_card *card = &snd_soc_tegra_max98088; struct tegra_max98088 *machine; - struct tegra_max98088_platform_data *pdata; + struct tegra_asoc_platform_data *pdata; int ret, i; pdata = pdev->dev.platform_data; @@ -1181,7 +1181,7 @@ static int __devexit tegra_max98088_driver_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); struct tegra_max98088 *machine = snd_soc_card_get_drvdata(card); - struct tegra_max98088_platform_data *pdata = machine->pdata; + struct tegra_asoc_platform_data *pdata = machine->pdata; snd_soc_unregister_card(card); |