ARM: Tegra: Rename harmony_audio.h -> tegra_wm8903_pdata.h
The audio driver will soon support more than just the Tegra Harmony board.
Rename the platform data header file and data type to reflect this.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c
index 8585957..c3096c3 100644
--- a/sound/soc/tegra/harmony.c
+++ b/sound/soc/tegra/harmony.c
@@ -35,7 +35,7 @@
#include <linux/slab.h>
#include <linux/gpio.h>
-#include <mach/harmony_audio.h>
+#include <mach/tegra_wm8903_pdata.h>
#include <sound/core.h>
#include <sound/jack.h>
@@ -58,7 +58,7 @@
struct tegra_harmony {
struct tegra_asoc_utils_data util_data;
- struct harmony_audio_platform_data *pdata;
+ struct tegra_wm8903_platform_data *pdata;
int gpio_requested;
};
@@ -163,7 +163,7 @@
struct snd_soc_codec *codec = w->codec;
struct snd_soc_card *card = codec->card;
struct tegra_harmony *harmony = snd_soc_card_get_drvdata(card);
- struct harmony_audio_platform_data *pdata = harmony->pdata;
+ struct tegra_wm8903_platform_data *pdata = harmony->pdata;
gpio_set_value_cansleep(pdata->gpio_spkr_en,
SND_SOC_DAPM_EVENT_ON(event));
@@ -198,7 +198,7 @@
struct snd_soc_dapm_context *dapm = &codec->dapm;
struct snd_soc_card *card = codec->card;
struct tegra_harmony *harmony = snd_soc_card_get_drvdata(card);
- struct harmony_audio_platform_data *pdata = harmony->pdata;
+ struct tegra_wm8903_platform_data *pdata = harmony->pdata;
int ret;
ret = gpio_request(pdata->gpio_spkr_en, "spkr_en");
@@ -291,7 +291,7 @@
{
struct snd_soc_card *card = &snd_soc_harmony;
struct tegra_harmony *harmony;
- struct harmony_audio_platform_data *pdata;
+ struct tegra_wm8903_platform_data *pdata;
int ret;
if (!machine_is_harmony()) {
@@ -344,7 +344,7 @@
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_harmony *harmony = snd_soc_card_get_drvdata(card);
- struct harmony_audio_platform_data *pdata = harmony->pdata;
+ struct tegra_wm8903_platform_data *pdata = harmony->pdata;
snd_soc_unregister_card(card);