| Message ID | 20220107160636.6555-1-ckeepax@opensource.cirrus.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Add low power hibernation support to cs35l41 | expand |
On Fri, Jan 07, 2022 at 04:06:34PM +0000, Charles Keepax wrote: > These patches will cause some very minor conflicts with Lucas's > currently outstanding work on the HDA version of cs35l41. Whilst > things will still build (well now I fixed my silly mistake), this > patch adds a test key function his code will now have to call. Which patches are these? It looks like everything I was aware of is merged.
On Fri, 07 Jan 2022 17:06:34 +0100, Charles Keepax wrote: > > This patch series adds support for the low power hibernation feature > on cs35l41. This allows the DSP memory to be retained whilst the > device enters a very low power state. > > These patches will cause some very minor conflicts with Lucas's > currently outstanding work on the HDA version of cs35l41. Whilst > things will still build (well now I fixed my silly mistake), this > patch adds a test key function his code will now have to call. > > It looks like Lucas's patch might get a respin based on the comments > from Andy, in which case I guess we can pull the small change into the > next version of it. But either way these patches are not urgent so I > am happy if they sit around until Lucas's stuff is merged too. Well, I've already merged HD-audio part, so any changes will be incremental over it. CS35L41 HD-audio stuff still won't work as of now with my tree alone because of the lack of the ACPI patch. So it's fine to merge those changes to Mark's tree and break the stuff now, supposing it'll be synced again before 5.17-rc1 pull request. After it's merged to my tree, you can submit the HD-audio fix, to be merged before rc1. thanks, Takashi
On Fri, Jan 07, 2022 at 05:15:52PM +0100, Takashi Iwai wrote: > On Fri, 07 Jan 2022 17:06:34 +0100, > Charles Keepax wrote: > > > > This patch series adds support for the low power hibernation feature > > on cs35l41. This allows the DSP memory to be retained whilst the > > device enters a very low power state. > > > > These patches will cause some very minor conflicts with Lucas's > > currently outstanding work on the HDA version of cs35l41. Whilst > > things will still build (well now I fixed my silly mistake), this > > patch adds a test key function his code will now have to call. > > > > It looks like Lucas's patch might get a respin based on the comments > > from Andy, in which case I guess we can pull the small change into the > > next version of it. But either way these patches are not urgent so I > > am happy if they sit around until Lucas's stuff is merged too. > > Well, I've already merged HD-audio part, so any changes will be > incremental over it. > > CS35L41 HD-audio stuff still won't work as of now with my tree alone > because of the lack of the ACPI patch. So it's fine to merge those > changes to Mark's tree and break the stuff now, supposing it'll be > synced again before 5.17-rc1 pull request. After it's merged to my > tree, you can submit the HD-audio fix, to be merged before rc1. > Apologies I didn't realise those were already merged. I will do a patch to update them to use the new functions. Thanks, Charles
On Fri, 7 Jan 2022 16:06:34 +0000, Charles Keepax wrote: > This patch series adds support for the low power hibernation feature > on cs35l41. This allows the DSP memory to be retained whilst the > device enters a very low power state. > > These patches will cause some very minor conflicts with Lucas's > currently outstanding work on the HDA version of cs35l41. Whilst > things will still build (well now I fixed my silly mistake), this > patch adds a test key function his code will now have to call. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: cs35l41: Update handling of test key registers commit: d92321bbe46b0ecae0941461379d39599610d869 [2/2] ASoC: cs35l41: Add support for hibernate memory retention mode commit: f517ba4924ad026f2583553db02f3c8bc69de88b All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark