summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorRavindra Lokhande <rlokhande@nvidia.com>2012-04-06 19:52:23 +0530
committerSimone Willett <swillett@nvidia.com>2012-04-10 11:22:22 -0700
commit519b655853e0abd152ecdb77691eb01ff7936db5 (patch)
treea6a89da81a73706cd6b05fdb479d5837d131340e /sound/soc
parent91edeaacfe448d6bdc65b40c8061a564521695fb (diff)
asoc: wm8753 machine: use common platform data
use common platform data for machine driver Change-Id: I90e0d2f47aed46da650305d98f6525287adfaf04 Signed-off-by: Ravindra Lokhande <rlokhande@nvidia.com> Reviewed-on: http://git-master/r/95101 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/tegra/tegra_wm8753.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c
index 62c1c056a619..2e532fcd1e46 100644
--- a/sound/soc/tegra/tegra_wm8753.c
+++ b/sound/soc/tegra/tegra_wm8753.c
@@ -39,7 +39,7 @@
#include <linux/switch.h>
#endif
-#include <mach/tegra_wm8753_pdata.h>
+#include <mach/tegra_asoc_pdata.h>
#include <sound/core.h>
#include <sound/jack.h>
@@ -67,7 +67,7 @@ extern int g_is_call_mode;
struct tegra_wm8753 {
struct tegra_asoc_utils_data util_data;
- struct tegra_wm8753_platform_data *pdata;
+ struct tegra_asoc_platform_data *pdata;
struct regulator *audio_reg;
int gpio_requested;
int is_call_mode;
@@ -614,7 +614,7 @@ static int tegra_wm8753_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_wm8753 *machine = snd_soc_card_get_drvdata(card);
- struct tegra_wm8753_platform_data *pdata = machine->pdata;
+ struct tegra_asoc_platform_data *pdata = machine->pdata;
if (!(machine->gpio_requested & GPIO_SPKR_EN))
return 0;
@@ -631,7 +631,7 @@ static int tegra_wm8753_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_wm8753 *machine = snd_soc_card_get_drvdata(card);
- struct tegra_wm8753_platform_data *pdata = machine->pdata;
+ struct tegra_asoc_platform_data *pdata = machine->pdata;
if (!(machine->gpio_requested & GPIO_HP_MUTE))
return 0;
@@ -687,7 +687,7 @@ static int tegra_wm8753_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_dapm_context *dapm = &codec->dapm;
struct snd_soc_card *card = codec->card;
struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card);
- struct tegra_wm8753_platform_data *pdata = machine->pdata;
+ struct tegra_asoc_platform_data *pdata = machine->pdata;
int ret;
if (machine_is_whistler()) {
@@ -854,7 +854,7 @@ static __devinit int tegra_wm8753_driver_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &snd_soc_tegra_wm8753;
struct tegra_wm8753 *machine;
- struct tegra_wm8753_platform_data *pdata;
+ struct tegra_asoc_platform_data *pdata;
int ret;
@@ -916,7 +916,7 @@ static int __devexit tegra_wm8753_driver_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card);
- struct tegra_wm8753_platform_data *pdata = machine->pdata;
+ struct tegra_asoc_platform_data *pdata = machine->pdata;
snd_soc_unregister_card(card);