mfd: wm8994: Remove check for active audio in runtime suspend
Subsystems (2)
PATCH 1/1 mfd: wm8994: Remove check for active audio in runtime suspend
From: Mark Brown <[email protected]>
Since enabling VMID takes a runtime PM reference there is no need to suppress suspend when doing a runtime suspend. Similarly the digital inputs and outputs are DAPM widgets and therefore the ASoC core will be holding a reference for them.
This used to be required when integration with system suspend was being bodged.
Signed-off-by Mark Brown <[email protected]>
--- drivers/mfd/wm8994-core.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-)
drivers/mfd/wm8994-core.c +1 -29
@@ -201,35 +201,7 @@ static int wm8994_suspend(struct device *dev)int ret;/* Don't actually go through with the suspend if the CODEC is -* still active (eg, for audio passthrough from CP. */ - ret =wm8994_reg_read (wm8994,WM8994_POWER_MANAGEMENT_1 ); -if (ret <0 ) { -dev_err (dev,"Failed to read power status: %d\n" , ret); - }else if (ret &WM8994_VMID_SEL_MASK ) { -dev_dbg (dev,"CODEC still active, ignoring suspend\n" ); -return 0 ; - } - - ret =wm8994_reg_read (wm8994,WM8994_POWER_MANAGEMENT_4 ); -if (ret <0 ) { -dev_err (dev,"Failed to read power status: %d\n" , ret); - }else if (ret & (WM8994_AIF2ADCL_ENA |WM8994_AIF2ADCR_ENA | -WM8994_AIF1ADC2L_ENA |WM8994_AIF1ADC2R_ENA | -WM8994_AIF1ADC1L_ENA |WM8994_AIF1ADC1R_ENA )) { -dev_dbg (dev,"CODEC still active, ignoring suspend\n" ); -return 0 ; - } - - ret =wm8994_reg_read (wm8994,WM8994_POWER_MANAGEMENT_5 ); -if (ret <0 ) { -dev_err (dev,"Failed to read power status: %d\n" , ret); - }else if (ret & (WM8994_AIF2DACL_ENA |WM8994_AIF2DACR_ENA | -WM8994_AIF1DAC2L_ENA |WM8994_AIF1DAC2R_ENA | -WM8994_AIF1DAC1L_ENA |WM8994_AIF1DAC1R_ENA )) { -dev_dbg (dev,"CODEC still active, ignoring suspend\n" ); -return 0 ; - } - +* still active for accessory detect. */ switch (wm8994->type) {case WM8958 :case WM1811 :
Signature · 1 line
1.8.3.1