summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-06-21 17:52:58 +0200
committerTakashi Iwai <tiwai@suse.de>2013-06-21 17:52:58 +0200
commit0a1801e26c5237c259e863b4071c6a61d33ec666 (patch)
treed6400940c42cd04742398c85cf18e532dc2e56b7 /include/sound
parent0af49ffe3c04ed5a9095ea1349d3e26a1e8b311a (diff)
parent84bbc4aa2de97143db0f6ef0c3fa0bd84f73b207 (diff)
downloadop-kernel-dev-0a1801e26c5237c259e863b4071c6a61d33ec666.zip
op-kernel-dev-0a1801e26c5237c259e863b4071c6a61d33ec666.tar.gz
Merge tag 'asoc-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.11 Not a big release subsystem wise, the main changes have been some nice improvements on the driver side: - Lots of cleanups and fixes for Blackfin, SGTL5000 and UX500. - Generalisation of the Bluetooth and HDMI stub drivers. - New CODEC drivers for SSM2518 and RT5640. - New machine driver for Tegra CPUs with RT5640.
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/rt5640.h22
-rw-r--r--include/sound/soc-dapm.h3
2 files changed, 24 insertions, 1 deletions
diff --git a/include/sound/rt5640.h b/include/sound/rt5640.h
new file mode 100644
index 0000000..27cc75e
--- /dev/null
+++ b/include/sound/rt5640.h
@@ -0,0 +1,22 @@
+/*
+ * linux/sound/rt5640.h -- Platform data for RT5640
+ *
+ * Copyright 2011 Realtek Microelectronics
+ *
+ * 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 __LINUX_SND_RT5640_H
+#define __LINUX_SND_RT5640_H
+
+struct rt5640_platform_data {
+ /* IN1 & IN2 can optionally be differential */
+ bool in1_diff;
+ bool in2_diff;
+
+ int ldo1_en; /* GPIO for LDO1_EN */
+};
+
+#endif
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 385c632..3e479f4 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -311,6 +311,8 @@ struct device;
#define SND_SOC_DAPM_POST_PMD 0x8 /* after widget power down */
#define SND_SOC_DAPM_PRE_REG 0x10 /* before audio path setup */
#define SND_SOC_DAPM_POST_REG 0x20 /* after audio path setup */
+#define SND_SOC_DAPM_WILL_PMU 0x40 /* called at start of sequence */
+#define SND_SOC_DAPM_WILL_PMD 0x80 /* called at start of sequence */
#define SND_SOC_DAPM_PRE_POST_PMD \
(SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD)
@@ -479,7 +481,6 @@ struct snd_soc_dapm_route {
/* dapm audio path between two widgets */
struct snd_soc_dapm_path {
const char *name;
- const char *long_name;
/* source (input) and sink (output) widgets */
struct snd_soc_dapm_widget *source;
OpenPOWER on IntegriCloud