ASoC: tegra: move platform data header
authorStephen Warren <swarren@nvidia.com>
Wed, 5 Sep 2012 16:27:14 +0000 (10:27 -0600)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Sep 2012 22:29:33 +0000 (06:29 +0800)
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>
arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h [deleted file]
include/sound/tegra_wm8903.h [new file with mode: 0644]
sound/soc/tegra/tegra_wm8903.c

diff --git a/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h b/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
deleted file mode 100644 (file)
index 9d29334..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
- *
- * Copyright 2011 NVIDIA, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-struct tegra_wm8903_platform_data {
-       int gpio_spkr_en;
-       int gpio_hp_det;
-       int gpio_hp_mute;
-       int gpio_int_mic_en;
-       int gpio_ext_mic_en;
-};
diff --git a/include/sound/tegra_wm8903.h b/include/sound/tegra_wm8903.h
new file mode 100644 (file)
index 0000000..57b202e
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2011 NVIDIA, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __SOUND_TEGRA_WM38903_H
+#define __SOUND_TEGRA_WM38903_H
+
+struct tegra_wm8903_platform_data {
+       int gpio_spkr_en;
+       int gpio_hp_det;
+       int gpio_hp_mute;
+       int gpio_int_mic_en;
+       int gpio_ext_mic_en;
+};
+
+#endif
index d4f14e492341f3751446057b68ee8d61f0c9bfbd..cee13b7bfb949ffacd8e8cdabccea8030ba8659a 100644 (file)
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 
-#include <mach/tegra_wm8903_pdata.h>
-
 #include <sound/core.h>
 #include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/tegra_wm8903.h>
 
 #include "../codecs/wm8903.h"