summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-05-06 17:06:27 +0200
committerTakashi Iwai <tiwai@suse.de>2010-05-06 17:06:27 +0200
commitaeb29a82de7c80d4d0253b042f17eb1f725b08f1 (patch)
treef15ba557a22b010cd790ead5a3c4a4a9872fe58f /include/sound
parent39b8eab7e7fe429d8d57f18c0ebdb7c25df55f5c (diff)
parent2f005471e2e2f2c7fa5898153387d421f7d24ad6 (diff)
downloadop-kernel-dev-aeb29a82de7c80d4d0253b042f17eb1f725b08f1.zip
op-kernel-dev-aeb29a82de7c80d4d0253b042f17eb1f725b08f1.tar.gz
Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/tlv320aic3x.h17
-rw-r--r--include/sound/tpa6130a2-plat.h1
2 files changed, 18 insertions, 0 deletions
diff --git a/include/sound/tlv320aic3x.h b/include/sound/tlv320aic3x.h
new file mode 100644
index 0000000..b1a5f34
--- /dev/null
+++ b/include/sound/tlv320aic3x.h
@@ -0,0 +1,17 @@
+/*
+ * Platform data for Texas Instruments TLV320AIC3x codec
+ *
+ * Author: Jarkko Nikula <jhnikula@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __TLV320AIC3x_H__
+#define __TLV320AIC3x_H__
+
+struct aic3x_pdata {
+ int gpio_reset; /* < 0 if not used */
+};
+
+#endif \ No newline at end of file
diff --git a/include/sound/tpa6130a2-plat.h b/include/sound/tpa6130a2-plat.h
index e29fde6..426f627 100644
--- a/include/sound/tpa6130a2-plat.h
+++ b/include/sound/tpa6130a2-plat.h
@@ -31,6 +31,7 @@ enum tpa_model {
struct tpa6130a2_platform_data {
enum tpa_model id;
int power_gpio;
+ int limit_gain;
};
#endif
OpenPOWER on IntegriCloud