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

Commit 5099351d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: codecs: Add system sleep ops for macro drivers"

parents 12e1dc93 4460ed2e

asoc/codecs/bolero/bolero-cdc.c

+2 −0
Original line number Diff line number Diff line
@@ -1368,6 +1368,7 @@ static int bolero_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

int bolero_runtime_resume(struct device *dev)

{

	struct bolero_priv *priv = dev_get_drvdata(dev->parent);
@@ -1451,6 +1452,7 @@ int bolero_runtime_suspend(struct device *dev) 
	return 0;

}

EXPORT_SYMBOL(bolero_runtime_suspend);

#endif /* CONFIG_PM */



bool bolero_check_core_votes(struct device *dev)

{

asoc/codecs/bolero/rx-macro.c

+4 −0
Original line number Diff line number Diff line
@@ -4135,6 +4135,10 @@ static const struct of_device_id rx_macro_dt_match[] = { 
};



static const struct dev_pm_ops bolero_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(

		pm_runtime_force_suspend,

		pm_runtime_force_resume

	)

	SET_RUNTIME_PM_OPS(

		bolero_runtime_suspend,

		bolero_runtime_resume,

asoc/codecs/bolero/tx-macro.c

+8 −3
Original line number Diff line number Diff line
@@ -980,11 +980,12 @@ static int tx_macro_enable_dec(struct snd_soc_dapm_widget *w, 
		if (tx_unmute_delay < unmute_delay)

			tx_unmute_delay = unmute_delay;

		/* schedule work queue to Remove Mute */

		schedule_delayed_work(&tx_priv->tx_mute_dwork[decimator].dwork,

		queue_delayed_work(system_freezable_wq,

				   &tx_priv->tx_mute_dwork[decimator].dwork,

				   msecs_to_jiffies(tx_unmute_delay));

		if (tx_priv->tx_hpf_work[decimator].hpf_cut_off_freq !=

							CF_MIN_3DB_150HZ) {

			schedule_delayed_work(

			queue_delayed_work(system_freezable_wq,

				&tx_priv->tx_hpf_work[decimator].dwork,

				msecs_to_jiffies(hpf_delay));

			snd_soc_component_update_bits(component,
@@ -3297,6 +3298,10 @@ static const struct of_device_id tx_macro_dt_match[] = { 
};



static const struct dev_pm_ops bolero_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(

		pm_runtime_force_suspend,

		pm_runtime_force_resume

	)

	SET_RUNTIME_PM_OPS(

		bolero_runtime_suspend,

		bolero_runtime_resume,

asoc/codecs/bolero/va-macro.c

+8 −3
Original line number Diff line number Diff line
@@ -1186,11 +1186,12 @@ static int va_macro_enable_dec(struct snd_soc_dapm_widget *w, 
		 */

		usleep_range(6000, 6010);

		/* schedule work queue to Remove Mute */

		schedule_delayed_work(&va_priv->va_mute_dwork[decimator].dwork,

		queue_delayed_work(system_freezable_wq,

				   &va_priv->va_mute_dwork[decimator].dwork,

				   msecs_to_jiffies(va_tx_unmute_delay));

		if (va_priv->va_hpf_work[decimator].hpf_cut_off_freq !=

							CF_MIN_3DB_150HZ)

			schedule_delayed_work(

			queue_delayed_work(system_freezable_wq,

					&va_priv->va_hpf_work[decimator].dwork,

					msecs_to_jiffies(hpf_delay));

		/* apply gain after decimator is enabled */
@@ -3211,6 +3212,10 @@ static const struct of_device_id va_macro_dt_match[] = { 
};



static const struct dev_pm_ops bolero_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(

		pm_runtime_force_suspend,

		pm_runtime_force_resume

	)

	SET_RUNTIME_PM_OPS(

		bolero_runtime_suspend,

		bolero_runtime_resume,

asoc/codecs/bolero/wsa-macro.c

+4 −0
Original line number Diff line number Diff line
@@ -3244,6 +3244,10 @@ static const struct of_device_id wsa_macro_dt_match[] = { 
};



static const struct dev_pm_ops bolero_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(

		pm_runtime_force_suspend,

		pm_runtime_force_resume

	)

	SET_RUNTIME_PM_OPS(

		bolero_runtime_suspend,

		bolero_runtime_resume,