summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-02-19 14:35:16 -0800
committerColin Cross <ccross@android.com>2011-02-19 14:35:16 -0800
commitfe92a026e30050d5c79b2d41274211550a14cb04 (patch)
treee021cc4d241847cb5e7e41746c326135a0c82f6c /arch/arm
parentcca414b263d5544f6bb4bff3cd3d3130def2b530 (diff)
parent47f5ae51f2aedac2f3006c1252f1020fdfc1d3c0 (diff)
downloadlinux-stable-fe92a026e30050d5c79b2d41274211550a14cb04.tar.gz
linux-stable-fe92a026e30050d5c79b2d41274211550a14cb04.tar.bz2
linux-stable-fe92a026e30050d5c79b2d41274211550a14cb04.zip
Merge branch 'tegra-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into outside-for-next
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/include/mach/harmony_audio.h22
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/harmony_audio.h b/arch/arm/mach-tegra/include/mach/harmony_audio.h
new file mode 100644
index 000000000000..af086500ab7d
--- /dev/null
+++ b/arch/arm/mach-tegra/include/mach/harmony_audio.h
@@ -0,0 +1,22 @@
+/*
+ * arch/arm/mach-tegra/include/mach/harmony_audio.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 harmony_audio_platform_data {
+ int gpio_spkr_en;
+ int gpio_hp_det;
+ int gpio_int_mic_en;
+ int gpio_ext_mic_en;
+};