aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Warren2011-04-12 11:29:00 -0600
committerMark Brown2011-04-18 17:54:09 +0100
commit7b33af252fbbf3beb694448da3ba6687022fd602 (patch)
treec0d95f9c8f1f591c3f2500849ffb9017e5ae5698
parent4651d5566840e911b14a5052f18ed39558677937 (diff)
ASoC: Tegra: Rename pdev tegra-snd-harmony to tegra-snd-wm8903
Soon, this machine driver will be updated to handle a number of Tegra boards using the WM8903 codec. Rename the platform device in advance to reflect this. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--arch/arm/mach-tegra/board-harmony.c2
-rw-r--r--sound/soc/tegra/harmony.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index 3c6bba25a1e4..987c5e46d581 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -75,7 +75,7 @@ static struct tegra_wm8903_platform_data harmony_audio_pdata = {
};
static struct platform_device harmony_audio_device = {
- .name = "tegra-snd-harmony",
+ .name = "tegra-snd-wm8903",
.id = 0,
.dev = {
.platform_data = &harmony_audio_pdata,
diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c
index c3096c3b9e2b..ae168f2446a6 100644
--- a/sound/soc/tegra/harmony.c
+++ b/sound/soc/tegra/harmony.c
@@ -50,7 +50,7 @@
#include "tegra_pcm.h"
#include "tegra_asoc_utils.h"
-#define DRV_NAME "tegra-snd-harmony"
+#define DRV_NAME "tegra-snd-wm8903"
#define GPIO_SPKR_EN BIT(0)
#define GPIO_INT_MIC_EN BIT(1)