| Message ID | 20220714180007.C9835C34114@smtp.kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] ASoC fixes for v5.19-rc4-2 | expand |
On Fri, Jul 15, 2022 at 08:44:44AM +0200, Takashi Iwai wrote: > Mark Brown wrote: > > As covered in the second revert commit in this pull request the version > > of the BCLK muxing that's in v5.19 is causing issues, let's just revert > > it and wait for the more complete support in v5.20 instead. > Hmm, this revert itself is fine, but the PR contains way too many > changes than expected as a *very* late stage. Are all those really > mandatory as 5.19 fixes? e.g. regressions that have been introduced > in 5.19-rc or such? Otherwise I prefer cherry-picking only the really > needed one for now for the merge to 5.19-final. Ah, I suspect what's gone wrong here is that my script generated it against Linus' tree but you'd not yet sent your pull request since the last time I sent you changes so it has all the changes you already have in it. Regenerating it against asoc-fix-v5.19-rc4 gives: The following changes since commit fc976f5629afb4160ee77798b14a693eac903ffd: ASoC: Intel: Skylake: Correct the handling of fmt_config flexible array (2022-07-07 17:16:40 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.19-rc4-2 for you to fetch changes up to 1e347f861da8ddb17e1d1b3113cb6c188e0de3e5: ASoC: rockchip-i2s: Undo BCLK pinctrl changes (2022-07-14 13:25:52 +0100) ---------------------------------------------------------------- ASoC: Drop Rockchip BCLK management for v5.19 As covered in the second revert commit in this pull request the version of the BCLK muxing that's in v5.19 is causing issues, let's just revert it and wait for the more complete support in v5.20 instead. ---------------------------------------------------------------- Alexandru Elisei (1): ASoC: rockchip: i2s: Fix NULL pointer dereference when pinctrl is not found Mark Brown (1): ASoC: rockchip-i2s: Undo BCLK pinctrl changes sound/soc/rockchip/rockchip_i2s.c | 160 ++++++++------------------------------ 1 file changed, 31 insertions(+), 129 deletions(-)
On Fri, 15 Jul 2022 12:25:56 +0200, Mark Brown wrote: > > On Fri, Jul 15, 2022 at 08:44:44AM +0200, Takashi Iwai wrote: > > Mark Brown wrote: > > > > As covered in the second revert commit in this pull request the version > > > of the BCLK muxing that's in v5.19 is causing issues, let's just revert > > > it and wait for the more complete support in v5.20 instead. > > > Hmm, this revert itself is fine, but the PR contains way too many > > changes than expected as a *very* late stage. Are all those really > > mandatory as 5.19 fixes? e.g. regressions that have been introduced > > in 5.19-rc or such? Otherwise I prefer cherry-picking only the really > > needed one for now for the merge to 5.19-final. > > Ah, I suspect what's gone wrong here is that my script generated it > against Linus' tree but you'd not yet sent your pull request since the > last time I sent you changes so it has all the changes you already have > in it. Regenerating it against asoc-fix-v5.19-rc4 gives: > > The following changes since commit fc976f5629afb4160ee77798b14a693eac903ffd: > > ASoC: Intel: Skylake: Correct the handling of fmt_config flexible array (2022-07-07 17:16:40 +0100) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.19-rc4-2 > > for you to fetch changes up to 1e347f861da8ddb17e1d1b3113cb6c188e0de3e5: > > ASoC: rockchip-i2s: Undo BCLK pinctrl changes (2022-07-14 13:25:52 +0100) > > ---------------------------------------------------------------- > ASoC: Drop Rockchip BCLK management for v5.19 > > As covered in the second revert commit in this pull request the version > of the BCLK muxing that's in v5.19 is causing issues, let's just revert > it and wait for the more complete support in v5.20 instead. > > ---------------------------------------------------------------- > Alexandru Elisei (1): > ASoC: rockchip: i2s: Fix NULL pointer dereference when pinctrl is not found > > Mark Brown (1): > ASoC: rockchip-i2s: Undo BCLK pinctrl changes OK, that relieved me. Now pulled to for-linus branch. Thanks! Takashi
On Fri, 15 Jul 2022 12:31:29 +0200, Takashi Iwai wrote: > > On Fri, 15 Jul 2022 12:25:56 +0200, > Mark Brown wrote: > > > > On Fri, Jul 15, 2022 at 08:44:44AM +0200, Takashi Iwai wrote: > > > Mark Brown wrote: > > > > > > As covered in the second revert commit in this pull request the version > > > > of the BCLK muxing that's in v5.19 is causing issues, let's just revert > > > > it and wait for the more complete support in v5.20 instead. > > > > > Hmm, this revert itself is fine, but the PR contains way too many > > > changes than expected as a *very* late stage. Are all those really > > > mandatory as 5.19 fixes? e.g. regressions that have been introduced > > > in 5.19-rc or such? Otherwise I prefer cherry-picking only the really > > > needed one for now for the merge to 5.19-final. > > > > Ah, I suspect what's gone wrong here is that my script generated it > > against Linus' tree but you'd not yet sent your pull request since the > > last time I sent you changes so it has all the changes you already have > > in it. Regenerating it against asoc-fix-v5.19-rc4 gives: > > > > The following changes since commit fc976f5629afb4160ee77798b14a693eac903ffd: > > > > ASoC: Intel: Skylake: Correct the handling of fmt_config flexible array (2022-07-07 17:16:40 +0100) > > > > are available in the Git repository at: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.19-rc4-2 > > > > for you to fetch changes up to 1e347f861da8ddb17e1d1b3113cb6c188e0de3e5: > > > > ASoC: rockchip-i2s: Undo BCLK pinctrl changes (2022-07-14 13:25:52 +0100) > > > > ---------------------------------------------------------------- > > ASoC: Drop Rockchip BCLK management for v5.19 > > > > As covered in the second revert commit in this pull request the version > > of the BCLK muxing that's in v5.19 is causing issues, let's just revert > > it and wait for the more complete support in v5.20 instead. > > > > ---------------------------------------------------------------- > > Alexandru Elisei (1): > > ASoC: rockchip: i2s: Fix NULL pointer dereference when pinctrl is not found > > > > Mark Brown (1): > > ASoC: rockchip-i2s: Undo BCLK pinctrl changes > > OK, that relieved me. Now pulled to for-linus branch. BTW, while we're at it: could you submit a PR for the current ASoC for-next branch ASAP? There are a few pending HD-audio patches that wait for the missing recent ASoC HD-audio changes over weeks: https://lore.kernel.org/all/87a69ii749.wl-tiwai@suse.de/ https://lore.kernel.org/all/874jzqi61l.wl-tiwai@suse.de/ thanks, Takashi
On Fri, Jul 15, 2022 at 12:35:37PM +0200, Takashi Iwai wrote: > BTW, while we're at it: could you submit a PR for the current ASoC > for-next branch ASAP? There are a few pending HD-audio patches that > wait for the missing recent ASoC HD-audio changes over weeks: > https://lore.kernel.org/all/87a69ii749.wl-tiwai@suse.de/ > https://lore.kernel.org/all/874jzqi61l.wl-tiwai@suse.de/ Ah, sure - sorry, I hadn't seen those messages at all. I'd just been deleting that thread since it was all HDA stuff which people copy me in on all the time even when it isn't relevant. The stuff I send about subject lines is getting sent for a reason!
The following changes since commit 980555e95f7cabdc9c80a07107622b097ba23703: ASoC: madera: Fix event generation for rate controls (2022-06-24 16:22:01 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.19-rc4-2 for you to fetch changes up to 1e347f861da8ddb17e1d1b3113cb6c188e0de3e5: ASoC: rockchip-i2s: Undo BCLK pinctrl changes (2022-07-14 13:25:52 +0100) ---------------------------------------------------------------- ASoC: Drop Rockchip BCLK management for v5.19 As covered in the second revert commit in this pull request the version of the BCLK muxing that's in v5.19 is causing issues, let's just revert it and wait for the more complete support in v5.20 instead. ---------------------------------------------------------------- Alexandru Elisei (1): ASoC: rockchip: i2s: Fix NULL pointer dereference when pinctrl is not found Brent Lu (1): ASoC: Intel: sof_rt5682: fix out-of-bounds array access Bryan O'Donoghue (1): ASoC: dt-bindings: Fix description for msm8916 Charles Keepax (4): ASoC: wm5102: Fix event generation for output compensation ASoC: wm8998: Fix event generation for input mux ASoC: cs47l92: Fix event generation for OUT1 demux ASoC: arizona: Update arizona_aif_cfg_changed to use RX_BCLK_RATE Daniel Mack (1): ASoC: max98396: Fix register access for PCM format settings David Owens (1): ASoC: ti: omap-mcbsp: duplicate sysfs error Francesco Dolcini (1): ASoC: sgtl5000: Fix noise on shutdown/remove Hector Martin (2): ASoC: tas2764: Correct playback volume range ASoC: tas2764: Fix amp gain register offset & default Jianglei Nie (1): ASoC: qdsp6: fix potential memory leak in q6apm_get_audioreach_graph() Marek Vasut (1): ASoC: doc: Capitalize RESET line name Mark Brown (1): ASoC: rockchip-i2s: Undo BCLK pinctrl changes Martin PoviĊĦer (2): ASoC: tas2764: Add post reset delays ASoC: tas2764: Fix and extend FSYNC polarity handling Oder Chiou (1): ASoC: rt5640: Fix the wrong state of JD1 and JD2 Peter Ujfalusi (2): ASoC: Intel: Skylake: Correct the ssp rate discovery in skl_get_ssp_clks() ASoC: Intel: Skylake: Correct the handling of fmt_config flexible array Sascha Hauer (2): ASoC: audio_graph_card2: Fix port numbers in example ASoC: tlv320adcx140: Fix tx_mask check Yassine Oudjana (1): ASoC: wcd9335: Use int array instead of bitmask for TX mixers .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 8 +- Documentation/sound/soc/dai.rst | 2 +- sound/soc/codecs/arizona.c | 4 +- sound/soc/codecs/cs47l92.c | 8 +- sound/soc/codecs/max98396.c | 10 +- sound/soc/codecs/rt5640.c | 30 ++-- sound/soc/codecs/sgtl5000.c | 9 ++ sound/soc/codecs/sgtl5000.h | 1 + sound/soc/codecs/tas2764.c | 46 +++--- sound/soc/codecs/tas2764.h | 6 +- sound/soc/codecs/tlv320adcx140.c | 13 +- sound/soc/codecs/wcd9335.c | 17 ++- sound/soc/codecs/wm5102.c | 21 ++- sound/soc/codecs/wm8998.c | 21 ++- sound/soc/generic/audio-graph-card2.c | 6 +- sound/soc/intel/boards/sof_rt5682.c | 10 +- sound/soc/intel/skylake/skl-nhlt.c | 40 ++++-- sound/soc/qcom/qdsp6/q6apm.c | 1 + sound/soc/rockchip/rockchip_i2s.c | 160 ++++----------------- sound/soc/ti/omap-mcbsp-priv.h | 2 - sound/soc/ti/omap-mcbsp-st.c | 14 +- sound/soc/ti/omap-mcbsp.c | 19 +-- 22 files changed, 199 insertions(+), 249 deletions(-)