diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-04-12 13:29:00 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:54:09 -0400 |
commit | 7b33af252fbbf3beb694448da3ba6687022fd602 (patch) | |
tree | c0d95f9c8f1f591c3f2500849ffb9017e5ae5698 | |
parent | 4651d5566840e911b14a5052f18ed39558677937 (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.c | 2 | ||||
-rw-r--r-- | 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 3c6bba25a1e..987c5e46d58 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 = { | |||
75 | }; | 75 | }; |
76 | 76 | ||
77 | static struct platform_device harmony_audio_device = { | 77 | static struct platform_device harmony_audio_device = { |
78 | .name = "tegra-snd-harmony", | 78 | .name = "tegra-snd-wm8903", |
79 | .id = 0, | 79 | .id = 0, |
80 | .dev = { | 80 | .dev = { |
81 | .platform_data = &harmony_audio_pdata, | 81 | .platform_data = &harmony_audio_pdata, |
diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c index c3096c3b9e2..ae168f2446a 100644 --- a/sound/soc/tegra/harmony.c +++ b/sound/soc/tegra/harmony.c | |||
@@ -50,7 +50,7 @@ | |||
50 | #include "tegra_pcm.h" | 50 | #include "tegra_pcm.h" |
51 | #include "tegra_asoc_utils.h" | 51 | #include "tegra_asoc_utils.h" |
52 | 52 | ||
53 | #define DRV_NAME "tegra-snd-harmony" | 53 | #define DRV_NAME "tegra-snd-wm8903" |
54 | 54 | ||
55 | #define GPIO_SPKR_EN BIT(0) | 55 | #define GPIO_SPKR_EN BIT(0) |
56 | #define GPIO_INT_MIC_EN BIT(1) | 56 | #define GPIO_INT_MIC_EN BIT(1) |