June 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: tlv320aic3x: add AGC settings
by Prchal Jiří 29 Jun '12

29 Jun '12

This patch adds AGC target level and times settings for TLV320AIC3106. Signed-off-by: Jiri Prchal <jiri.prchal(a)aksignal.cz> --- sound/soc/codecs/tlv320aic3x.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 50a7112..5335ebc 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -204,6 +204,10 @@ static const char *aic3x_right_hpcom_mux[] = static const char *aic3x_linein_mode_mux[] = { "single-ended", "differential" }; static const char *aic3x_adc_hpf[] = { "Disabled", "0.0045xFs", "0.0125xFs", "0.025xFs" }; +static const char *aic3x_agc_level[] = + { "-5.5dB", "-8dB", "-10dB", "-12dB", "-14dB", "-17dB", "-20dB", "-24dB" }; +static const char *aic3x_agc_attack[] = { "8ms", "11ms", "16ms", "20ms" }; +static const char *aic3x_agc_decay[] = { "100ms", "200ms", "400ms", "500ms" }; #define LDAC_ENUM 0 #define RDAC_ENUM 1 @@ -231,6 +235,21 @@ static const struct soc_enum aic3x_enum[] = { SOC_ENUM_DOUBLE(AIC3X_CODEC_DFILT_CTRL, 6, 4, 4, aic3x_adc_hpf), }; +#define LAGC_LEV_ENUM 0 +#define RAGC_LEV_ENUM 1 +#define LAGC_ATT_ENUM 2 +#define RAGC_ATT_ENUM 3 +#define LAGC_DEC_ENUM 4 +#define RAGC_DEC_ENUM 5 +static const struct soc_enum aic3x_agc_enum[] = { + SOC_ENUM_SINGLE(LAGC_CTRL_A, 4, 8, aic3x_agc_level), + SOC_ENUM_SINGLE(RAGC_CTRL_A, 4, 8, aic3x_agc_level), + SOC_ENUM_SINGLE(LAGC_CTRL_A, 2, 4, aic3x_agc_attack), + SOC_ENUM_SINGLE(RAGC_CTRL_A, 2, 4, aic3x_agc_attack), + SOC_ENUM_SINGLE(LAGC_CTRL_A, 0, 4, aic3x_agc_decay), + SOC_ENUM_SINGLE(RAGC_CTRL_A, 0, 4, aic3x_agc_decay), +}; + /* * DAC digital volumes. From -63.5 to 0 dB in 0.5 dB steps */ @@ -355,6 +374,12 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { * adjust PGA to max value when ADC is on and will never go back. */ SOC_DOUBLE_R("AGC Switch", LAGC_CTRL_A, RAGC_CTRL_A, 7, 0x01, 0), + SOC_ENUM("Left AGC Target level", aic3x_agc_enum[LAGC_LEV_ENUM]), + SOC_ENUM("Right AGC Target level", aic3x_agc_enum[RAGC_LEV_ENUM]), + SOC_ENUM("Left AGC Attack time", aic3x_agc_enum[LAGC_ATT_ENUM]), + SOC_ENUM("Right AGC Attack time", aic3x_agc_enum[RAGC_ATT_ENUM]), + SOC_ENUM("Left AGC Decay time", aic3x_agc_enum[LAGC_DEC_ENUM]), + SOC_ENUM("Right AGC Decay time", aic3x_agc_enum[RAGC_DEC_ENUM]), /* Input */ SOC_DOUBLE_R_TLV("PGA Capture Volume", LADC_VOL, RADC_VOL, -- 1.7.7

1 0

[alsa-devel] ASoC updates for 3.5
by Mark Brown 29 Jun '12

29 Jun '12

The following changes since commit 3419ae781f1592b3d367107db6500090495490cd: ASoC: tegra+wm8903: turn of mic detect when card is removed (2012-06-12 11:38:48 +0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.5 for you to fetch changes up to 5e531fc87875fc0bbfb3ca46a8a178674c4e9b7c: ASoC: tlv320aic3x: Fix codec pll configure bug (2012-06-27 12:46:25 +0100) ---------------------------------------------------------------- ASoC: Updates for 3.5 A couple of unexciting driver specific changes plus a fix for gain controls used as DAPM controls which isn't yet needed in mainline but is a definite bug. ---------------------------------------------------------------- Benoît Thébaudeau (1): ASoC: dapm: Fix snd_soc_dapm_put_volsw() connect Hebbar, Gururaja (1): ASoC: tlv320aic3x: Fix codec pll configure bug Mark Brown (1): ASoC: wm2200: Add missing BCLK rate sound/soc/codecs/tlv320aic3x.c | 4 +--- sound/soc/codecs/tlv320aic3x.h | 1 + sound/soc/codecs/wm2200.c | 1 + sound/soc/soc-dapm.c | 8 +------- 4 files changed, 4 insertions(+), 10 deletions(-)

2 3

[alsa-devel] [PATCH] ASoC: spdif: Build separate RX and TX objects
by Mark Brown 29 Jun '12

29 Jun '12

Otherwise we fail to link when building as modules due to multiple init/exit functions. Reported-by: Fengguang Wu <wfg(a)linux.intel.com> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 62c3d4d..acf8088 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -45,7 +45,8 @@ snd-soc-alc5623-objs := alc5623.o snd-soc-alc5632-objs := alc5632.o snd-soc-sigmadsp-objs := sigmadsp.o snd-soc-sn95031-objs := sn95031.o -snd-soc-spdif-objs := spdif_transciever.o spdif_receiver.o +snd-soc-spdif-tx-objs := spdif_transciever.o +snd-soc-spdif-rx-objs := spdif_receiver.o snd-soc-ssm2602-objs := ssm2602.o snd-soc-sta32x-objs := sta32x.o snd-soc-stac9766-objs := stac9766.o @@ -159,7 +160,7 @@ obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o obj-$(CONFIG_SND_SOC_SN95031) +=snd-soc-sn95031.o -obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o +obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif-rx.o snd-soc-spdif-tx.o obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o obj-$(CONFIG_SND_SOC_STA32X) += snd-soc-sta32x.o obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o -- 1.7.10

1 0

Re: [alsa-devel] [pulseaudio-discuss] [PATCH 2/4] alsa-mixer: Add Phantom Jack support
by Raymond Yau 29 Jun '12

29 Jun '12

2012/6/28 David Henningsson <david.henningsson(a)canonical.com>: > For kernel 3.6, "phantom jack" kctls have been added. They serve as > a marker that a particular port exist. They were made so we can detect > that there actually are speakers and internal mic on a laptop, even if > there are no other indications (volume controls etc). > > Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> > --- It seem that there will be numerous phantom ports created e.g. two internal mic phantom ports, spdif and spdif in, cd on the intel d975 desktop ./hda-emu codecs/stac9274d-intel-d975 CTRL: add: Front Headphone Jack:0 JACK created Front Headphone, type 1 JACK report Front Headphone, status 0 CTRL: add: Front Mic Jack:0 JACK created Front Mic, type 2 JACK report Front Mic, status 0 CTRL: add: Rear Mic Jack:0 JACK created Rear Mic, type 2 JACK report Rear Mic, status 0 CTRL: add: Internal Mic Phantom Jack:0 CTL Notify: Internal Mic Phantom Jack:0, mask=1 CTRL: add: Internal Mic Phantom Jack:1 CTL Notify: Internal Mic Phantom Jack:1, mask=1 CTRL: add: Line Jack:0 JACK created Line, type 32 JACK report Line, status 0 CTRL: add: CD Phantom Jack:0 CTL Notify: CD Phantom Jack:0, mask=1 CTRL: add: SPDIF Phantom Jack:0 CTL Notify: SPDIF Phantom Jack:0, mask=1 CTRL: add: SPDIF In Phantom Jack:0 CTL Notify: SPDIF In Phantom Jack:0, mask=1

1 0

[alsa-devel] [PATCH] pcm: support for audio wallclock
by Pierre-Louis Bossart 28 Jun '12

28 Jun '12

add new snd_pcm_status_get_htstamp_wallclk() routine to query the audio timestamps read from the wallclock. Also add snd_pcm_hw_params_supports_audio_wallclock_ts() to query what the hardware supports. TODO: check protocol compatibility? Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- include/pcm.h | 2 ++ include/sound/asound.h | 7 +++++-- src/pcm/pcm.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/include/pcm.h b/include/pcm.h index 4997557..542d9a8 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -550,6 +550,7 @@ int snd_pcm_hw_params_is_half_duplex(const snd_pcm_hw_params_t *params); int snd_pcm_hw_params_is_joint_duplex(const snd_pcm_hw_params_t *params); int snd_pcm_hw_params_can_sync_start(const snd_pcm_hw_params_t *params); int snd_pcm_hw_params_can_disable_period_wakeup(const snd_pcm_hw_params_t *params); +int snd_pcm_hw_params_supports_audio_wallclock_ts(const snd_pcm_hw_params_t *params); int snd_pcm_hw_params_get_rate_numden(const snd_pcm_hw_params_t *params, unsigned int *rate_num, unsigned int *rate_den); @@ -858,6 +859,7 @@ void snd_pcm_status_get_trigger_tstamp(const snd_pcm_status_t *obj, snd_timestam void snd_pcm_status_get_trigger_htstamp(const snd_pcm_status_t *obj, snd_htimestamp_t *ptr); void snd_pcm_status_get_tstamp(const snd_pcm_status_t *obj, snd_timestamp_t *ptr); void snd_pcm_status_get_htstamp(const snd_pcm_status_t *obj, snd_htimestamp_t *ptr); +void snd_pcm_status_get_htstamp_wallclk(const snd_pcm_status_t *obj, snd_htimestamp_t *ptr); snd_pcm_sframes_t snd_pcm_status_get_delay(const snd_pcm_status_t *obj); snd_pcm_uframes_t snd_pcm_status_get_avail(const snd_pcm_status_t *obj); snd_pcm_uframes_t snd_pcm_status_get_avail_max(const snd_pcm_status_t *obj); diff --git a/include/sound/asound.h b/include/sound/asound.h index 07c03fa..f0d23d6 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -160,7 +160,7 @@ enum { * * *****************************************************************************/ -#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 10) +#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 11) typedef unsigned long sndrv_pcm_uframes_t; typedef long sndrv_pcm_sframes_t; @@ -285,6 +285,7 @@ enum sndrv_pcm_subformat { #define SNDRV_PCM_INFO_JOINT_DUPLEX 0x00200000 /* playback and capture stream are somewhat correlated */ #define SNDRV_PCM_INFO_SYNC_START 0x00400000 /* pcm support some kind of sync go */ #define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP 0x00800000 /* period wakeup can be disabled */ +#define SNDRV_PCM_INFO_HAS_WALL_CLOCK 0x01000000 /* has audio wall clock for audio/system time sync */ enum sndrv_pcm_state { SNDRV_PCM_STATE_OPEN = 0, /* stream is open */ @@ -426,7 +427,8 @@ struct sndrv_pcm_status { sndrv_pcm_uframes_t avail_max; /* max frames available on hw since last status */ sndrv_pcm_uframes_t overrange; /* count of ADC (capture) overrange detections from last status */ int suspended_state; /* suspended stream state */ - unsigned char reserved[60]; /* must be filled with zero */ + struct timespec audio_tstamp; /* audio wall clock timestamp */ + unsigned char reserved[60-sizeof(struct timespec)]; /* must be filled with zero */ }; struct sndrv_pcm_mmap_status { @@ -435,6 +437,7 @@ struct sndrv_pcm_mmap_status { sndrv_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */ struct timespec tstamp; /* Timestamp */ int suspended_state; /* RO: suspended stream state */ + struct timespec audio_tstamp; /* audio wall clock timestamp */ }; struct sndrv_pcm_mmap_control { diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 18b43b3..49d7b99 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -3123,6 +3123,26 @@ int snd_pcm_hw_params_can_disable_period_wakeup(const snd_pcm_hw_params_t *param } /** + * \brief Check if hardware supports audio wallclock timestamps + * \param params Configuration space + * \retval 0 Hardware doesn't support audio wallclock timestamps + * \retval 1 Hardware supports audio wallclock timestamps + * + * This function should only be called when the configuration space + * contains a single configuration. Call #snd_pcm_hw_params to choose + * a single configuration from the configuration space. + */ +int snd_pcm_hw_params_supports_audio_wallclock_ts(const snd_pcm_hw_params_t *params) +{ + assert(params); + if (CHECK_SANITY(params->info == ~0U)) { + SNDMSG("invalid PCM info field"); + return 0; /* FIXME: should be a negative error? */ + } + return !!(params->info & SNDRV_PCM_INFO_HAS_WALL_CLOCK); +} + +/** * \brief Get rate exact info from a configuration space * \param params Configuration space * \param rate_num Pointer to returned rate numerator @@ -6213,6 +6233,17 @@ void snd_pcm_status_get_htstamp(const snd_pcm_status_t *obj, snd_htimestamp_t *p use_default_symbol_version(__snd_pcm_status_get_htstamp, snd_pcm_status_get_htstamp, ALSA_0.9.0rc8); /** + * \brief Get "now" hi-res audio wallclock timestamp from a PCM status container + * \param obj pointer to #snd_pcm_status_t + * \param ptr Pointer to returned timestamp + */ +void snd_pcm_status_get_htstamp_wallclk(const snd_pcm_status_t *obj, snd_htimestamp_t *ptr) +{ + assert(obj && ptr); + *ptr = obj->audio_tstamp; +} + +/** * \brief Get delay from a PCM status container (see #snd_pcm_delay) * \return Delay in frames * -- 1.7.6.5

1 0

Re: [alsa-devel] [PATCH] ASoC: snd_dmaengine: add common api for pcm_mmap
by Takashi Iwai 28 Jun '12

28 Jun '12

At Thu, 28 Jun 2012 19:30:57 +0530, Laxman Dewangan wrote: > > On Thursday 28 June 2012 07:21 PM, Takashi Iwai wrote: > > At Thu, 28 Jun 2012 19:06:07 +0530, > > Laxman Dewangan wrote: > > > >>>> Then how about this? > >>>> create new file and header for snd-pcm-writecombine-buffer.c/.h and put > >>>> this in sound/core. > >>>> Select this file compilation through config SND_PCM_WRITECOMBINE_BUFFER > >>>> which will be select this config through sound/soc/xxx/Kconfig if they > >>>> want to use. > >>>> This will provide three apis: new, free and mmap. > >>> Way too much hustles than necessary... > >> Ooh no. :-( I had taken the idea from snd_dmaengine_pcm driver. > >> Bit I like to hear simple way which solves the purpose. > > As Lars suggested, a simple ifdef should suffice for now. > > With the upcoming generic dma_mmap_writecombine() stuff, it'd be even > > simpler in future. > > > > But, still we need to be careful about this. As mentioned, there is > > no flag to know the possibility of writecombine mmap beforehand. > > It'd be nice if we have either a compile-time or a run-time flag / > > function to check that. Then the driver can also expose the mmap > > capability to user-space depending on the flag. > > Yaah, this seems really simple. Thanks for suggestion. > If I understand it fully, the new apis will be declare in sound/pcm.h, > implement it in pcm_native.c and use the config variable > CONFIG_SND_PCM_WRITECOMBINE_BUFFER for ifdef. Or this could be simply ifdef CONFIG_ARM. Since this ifdef will be unnecessary soon later, I don't think we need to give yet another kconfig. Of course, we should put a good comment around there for not keeping it for long time. Takashi

1 0

Re: [alsa-devel] [PATCH] ASoC: snd_dmaengine: add common api for pcm_mmap
by Lars-Peter Clausen 28 Jun '12

28 Jun '12

On 06/28/2012 01:56 PM, Laxman Dewangan wrote: > On Thursday 28 June 2012 04:21 PM, Mark Brown wrote: >> * PGP Signed by an unknown key >> >> On Thu, Jun 28, 2012 at 12:31:26PM +0530, Laxman Dewangan wrote: >>> The pcm mmap for the substream dma buffer is done using the >>> dma_mmap_writecombine(). >>> Some of the chip sound driver like Spear, Tegra, Davinci, >>> ep93xx,snd_imx, snd_mxs, NUC900, OMAP, Samsung are doing this >>> mapping locally. >>> Add api in the snd dmaengine driver so that different client of >>> snd dmaengine can use this rather than implementing locally. >> OK, but I'd expect this to come along with one or more patches >> converting at least some of the users to the new API... > > This is effort towards moving the Tegra pcm driver for dmangine based dma > driver inplace of legacy dma driver for Tegra which have private API. > > Currently, following 4 pcm driver can use this API directly keeping that > they already using the generic snd dmaengine pcm driver. > ep93xx, > spear, > fsl, > mxs. > And Tegra will be next. > > Other driver which can use this API are davinci, OMAP, samsung but because > they are not using the snd_dmaengine_pcm driver's api as of now so not be > very much useful for them. Btw. all these drivers basically use the same code for buffer preallocation. Since how the buffer is mmaped is related to how it is allocated it might be worth to factor this out at the same time as well. - Lars

2 1

Re: [alsa-devel] [PATCH] ASoC: snd_dmaengine: add common api for pcm_mmap
by Takashi Iwai 28 Jun '12

28 Jun '12

At Thu, 28 Jun 2012 18:34:02 +0530, Laxman Dewangan wrote: > > On Thursday 28 June 2012 06:27 PM, Takashi Iwai wrote: > > At Thu, 28 Jun 2012 18:05:53 +0530, > > Laxman Dewangan wrote: > >> On Thursday 28 June 2012 05:58 PM, Mark Brown wrote: > >>> * PGP Signed by an unknown key > >>> > >>> On Thu, Jun 28, 2012 at 02:30:26PM +0200, Lars-Peter Clausen wrote: > >>>> On 06/28/2012 02:18 PM, Mark Brown wrote: > >>>>> Oh, dear - this means we don't actually have a generic API at all. Is > >>>>> there any effort being made to make this generally available? > >>>> Yes there is, and in fact in next/master there is generic > >>>> dma_mmap_writecombine. I'm not quite sure how it behaves on non ARM archs > >>>> though. But in theory it should fallback to a normal coherent mapping. Marek > >>>> did a lot of work on this, I've put him on Cc. > >> So can we put the function snd_pcm_lib_writecombine_mmap() in the > >> pcm_native.c and only export this api for ARM i.e. under macro #ifdef > >> CONFIG_ARM so that ARM based SOCs like Tegra/epa3xx/mxs/spear can > >> directly use that one? > >> Or, wait for this common API until all ARCH support it? > > I think it's fine to put it first in ALSA side with some ifdef. > > A similar trick is already found for snd_pcm_lib_mmap_iomem. > > See include/sound/pcm.h. > > > > But, actually it's a still question what if an architecture doesn't > > support the mmap of writecombine at all. The proposed patch doesn't > > allow you to know whether writecombine-mmap is possible or not on the > > running architecture until you really try to call it and fail. > > It's a missing piece, IMO. > > Lars wanted to move the buffer allocation also to common place. Which common place? > Then how about this? > create new file and header for snd-pcm-writecombine-buffer.c/.h and put > this in sound/core. > Select this file compilation through config SND_PCM_WRITECOMBINE_BUFFER > which will be select this config through sound/soc/xxx/Kconfig if they > want to use. > This will provide three apis: new, free and mmap. Way too much hustles than necessary... Takashi

1 0

Re: [alsa-devel] [PATCH] ASoC: snd_dmaengine: add common api for pcm_mmap
by Takashi Iwai 28 Jun '12

28 Jun '12

At Thu, 28 Jun 2012 18:05:53 +0530, Laxman Dewangan wrote: > > On Thursday 28 June 2012 05:58 PM, Mark Brown wrote: > > * PGP Signed by an unknown key > > > > On Thu, Jun 28, 2012 at 02:30:26PM +0200, Lars-Peter Clausen wrote: > >> On 06/28/2012 02:18 PM, Mark Brown wrote: > >>> Oh, dear - this means we don't actually have a generic API at all. Is > >>> there any effort being made to make this generally available? > >> Yes there is, and in fact in next/master there is generic > >> dma_mmap_writecombine. I'm not quite sure how it behaves on non ARM archs > >> though. But in theory it should fallback to a normal coherent mapping. Marek > >> did a lot of work on this, I've put him on Cc. > > So can we put the function snd_pcm_lib_writecombine_mmap() in the > pcm_native.c and only export this api for ARM i.e. under macro #ifdef > CONFIG_ARM so that ARM based SOCs like Tegra/epa3xx/mxs/spear can > directly use that one? > Or, wait for this common API until all ARCH support it? I think it's fine to put it first in ALSA side with some ifdef. A similar trick is already found for snd_pcm_lib_mmap_iomem. See include/sound/pcm.h. But, actually it's a still question what if an architecture doesn't support the mmap of writecombine at all. The proposed patch doesn't allow you to know whether writecombine-mmap is possible or not on the running architecture until you really try to call it and fail. It's a missing piece, IMO. Takashi

1 0

Re: [alsa-devel] [PATCH] ASoC: snd_dmaengine: add common api for pcm_mmap
by Lars-Peter Clausen 28 Jun '12

28 Jun '12

On 06/28/2012 09:01 AM, Laxman Dewangan wrote: > The pcm mmap for the substream dma buffer is done using the > dma_mmap_writecombine(). > Some of the chip sound driver like Spear, Tegra, Davinci, > ep93xx,snd_imx, snd_mxs, NUC900, OMAP, Samsung are doing this > mapping locally. > Add api in the snd dmaengine driver so that different client of > snd dmaengine can use this rather than implementing locally. > This is not really related to the dmaengine pcm driver. It's more of a coincidence that all upstream drivers which use the dmaengine pcm driver also use write-combined memory. In my opinion it would be better to add this to the ALSA core. Now that there is a generic dma_mmap_writecombine it may make sense to integrate this with snd_pcm_lib_default_mmap. - Lars > Signed-off-by: Laxman Dewangan <ldewangan(a)nvidia.com> > --- > include/sound/dmaengine_pcm.h | 2 ++ > sound/soc/soc-dmaengine-pcm.c | 17 +++++++++++++++++ > 2 files changed, 19 insertions(+), 0 deletions(-) > > diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h > index b877334..15c0d3c 100644 > --- a/include/sound/dmaengine_pcm.h > +++ b/include/sound/dmaengine_pcm.h > @@ -47,4 +47,6 @@ int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream); > > struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream); > > +int snd_dmaengine_pcm_mmap_writecombine(struct snd_pcm_substream *substream, > + struct vm_area_struct *vma); > #endif > diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c > index 5df529e..6535eb3 100644 > --- a/sound/soc/soc-dmaengine-pcm.c > +++ b/sound/soc/soc-dmaengine-pcm.c > @@ -21,6 +21,7 @@ > #include <linux/module.h> > #include <linux/init.h> > #include <linux/dmaengine.h> > +#include <linux/dma-mapping.h> > #include <linux/slab.h> > #include <sound/pcm.h> > #include <sound/pcm_params.h> > @@ -313,3 +314,19 @@ int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream) > return 0; > } > EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_close); > + > +/** > + * snd_dmaengine_pcm_mmap_writecombine - mmap stream dma buffer using > + * dma_mmap_writecombine(). > + * @substream: PCM substream > + * @vma: VM area. > + */ > +int snd_dmaengine_pcm_mmap_writecombine(struct snd_pcm_substream *substream, > + struct vm_area_struct *vma) > +{ > + struct snd_pcm_runtime *runtime = substream->runtime; > + > + return dma_mmap_writecombine(substream->pcm->card->dev, vma, > + runtime->dma_area, runtime->dma_addr, runtime->dma_bytes); > +} > +EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_mmap_writecombine);

4 5