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@xxxxxxxxxx>
---
This patch needs special merge handling; please see the cover letter.
arch/arm/mach-tegra/board-harmony.c | 2 +-
sound/soc/tegra/harmony.c | 2 +-
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 3c6bba2..987c5e4 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 f511017..6bd1e42 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)
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
