diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-07-31 18:23:26 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-02 18:51:32 +0200 |
| commit | 19226502bf6393706defe7f049c587b32c9b4f33 (patch) | |
| tree | 0bff89a72b7006051a6eec1ac3c0c9250490cf4f /target/linux/brcm2708/patches-4.19/950-0400-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch | |
| parent | 66458c49aa14ebc9ba2e4f9b6a323b8ff122807b (diff) | |
| download | upstream-19226502bf6393706defe7f049c587b32c9b4f33.tar.gz upstream-19226502bf6393706defe7f049c587b32c9b4f33.tar.bz2 upstream-19226502bf6393706defe7f049c587b32c9b4f33.zip | |
brcm2708: update to latest patches from the RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0400-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0400-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0400-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch b/target/linux/brcm2708/patches-4.19/950-0400-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch new file mode 100644 index 0000000000..8061e7e329 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0400-ASoC-tlv320aic32x4-Break-out-clock-setting-into-sepa.patch @@ -0,0 +1,64 @@ +From b1658d7dba649351779a09c99c5db424f6a44ee1 Mon Sep 17 00:00:00 2001 +From: Annaliese McDermond <nh6z@nh6z.net> +Date: Mon, 18 Mar 2019 20:37:44 -0700 +Subject: [PATCH 400/725] ASoC: tlv320aic32x4: Break out clock setting into + separate function + +commit bf31cbfbe25001036e1e096b1c260bf871766ea5 upstream. + +Break the clock setting logic out from the main hw_params. It's +rather large and unweildy and makes for a large function. This +also better enables some of the following changes to the clock +tree access in the driver. + +Signed-off-by: Annaliese McDermond <nh6z@nh6z.net> +Signed-off-by: Mark Brown <broonie@kernel.org> +--- + sound/soc/codecs/tlv320aic32x4.c | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +--- a/sound/soc/codecs/tlv320aic32x4.c ++++ b/sound/soc/codecs/tlv320aic32x4.c +@@ -698,17 +698,13 @@ static int aic32x4_set_dai_fmt(struct sn + return 0; + } + +-static int aic32x4_hw_params(struct snd_pcm_substream *substream, +- struct snd_pcm_hw_params *params, +- struct snd_soc_dai *dai) ++static int aic32x4_setup_clocks(struct snd_soc_component *component, ++ unsigned int sample_rate, ++ unsigned int parent_rate) + { +- struct snd_soc_component *component = dai->component; +- struct aic32x4_priv *aic32x4 = snd_soc_component_get_drvdata(component); +- u8 iface1_reg = 0; +- u8 dacsetup_reg = 0; + int i; + +- i = aic32x4_get_divs(aic32x4->sysclk, params_rate(params)); ++ i = aic32x4_get_divs(parent_rate, sample_rate); + if (i < 0) { + printk(KERN_ERR "aic32x4: sampling rate not supported\n"); + return i; +@@ -765,6 +761,20 @@ static int aic32x4_hw_params(struct snd_ + snd_soc_component_update_bits(component, AIC32X4_BCLKN, + AIC32X4_BCLK_MASK, aic32x4_divs[i].blck_N); + ++ return 0; ++} ++ ++static int aic32x4_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params, ++ struct snd_soc_dai *dai) ++{ ++ struct snd_soc_component *component = dai->component; ++ struct aic32x4_priv *aic32x4 = snd_soc_component_get_drvdata(component); ++ u8 iface1_reg = 0; ++ u8 dacsetup_reg = 0; ++ ++ aic32x4_setup_clocks(component, params_rate(params), aic32x4->sysclk); ++ + switch (params_width(params)) { + case 16: + iface1_reg |= (AIC32X4_WORD_LEN_16BITS << |