diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-04-12 13:28:59 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:54:05 -0400 |
commit | 4651d5566840e911b14a5052f18ed39558677937 (patch) | |
tree | a7e31033fd02cc2b6fc87d750824eb09b19877c9 /arch/arm/mach-tegra | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
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>
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h (renamed from arch/arm/mach-tegra/include/mach/harmony_audio.h) | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index 75c918a86a31..3c6bba25a1e4 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <asm/mach/time.h> | 34 | #include <asm/mach/time.h> |
35 | #include <asm/setup.h> | 35 | #include <asm/setup.h> |
36 | 36 | ||
37 | #include <mach/harmony_audio.h> | 37 | #include <mach/tegra_wm8903_pdata.h> |
38 | #include <mach/iomap.h> | 38 | #include <mach/iomap.h> |
39 | #include <mach/irqs.h> | 39 | #include <mach/irqs.h> |
40 | #include <mach/sdhci.h> | 40 | #include <mach/sdhci.h> |
@@ -67,7 +67,7 @@ static struct platform_device debug_uart = { | |||
67 | }, | 67 | }, |
68 | }; | 68 | }; |
69 | 69 | ||
70 | static struct harmony_audio_platform_data harmony_audio_pdata = { | 70 | static struct tegra_wm8903_platform_data harmony_audio_pdata = { |
71 | .gpio_spkr_en = TEGRA_GPIO_SPKR_EN, | 71 | .gpio_spkr_en = TEGRA_GPIO_SPKR_EN, |
72 | .gpio_hp_det = TEGRA_GPIO_HP_DET, | 72 | .gpio_hp_det = TEGRA_GPIO_HP_DET, |
73 | .gpio_int_mic_en = TEGRA_GPIO_INT_MIC_EN, | 73 | .gpio_int_mic_en = TEGRA_GPIO_INT_MIC_EN, |
diff --git a/arch/arm/mach-tegra/include/mach/harmony_audio.h b/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h index af086500ab7d..c34bd5eb204e 100644 --- a/arch/arm/mach-tegra/include/mach/harmony_audio.h +++ b/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/arm/mach-tegra/include/mach/harmony_audio.h | 2 | * arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h |
3 | * | 3 | * |
4 | * Copyright 2011 NVIDIA, Inc. | 4 | * Copyright 2011 NVIDIA, Inc. |
5 | * | 5 | * |
@@ -14,7 +14,7 @@ | |||
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||
17 | struct harmony_audio_platform_data { | 17 | struct tegra_wm8903_platform_data { |
18 | int gpio_spkr_en; | 18 | int gpio_spkr_en; |
19 | int gpio_hp_det; | 19 | int gpio_hp_det; |
20 | int gpio_int_mic_en; | 20 | int gpio_int_mic_en; |