diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-09 19:50:30 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-27 11:10:01 +0200 |
commit | 2340c646e6a5da658e114be2f721ff90853588d4 (patch) | |
tree | df9744d2344e71e8c5d1b75c3e1528bc474313fe /target/linux/brcm2708/patches-4.19/950-0405-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch | |
parent | 81d0da118694feb874f992093063a2852285d194 (diff) | |
download | upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.gz upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.bz2 upstream-2340c646e6a5da658e114be2f721ff90853588d4.zip |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0405-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0405-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0405-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch b/target/linux/brcm2708/patches-4.19/950-0405-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch new file mode 100644 index 0000000000..723ff9c1d8 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0405-ASoC-tlv320aic32x4-Move-aosr-and-dosr-setting-to-sep.patch @@ -0,0 +1,58 @@ +From fec4f0b76b1641917c9d2f60169194a00aee5916 Mon Sep 17 00:00:00 2001 +From: Annaliese McDermond <nh6z@nh6z.net> +Date: Thu, 21 Mar 2019 17:58:50 -0700 +Subject: [PATCH 405/773] ASoC: tlv320aic32x4: Move aosr and dosr setting to + separate functions + +commit fbafbf6517274a797e6e6508c18dd8dba5920c89 upstream. + +Move these to separate helper functions. This looks cleaner and fits +better with the new clock setting in CCF. + +Signed-off-by: Annaliese McDermond <nh6z@nh6z.net> +Signed-off-by: Mark Brown <broonie@kernel.org> +--- + sound/soc/codecs/tlv320aic32x4.c | 24 +++++++++++++++++------- + 1 file changed, 17 insertions(+), 7 deletions(-) + +--- a/sound/soc/codecs/tlv320aic32x4.c ++++ b/sound/soc/codecs/tlv320aic32x4.c +@@ -720,6 +720,20 @@ static int aic32x4_set_dai_fmt(struct sn + return 0; + } + ++static int aic32x4_set_aosr(struct snd_soc_component *component, u8 aosr) ++{ ++ return snd_soc_component_write(component, AIC32X4_AOSR, aosr); ++} ++ ++static int aic32x4_set_dosr(struct snd_soc_component *component, u16 dosr) ++{ ++ snd_soc_component_write(component, AIC32X4_DOSRMSB, dosr >> 8); ++ snd_soc_component_write(component, AIC32X4_DOSRLSB, ++ (dosr & 0xff)); ++ ++ return 0; ++} ++ + static int aic32x4_set_processing_blocks(struct snd_soc_component *component, + u8 r_block, u8 p_block) + { +@@ -765,14 +779,10 @@ static int aic32x4_setup_clocks(struct s + clk_set_rate(clocks[4].clk, aic32x4_divs[i].mdac_rate); + clk_set_rate(clocks[5].clk, aic32x4_divs[i].bdiv_rate); + +- aic32x4_set_processing_blocks(component, aic32x4_divs[i].r_block, aic32x4_divs[i].p_block); ++ aic32x4_set_aosr(component, aic32x4_divs[i].aosr); ++ aic32x4_set_dosr(component, aic32x4_divs[i].dosr); + +- /* DOSR MSB & LSB values */ +- snd_soc_component_write(component, AIC32X4_DOSRMSB, aic32x4_divs[i].dosr >> 8); +- snd_soc_component_write(component, AIC32X4_DOSRLSB, (aic32x4_divs[i].dosr & 0xff)); +- +- /* AOSR value */ +- snd_soc_component_write(component, AIC32X4_AOSR, aic32x4_divs[i].aosr); ++ aic32x4_set_processing_blocks(component, aic32x4_divs[i].r_block, aic32x4_divs[i].p_block); + + return 0; + } |