summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-whistler.c
diff options
context:
space:
mode:
authorRavindra Lokhande <rlokhande@nvidia.com>2012-04-06 19:55:01 +0530
committerSimone Willett <swillett@nvidia.com>2012-04-10 11:27:11 -0700
commit9598c23117273137d054dfd47752a15df0fa68bd (patch)
tree9158a678f6d080a137cc27ec3bfb222e417343e4 /arch/arm/mach-tegra/board-whistler.c
parent519b655853e0abd152ecdb77691eb01ff7936db5 (diff)
arm: tegra: whistler: use common platform data struct
Change-Id: I46e81bf2ad285433e61c3a1bc7f5e1c9aca655fa Signed-off-by: Ravindra Lokhande <rlokhande@nvidia.com> Reviewed-on: http://git-master/r/95102 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-whistler.c')
-rw-r--r--arch/arm/mach-tegra/board-whistler.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c
index e5ebdad5318d..f1246454ed1b 100644
--- a/arch/arm/mach-tegra/board-whistler.c
+++ b/arch/arm/mach-tegra/board-whistler.c
@@ -45,7 +45,7 @@
#include <mach/iomap.h>
#include <mach/io.h>
#include <mach/i2s.h>
-#include <mach/tegra_wm8753_pdata.h>
+#include <mach/tegra_asoc_pdata.h>
#include <sound/tlv320aic326x.h>
#include <asm/mach-types.h>
@@ -375,7 +375,7 @@ static struct platform_device tegra_camera = {
.id = -1,
};
-static struct tegra_wm8753_platform_data whistler_audio_pdata = {
+static struct tegra_asoc_platform_data whistler_audio_pdata = {
.gpio_spkr_en = -1,
.gpio_hp_det = TEGRA_GPIO_HP_DET,
.gpio_hp_mute = -1,
@@ -384,7 +384,7 @@ static struct tegra_wm8753_platform_data whistler_audio_pdata = {
.debounce_time_hp = 200,
};
-static struct platform_device whistler_audio_device1 = {
+static struct platform_device whistler_audio_aic326x_device = {
.name = "tegra-snd-aic326x",
.id = 0,
.dev = {
@@ -392,7 +392,7 @@ static struct platform_device whistler_audio_device1 = {
},
};
-static struct platform_device whistler_audio_device2 = {
+static struct platform_device whistler_audio_wm8753_device = {
.name = "tegra-snd-wm8753",
.id = 0,
.dev = {
@@ -418,8 +418,8 @@ static struct platform_device *whistler_devices[] __initdata = {
&baseband_dit_device,
&whistler_bcm4329_rfkill_device,
&tegra_pcm_device,
- &whistler_audio_device1,
- &whistler_audio_device2,
+ &whistler_audio_aic326x_device,
+ &whistler_audio_wm8753_device,
};
static struct synaptics_i2c_rmi_platform_data synaptics_pdata = {