diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-07 11:38:26 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-07 11:38:26 -0400 |
commit | 305787649826d6c84a6f9f71bc3318460610aba4 (patch) | |
tree | b36cfe60e6f806414b1e6c042f0be233f114986f /include/sound | |
parent | c4806174c516d26bf4a72db1789cfc96e4950d07 (diff) | |
parent | aeb29a82de7c80d4d0253b042f17eb1f725b08f1 (diff) |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.35
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/tlv320aic3x.h | 17 | ||||
-rw-r--r-- | include/sound/tpa6130a2-plat.h | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/include/sound/tlv320aic3x.h b/include/sound/tlv320aic3x.h new file mode 100644 index 000000000000..b1a5f34e5cfa --- /dev/null +++ b/include/sound/tlv320aic3x.h | |||
@@ -0,0 +1,17 @@ | |||
1 | /* | ||
2 | * Platform data for Texas Instruments TLV320AIC3x codec | ||
3 | * | ||
4 | * Author: Jarkko Nikula <jhnikula@gmail.com> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #ifndef __TLV320AIC3x_H__ | ||
11 | #define __TLV320AIC3x_H__ | ||
12 | |||
13 | struct aic3x_pdata { | ||
14 | int gpio_reset; /* < 0 if not used */ | ||
15 | }; | ||
16 | |||
17 | #endif \ No newline at end of file | ||
diff --git a/include/sound/tpa6130a2-plat.h b/include/sound/tpa6130a2-plat.h index e29fde6b5cbe..426f62767dab 100644 --- a/include/sound/tpa6130a2-plat.h +++ b/include/sound/tpa6130a2-plat.h | |||
@@ -31,6 +31,7 @@ enum tpa_model { | |||
31 | struct tpa6130a2_platform_data { | 31 | struct tpa6130a2_platform_data { |
32 | enum tpa_model id; | 32 | enum tpa_model id; |
33 | int power_gpio; | 33 | int power_gpio; |
34 | int limit_gain; | ||
34 | }; | 35 | }; |
35 | 36 | ||
36 | #endif | 37 | #endif |