[alsa-devel] [GIT PULL] Branch to add harmony_audio.h to Tegra and ASoC

Stephen Warren swarren at nvidia.com
Sat Jan 22 07:18:35 CET 2011

Mark, Colin,

Please pull:

http://avon.wwwdotorg.org/downloads/kernel.git tegra_harmony_asoc_platform_data

This is a branch that's suitable for merging into both ASoC's for-2.6.39 and
Tegra's for-next branch, and contains a single commit to add file
arch/arm/mach-tegra/include/mach/harmony_audio.h. It's branched off the
latest kernel tag that Tegra's for-next pulled in (v2.6.37-rc4) and merges
into both target branches without issues as far as I can tell.

Note that since I wanted to avoid having to do more similar merges in the
future, I added a few more fields to the platform data that I know will be
needed to fully describe Harmony; the commit is now as shown below.


commit 1b1fab5161c555d25c3e3ee26b423c05b393e54c
Author: Stephen Warren <swarren at nvidia.com>
Date:   Wed Jan 19 13:07:03 2011 -0700

    ARM: tegra: Add Harmony sound platform data type
    Signed-off-by: Stephen Warren <swarren at nvidia.com>

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 0000000..aa136a7
--- /dev/null
+++ b/arch/arm/mach-tegra/include/mach/harmony_audio.h
@@ -0,0 +1,23 @@
+ * 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
+ * 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;
+       int gpio_cdc_irq;

More information about the Alsa-devel mailing list