linux-toradex.git/sound, branch tegra

apalis/colibri t30: fix record/playback for sgtl5000 codec

2019-09-09T12:04:37+00:00

Backported commit f997df18c0e4c988de49e984329cefdf6e13ed86

According to the manual [1], SYS_MCLK should base on SYS_FS, not on sample rate.

Calculating SYS_MCLK using sample rate only prevents playing/recording
samples with rate < 16 kHz:
---------------------------------------------------------------
root@apalis-t30:~# aplay test-8k-sample.wav
Playing WAVE 'test-8k-sample.wav' : Signed 16 bit
[...] tegra-snd-apalis-tk1-sgtl5000 tegra-snd-apalis-tk1-sgtl5000.0: ASoC: machine hw_params failed: -22
Little Endian, Rate 8000 Hz, Stereo
aplay: set_params:1403: Unable to install hw params:
...
---------------------------------------------------------------

Using the helper from sgtl5000.h fixes this issue.

To keep determination of sys_fs solid, use a helper in device driver.

[1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf

Signed-off-by: Oleksandr Suvorov

ASoC: sgtl5000: add helpers to calculate mclk

2019-09-09T11:56:07+00:00

Calculate SYS_MCLK using sample rate or SYS_FS.
These helpers allow to simplify a code to set up external system clock
for different sample rates.

Signed-off-by: Oleksandr Suvorov

ASoC: sgtl5000: Fix charge pump source assignment

2019-09-09T11:49:10+00:00

Backported commit 8326ab1285e71e24481d8e1eee3e72a6b3abbb38

If VDDA != VDDIO and any of them is greater than 3.1V, charge pump
source can be assigned automatically [1].

[1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf

Signed-off-by: Oleksandr Suvorov 
Reviewed-by: Marcel Ziswiler 
Reviewed-by: Igor Opaniuk 
Reviewed-by: Fabio Estevam

ASoC: sgtl5000: Fix of unmute outputs on prob

2019-09-09T11:42:30+00:00

Backported commit 8337f764b45e122bd17b8c84b7ac26da3086fe26

To enable "zero cross detect" for ADC/HP, change
HP_ZCD_EN/ADC_ZCD_EN bits only instead of writing the whole
CHIP_ANA_CTRL register.

Signed-off-by: Oleksandr Suvorov 
Reviewed-by: Marcel Ziswiler 
Reviewed-by: Igor Opaniuk 
Reviewed-by: Fabio Estevam

ASoC: sgtl5000: add ADC/HP/LINEOUT mute control

2019-09-09T11:37:01+00:00

Backported from commit 19a1d41649f695658a67898dcb9312de02878eb1.

This control mute/unmute the ADC input of SGTL5000
using its CHIP_ANA_CTRL register.

Tuned: add Headphone and Line-Out mute/unmute controlling.

Signed-off-by: Oleksandr Suvorov 
Reviewed-by: Marcel Ziswiler 
Reviewed-by: Igor Opaniuk 
Reviewed-by: Fabio Estevam

ASoC: sgtl5000: Fix definition of VAG Ramp Control

2019-09-09T11:37:01+00:00

Backported from commit 55e23d488cd1367638ee304bd8bb6210f53d13db.

SGTL5000_SMALL_POP is a bit mask, not a value. Usage of
correct definition makes device probing code more clear.

Signed-off-by: Oleksandr Suvorov 
Reviewed-by: Marcel Ziswiler 
Reviewed-by: Igor Opaniuk 
Reviewed-by: Fabio Estevam

ASoC: sgtl5000: Improve VAG power and mute control

2019-09-09T11:01:29+00:00

Backported from commit e6e98e2e05baa3862ac7d1d2334f88ec927c8f66.

VAG power control is improved to fit the manual [1]. This patch fixes as
minimum one bug: if customer muxes Headphone to Line-In right after boot,
the VAG power remains off that leads to poor sound quality from line-in.

I.e. after boot:
  - Connect sound source to Line-In jack;
  - Connect headphone to HP jack;
  - Run following commands:
  $ amixer set 'Headphone' 80%
  $ amixer set 'Headphone Mux' LINE_IN

Change VAG power on/off control according to the following algorithm:
  - turn VAG power ON on the 1st incoming event.
  - keep it ON if there is any active VAG consumer (ADC/DAC/HP/Line-In).
  - turn VAG power OFF when there is the latest consumer's pre-down event
    come.
  - always delay after VAG power OFF to avoid pop.
  - delay after VAG power ON if the initiative consumer is Line-In, this
    prevents pop during line-in muxing.

According to the data sheet [1], to avoid any pops/clicks,
the outputs should be muted during input/output
routing changes.

[1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf

Fixes: 9b34e6cc3bc2 ("ASoC: Add Freescale SGTL5000 codec support")
Signed-off-by: Oleksandr Suvorov 
Reviewed-by: Marcel Ziswiler 
Reviewed-by: Fabio Estevam

asoc: tegra: fix gcc-6 compilation

2016-09-29T12:48:04+00:00

sound/soc/tegra/tegra30_dam.c: In function 'tegra30_dam_probe':
sound/soc/tegra/tegra30_dam.c:620:3: error: this 'if' clause does not
guard... [-Werror=misleading-indentation]
   if ((i == TEGRA30_DAM_CTRL_RSVD_6) ||
   ^~
sound/soc/tegra/tegra30_dam.c:624:4: note: ...this statement, but the
latter is misleadingly indented as if it is guarded by the 'if'
    dam->reg_cache[i] =
    ^~~

Signed-off-by: Marcel Ziswiler 
Acked-by: Max Krummenacher

ASoC: sgtl5000: Fix SMALL_POP bit definition

2015-05-13T07:56:07+00:00

On a mx28evk with a sgtl5000 codec we notice a loud 'click' sound  to happen
5 seconds after the end of a playback.

The SMALL_POP bit should fix this, but its definition is incorrect:
according to the sgtl5000 manual it is bit 0 of CHIP_REF_CTRL register, not
bit 1.

Fix the definition accordingly and enable the bit as intended per the code
comment.

After applying this change, no loud 'click' sound is heard after playback

Signed-off-by: Fabio Estevam 
Signed-off-by: Mark Brown 
Cc: stable@vger.kernel.org
(cherry picked from commit c251ea7bd7a04f1f2575467e0de76e803cf59149)

ASoC: sgtl5000: remove useless register write clearing

2015-05-13T07:37:42+00:00

 CHRGPUMP_POWERUP

The SGTL5000_CHIP_ANA_POWER register is cached. Update the cached
value instead of writing it directly.

Upstream-status: sent

Signed-off-by: Eric Nelson 
(cherry picked from commit 309abdeda8c9331013f25b1a1209d9ce8334237b)
(cherry picked from commit 8a8b303a7431e66a7ec6ec52bc0e04ed0a1335d0)