aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-09-05 12:27:14 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 18:29:33 -0400
commit03f67433758a3eeb37b9c1559886c377da874ad2 (patch)
treea8f747c7fcf2506b261439108d2a6c4bb04b3ec4
parent5d86e25c70407cd97a5aa8f39cc3be390bcab116 (diff)
ASoC: tegra: move platform data header
Move the Tegra+WM8903 ASoC platform data header out of arch/arm/mach-tegra, as a pre-requisite of single zImage. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--include/sound/tegra_wm8903.h (renamed from arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h)7
-rw-r--r--sound/soc/tegra/tegra_wm8903.c3
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h b/include/sound/tegra_wm8903.h
index 9d293344a7ff..57b202ee97c3 100644
--- a/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
+++ b/include/sound/tegra_wm8903.h
@@ -1,6 +1,4 @@
1/* 1/*
2 * arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
3 *
4 * Copyright 2011 NVIDIA, Inc. 2 * Copyright 2011 NVIDIA, Inc.
5 * 3 *
6 * This software is licensed under the terms of the GNU General Public 4 * This software is licensed under the terms of the GNU General Public
@@ -14,6 +12,9 @@
14 * 12 *
15 */ 13 */
16 14
15#ifndef __SOUND_TEGRA_WM38903_H
16#define __SOUND_TEGRA_WM38903_H
17
17struct tegra_wm8903_platform_data { 18struct tegra_wm8903_platform_data {
18 int gpio_spkr_en; 19 int gpio_spkr_en;
19 int gpio_hp_det; 20 int gpio_hp_det;
@@ -21,3 +22,5 @@ struct tegra_wm8903_platform_data {
21 int gpio_int_mic_en; 22 int gpio_int_mic_en;
22 int gpio_ext_mic_en; 23 int gpio_ext_mic_en;
23}; 24};
25
26#endif
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index d4f14e492341..cee13b7bfb94 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -34,13 +34,12 @@
34#include <linux/gpio.h> 34#include <linux/gpio.h>
35#include <linux/of_gpio.h> 35#include <linux/of_gpio.h>
36 36
37#include <mach/tegra_wm8903_pdata.h>
38
39#include <sound/core.h> 37#include <sound/core.h>
40#include <sound/jack.h> 38#include <sound/jack.h>
41#include <sound/pcm.h> 39#include <sound/pcm.h>
42#include <sound/pcm_params.h> 40#include <sound/pcm_params.h>
43#include <sound/soc.h> 41#include <sound/soc.h>
42#include <sound/tegra_wm8903.h>
44 43
45#include "../codecs/wm8903.h" 44#include "../codecs/wm8903.h"
46 45