SPI hibernation is now supported with the latest hibernation/wake
sequences in the shared ASoC code.
This has a functional dependency on two commits:
commit 3df761bdbc8b ("ASoC: cs35l56: Wake transactions need to be issued
twice")
commit a47cf4dac7dc ("ASoC: cs35l56: Change hibernate sequence to use
allow auto hibernate")
To protect against this, enabling hibernation is conditional on
CS35L56_WAKE_HOLD_TIME_US being defined, which indicates that the new
hibernation sequences are available.
Signed-off-by: Richard Fitzgerald <[email protected]>
---
sound/pci/hda/cs35l56_hda_spi.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sound/pci/hda/cs35l56_hda_spi.c b/sound/pci/hda/cs35l56_hda_spi.c
index 756aec342eab..27d7fbc56b4c 100644
--- a/sound/pci/hda/cs35l56_hda_spi.c
+++ b/sound/pci/hda/cs35l56_hda_spi.c
@@ -21,6 +21,10 @@ static int cs35l56_hda_spi_probe(struct spi_device *spi)
return -ENOMEM;
cs35l56->base.dev = &spi->dev;
+
+#ifdef CS35L56_WAKE_HOLD_TIME_US
+ cs35l56->base.can_hibernate = true;
+#endif
cs35l56->base.regmap = devm_regmap_init_spi(spi, &cs35l56_regmap_spi);
if (IS_ERR(cs35l56->base.regmap)) {
ret = PTR_ERR(cs35l56->base.regmap);
--
2.30.2
On Tue, 21 Nov 2023 16:44:19 +0100,
Richard Fitzgerald wrote:
>
> SPI hibernation is now supported with the latest hibernation/wake
> sequences in the shared ASoC code.
>
> This has a functional dependency on two commits:
>
> commit 3df761bdbc8b ("ASoC: cs35l56: Wake transactions need to be issued
> twice")
>
> commit a47cf4dac7dc ("ASoC: cs35l56: Change hibernate sequence to use
> allow auto hibernate")
>
> To protect against this, enabling hibernation is conditional on
> CS35L56_WAKE_HOLD_TIME_US being defined, which indicates that the new
> hibernation sequences are available.
>
> Signed-off-by: Richard Fitzgerald <[email protected]>
Is this expected to be merged for 6.7? Or it can be post 6.7?
I guess the former, but just to make sure.
thanks,
Takashi
On 21/11/23 20:36, Takashi Iwai wrote:
> On Tue, 21 Nov 2023 16:44:19 +0100,
> Richard Fitzgerald wrote:
>>
>> SPI hibernation is now supported with the latest hibernation/wake
>> sequences in the shared ASoC code.
>>
>> This has a functional dependency on two commits:
>>
>> commit 3df761bdbc8b ("ASoC: cs35l56: Wake transactions need to be issued
>> twice")
>>
>> commit a47cf4dac7dc ("ASoC: cs35l56: Change hibernate sequence to use
>> allow auto hibernate")
>>
>> To protect against this, enabling hibernation is conditional on
>> CS35L56_WAKE_HOLD_TIME_US being defined, which indicates that the new
>> hibernation sequences are available.
>>
>> Signed-off-by: Richard Fitzgerald <[email protected]>
>
> Is this expected to be merged for 6.7? Or it can be post 6.7?
> I guess the former, but just to make sure.
>
It would be good to get it into 6.7 because it reduces the power
consumption in runtime-suspend and suspend-to-RAM. But it's not
critical (it's not a bugfix).
>
> thanks,
>
> Takashi
On Wed, 22 Nov 2023 12:04:27 +0100,
Richard Fitzgerald wrote:
>
> On 21/11/23 20:36, Takashi Iwai wrote:
> > On Tue, 21 Nov 2023 16:44:19 +0100,
> > Richard Fitzgerald wrote:
> >>
> >> SPI hibernation is now supported with the latest hibernation/wake
> >> sequences in the shared ASoC code.
> >>
> >> This has a functional dependency on two commits:
> >>
> >> commit 3df761bdbc8b ("ASoC: cs35l56: Wake transactions need to be issued
> >> twice")
> >>
> >> commit a47cf4dac7dc ("ASoC: cs35l56: Change hibernate sequence to use
> >> allow auto hibernate")
> >>
> >> To protect against this, enabling hibernation is conditional on
> >> CS35L56_WAKE_HOLD_TIME_US being defined, which indicates that the new
> >> hibernation sequences are available.
> >>
> >> Signed-off-by: Richard Fitzgerald <[email protected]>
> >
> > Is this expected to be merged for 6.7? Or it can be post 6.7?
> > I guess the former, but just to make sure.
> >
>
> It would be good to get it into 6.7 because it reduces the power
> consumption in runtime-suspend and suspend-to-RAM. But it's not
> critical (it's not a bugfix).
OK, now applied to for-linus branch (for 6.7).
thanks,
Takashi