31 May, 2016
1 commit
25 May, 2016
1 commit
-
Fix compile error when make imx_v7_mfg_defconfig.
Signed-off-by: zhang sanshan
04 May, 2016
4 commits
-
Validity bit is set in default, which means the data is not reliable,
The receive device may drop this data. So clear it in default, and
provide a mixer interface for user to control this bit.Signed-off-by: Shengjiu Wang
(cherry picked from commit 48293e6bf7793de01678ee1426cccc9119998ba1) -
Remove the pre-processing and post-processing table. use proc_autosel()
to select proper parameters.
Unify the supported input and output rate.Signed-off-by: Shengjiu Wang
(cherry picked from commit 8353ec20bd9950ec98d76423c62321a7ea0c7190) -
After the suspend/resume, hw_params may be called in bias_level is not
BIAS_ON, then the PLL is not disable/enabled, if the sample rate is
changed, the output clock is not correct.Signed-off-by: Shengjiu Wang
(cherry picked from commit cced8358c2202824dfdc1780609539655ae5fec5) -
After suspend and resume, the wm8960 codec will change the state from
BIAS_OFF to BIAS_ON, in this time, the hw_free is called, the PLL will be
diabled, and next instance is started in rapid sequence, hw_params is called
But PLL is not enabled, because the bias state is not BIAS_ON.As PLL is disabled in BIAS_ON->BIAS_STANDBY, so don't need to disable pll
in hw_free of machine driver.Signed-off-by: Shengjiu Wang
(cherry picked from commit 9b6063efd3966266a1a7616c11b818139933497e)
30 Mar, 2016
1 commit
04 Mar, 2016
1 commit
-
When playback mono wav with record in background, there will be some
nosie in the right dac channel. It seems that the ADC data has been
routed to the dac channel.The cs42888 have 8 dac channels, it's appropriate to mute the unused
dac channels, and the noise will disappear.Steps to reproduce this issue:
arecord -D hw:0,0 -f S16_LE -r 48000 -c 1 a.wav &
aplay -Dhw:0,0 audio48k16M.wavSigned-off-by: Zidan Wang
Signed-off-by: Mark Brown
(cherry picked from commit 1f1e60c9cdd573be271130e44a23efed48e0578d)
15 Feb, 2016
1 commit
04 Feb, 2016
3 commits
-
When audio stop, it will first stop dma, then stop cpu_dai.
If there is delay between dma stop and cpu dai stop, there
will be underrun error, the print will cost time, then will
cause another underrun error, it is a infinite loop.
Which will cause the cpu dai can't stop.Signed-off-by: Shengjiu Wang
(cherry picked from commit 2b47facf5e2314838c5b6e583104ef92d39b6b77) -
We use the devm_snd_dmaengine_pcm_register() for platform,
don't use devm_snd_soc_register_platform(), their close
funtion is different. One will release the dma channel,
but another one won't release channel.When system enter suspend mode, alsa library is in draining
state, it will not resume alsa driver in system resume, just
call close directly. But the alsa driver is in state
SNDRV_PCM_STATE_SUSPENDED, which is not a running state, so
the trigger stop is not called, and dmaengine_terminate_all()
is not called, then dma resource is not released. Which cause
that in the next playback the sdma driver will not be started.
Then there is a lot of SAI underrun error.If we use the devm_snd_soc_register_platform() for platfrom
driver, there will be no issue, because it will release dma
channel, release dma resource. But we use the
devm_snd_dmaengine_pcm_register() for platform driver. So this
patch is to add dmaengine_terminate_all() in the
snd_dmaengine_pcm_close() to fix this issue.Signed-off-by: Shengjiu Wang
(cherry picked from commit ff62968ea8c8b5414f3f049e61addcd4d2bec3b9) -
commit 743cead0f8c4ac6311ffb500efd6146c40124310 is not a complete fix.
There is low possibility that this issue still occur.Last commit add init_completion() in the suspend function, but if the
dma callback function is called after convert error, the complete is
done, the init_completion will not be called, so the complete state is
not correct in the next conversion.This patch is to move init_completion to the beginning of conversion
to fix the issue.Signed-off-by: Shengjiu Wang
(cherry picked from commit 752d0cd21dde90b607bef0467149fe7022bf0b15)
27 Jan, 2016
1 commit
-
cherry-pick 87f3a76d1ba959a5652dfd9b838b151fc0b38084 from 3.14.y_android
ENGR00300008-1 Update sound driver for android linux kernel 3.10
Add switch device for headphone plugin/out
Signed-off-by: Ke Qinghua
Signed-off-by: Winter Wang
Conflicts:
sound/soc/fsl/imx-wm8962.c
20 Jan, 2016
1 commit
-
When load sound card, the pulseaudio will using the sound card to
playback and record. It may be cause a kernel crash when the sound
card is unloaded while the playback/record is activeAfter setting the sound card owner field, when pulseaudio is running,
the sound card module ref-count will not be 0 and the sound card will
not be unloaded. So you should stop the pulseaudio when you want to
unload the sound card.Signed-off-by: Zidan Wang
19 Jan, 2016
2 commits
-
Revert "MLK-11623 ASoC: imx-cs42888: add 32k and 64k sample rate support"
This reverts commit 314a01f40599134086480ef3c5e89a54aeedbf1f.
In Async mode, record and playback use different samplerate, one is 32k,
another is 48kHz, there will be issue "unsupported sysclk ratio".example case is
arecord -Dhw:0,1 -f S16_LE -r 32000 -c 2 | aplay -f S16_LE -r 32000 -c 2Signed-off-by: Shengjiu Wang
-
In suspend function, the complete will be set to done in callback.
After resuming, the convert will not spend time to wait the complete.
which is a wrong complete.
So in suspend function, the complete need to be reinited for next convert.Signed-off-by: Shengjiu Wang
15 Jan, 2016
24 commits
-
resource leak when the event is unknown. Reported by coverity.
Signed-off-by: Zidan Wang
-
Add headphone/micphone/headset jack support for different board.
There are headphone detect gpio and microphone detect gpio which
can be configured from device tree.
If headphone and microphone using the same gpio for jack detect,
it suppose to be a headset and will register a headphone jack for it.
If headphone and microphone using different gpio for jack detect,
it suppose not to be a headset, and will register headphone jack
and microphone jack respectively.Is't not appropriate to set the adc data output in machine driver.
It will not be compatibly when we change hardware connection.
wm8960 codec driver has added "ADC Data Output Select" kcontrol,
so that we can set the ADC data output from user space.Signed-off-by: Zidan Wang
(cherry picked from commit 92f65b4bee51fabdfa3a3c191f511c2ec7cb18a1) -
add kcontrol to select ADC data output.
Signed-off-by: Zidan Wang
(cherry picked from commit a8ee73df7668dbfe5e1de3e08c34b2c9adfe89d1) -
Report by coverity (CID 18428). The return value need be checked
for snd_soc_dai_set_sysclk().Signed-off-by: Shengjiu Wang
-
Patch 11626b6a79e27c716f3731b7dc2208631afbc665 is not a complete workaround.
The complete workaround is that: Each time playback/recording, firstly clear
the xSMA/xSMB, then enable TE/RE, then enable xSMB and xSMA (xSMB must be
enabled before xSMA).Because the xSMA and xSMB is in enabled state after reset, so in original fix
the first time playback/recording after bootup, didn't follow the workaround
flow. There maybe still have channel swap issue.The PDM ticket of this issue is TKT251104.
Signed-off-by: Shengjiu Wang
-
free pair after allocating m2m failed. Reported by coverity.
Signed-off-by: Zidan Wang
(cherry picked from commit 237a35db5b48b78250a019f891d9d746c3411d49) -
using params_width function to simplify code.
Signed-off-by: Zidan Wang
Acked-by: Nicolin Chen
Signed-off-by: Mark Brown
(cherry picked from commit 4ca730436a676afebbe6b77d65b5b4c4d7d38b9c) -
After allocating memory for m2m, we should null check for m2m instead of pair.
In fsl_asrc_close(), null-checking pair suggests that it may be null, but it
has already been dereferenced before the null check. pair will be alloceted
in fsl_asrc_open(), pair is null means that open dev file failed, and
close should not be called in user space. So remove null check for pair.buf_len should not greater than ASRC_DMA_BUFFER_SIZE, otherwith dma buffer will
be overrun.Reported by Coverity.
Signed-off-by: Zidan Wang
(cherry picked from commit b0dc15375b12b6c1bf46b9071b92267b827d8ce0) -
check the return value for snd_pcm_hw_constraint_integer().
Reported by Coverity.Signed-off-by: Zidan Wang
(cherry picked from commit 26f8fea617fcebd8835f660534a988c58b9f0517) -
fix mqs_priv->name overrun issue. Reported by Coverity.
Signed-off-by: Zidan Wang
(cherry picked from commit ef1c59f93981b15412a0207d5517a26901bb2ecd) -
rate_tx and rate_rx are always greater than or equal to 0, so remove the
no effect comparison. Reported by Coverity.Signed-off-by: Zidan Wang
(cherry picked from commit d5957250784a27cf6f6f421d8a6e0ba45b4bbc18) -
init fm_np to avoid wild pointer. Reported by Coverity.
Signed-off-by: Zidan Wang
(cherry picked from commit dea49f320f33e1f723301a0bfa18573c0f7b5fb1) -
fix missing break in switch. Reported by Coverity.
Signed-off-by: Zidan Wang
(cherry picked from commit 302516a1dfca5758a34cbed939c9976679febb0c) -
fix missing break in switch. Reported by Coverity.
Signed-off-by: Zidan Wang
(cherry picked from commit ec9d74d9258e3320ec68a1f977932cb20ace4ca2) -
init codec_np to avoid wild pointer. Reported by Coverity.
Signed-off-by: Zidan Wang
(cherry picked from commit 76665930654867cf38a86ba747a9f8a5bf2665e2) -
…urn value of set_fmt()
init asrc_np to avoid wild pointer and check return value of
set_fmt(). Reported by Coverity.Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
(cherry picked from commit 4ccc87a93e180e09b6494fd6c6d81b07dc054e9b) -
init sii902x_np to avoid wild pointer. Reported by Coverity.
Signed-off-by: Zidan Wang
(cherry picked from commit 780e27683c38f785ea7f7e07e83b00ffd3c22d78) -
init codec_np to avoid wild pointer. Reported by Coverity.
Signed-off-by: Zidan Wang
(cherry picked from commit 8e27b90c9adf5033038a40e0b61a7ffe4c971290) -
check return value for set_fmt and set_sysclk function, and init
codec_np to avoid wild pointer. Reported by coverity.Signed-off-by: Zidan Wang
(cherry picked from commit 68021ab9ada4a7f3037993a3887453e12271d4ed) -
For SAI master mode, when Tx(Rx) sync with Rx(Tx) clock, Rx(Tx) will
generate bclk and frame clock for Tx(Rx), we should set RCR4(TCR4),
RCR5(TCR5) and RMR(TMR) for playback(capture), or there will be sync
error sometimes.Signed-off-by: Zidan Wang
Acked-by: Nicolin Chen
Signed-off-by: Mark Brown
(cherry picked from commit 51659ca069ce5bdf20675a7967a39ef8419e87f2) -
In fsl_sai_set_bclk function, we should not set bclk for Tx/Rx Synchronous
with another SAI mode.Signed-off-by: Zidan Wang
Acked-by: Nicolin Chen
Signed-off-by: Mark Brown
(cherry picked from commit 9cc58712358cbfe51248ef369fc50671149b60fc) -
When using the Rx clock for both, transmitter and receiver, the
transmitter needs to be set to synchronous with receiver.This reverts 855675f6e6a6 ("ASoC: fsl_sai: Set SYNC bit of TCR2 to
Asynchronous Mode"), which, judiging from the commit log, seems to
mixed up between the two synchronous modes: The boolean
sai->synchronous[TX] is indicating wheather the SAI should work in
Rx synchronous mode (sync Tx with Rx), hence if the value is true,
the SYNC field of TCR2 needs to be set to 0x1 ("Synchronous with
receiver").Signed-off-by: Stefan Agner
Acked-by: Nicolin Chen
Signed-off-by: Mark Brown
(cherry picked from commit 3cc7780b6fc04318ab08d84f739503989200cf55) -
Change the xinvert value from 0 to 1 on the "Capture Switch" control
WM8960 datasheet is shown as follows:
Bit 7 at 00h and 01h register address
1 : Enable Mute, 0 : Disable MuteSigned-off-by: JongHo Kim
Acked-by: Charles Keepax
Signed-off-by: Mark Brown
(cherry picked from commit 41a59cae585678136c28cdcbba9cb2faf27685f5) -
Change them to #ifdef as CONFIG_PM_SLEEP might not be defined at all.
Reported-by: kbuild test robot
Signed-off-by: Nicolin Chen
Signed-off-by: Mark Brown
(cherry picked from commit 739146b6144a6541cf94a668d6e7227b7882af30)
