Merge "asoc: wcd937x: use swr device wakeup api" (63ecaa28) · Commits · e / devices / android_kernel_oneplus_sm8150

asoc/codecs/wcd937x/internal.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@ struct wcd937x_priv {
		struct codec_port_info
		rx_port_mapping[MAX_PORT][MAX_CH_PER_PORT];
		struct regulator_bulk_data *supplies;

		struct notifier_block nblock;
		/* wcd callback to bolero */
		void *handle;
		@@ -86,7 +85,7 @@ struct wcd937x_priv {
		int (register_notifier)(void handle,
		struct notifier_block *nblock,
		bool enable);

		int (wakeup)(void handle, bool enable);
		u32 version;
		/* Entry for version info */
		struct snd_info_entry *entry;

+4 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,10 @@ static void wcd937x_mbhc_program_btn_thr(struct snd_soc_codec *codec,

		static bool wcd937x_mbhc_lock_sleep(struct wcd_mbhc *mbhc, bool lock)
		{
		struct snd_soc_codec *codec = mbhc->codec;
		struct wcd937x_priv *wcd937x = dev_get_drvdata(codec->dev);

		wcd937x->wakeup((void*)wcd937x, lock);
		return true;
		}

+20 −0

Original line number	Diff line number	Diff line
		@@ -2351,6 +2351,25 @@ struct wcd937x_pdata wcd937x_populate_dt_data(struct device dev)
		return pdata;
		}

		static int wcd937x_wakeup(void *handle, bool enable)
		{
		struct wcd937x_priv *priv;

		if (!handle) {
		pr_err("%s: NULL handle\n", __func__);
		return -EINVAL;
		}
		priv = (struct wcd937x_priv *)handle;
		if (!priv->tx_swr_dev) {
		pr_err("%s: tx swr dev is NULL\n", __func__);
		return -EINVAL;
		}
		if (enable)
		return swr_device_wakeup_vote(priv->tx_swr_dev);
		else
		return swr_device_wakeup_unvote(priv->tx_swr_dev);
		}

		static int wcd937x_bind(struct device *dev)
		{
		int ret = 0, i = 0;
		@@ -2420,6 +2439,7 @@ static int wcd937x_bind(struct device *dev)
		* as per HW requirement.
		*/
		usleep_range(5000, 5010);
		wcd937x->wakeup = wcd937x_wakeup;

		ret = component_bind_all(dev, wcd937x);
		if (ret) {