Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6adb26bd authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Reorder power down sequence for WM hubs devices 



Disable the output stage prior to the delay stage rather than the
other way around. Fixes merge issue with previous headphone output
path corrections.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 3254d285

sound/soc/codecs/wm_hubs.c

+4 −4
Original line number Diff line number Diff line
@@ -401,14 +401,14 @@ static int hp_event(struct snd_soc_dapm_widget *w, 


	case SND_SOC_DAPM_PRE_PMD:

		snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0,

				    WM8993_HPOUT1L_DLY |

				    WM8993_HPOUT1R_DLY |

				    WM8993_HPOUT1L_OUTP |

				    WM8993_HPOUT1R_OUTP |

				    WM8993_HPOUT1L_RMV_SHORT |

				    WM8993_HPOUT1R_RMV_SHORT, 0);



		snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0,

				    WM8993_HPOUT1L_OUTP |

				    WM8993_HPOUT1R_OUTP, 0);

				    WM8993_HPOUT1L_DLY |

				    WM8993_HPOUT1R_DLY, 0);



		snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1,

				    WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA,