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

Commit 17de17b7 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d14744d9 on remote branch 

Change-Id: I072332325be5fafaf4e8b6a98d7545f1c41ccfc0
parents bd7bfe46 d14744d9

asoc/bengal.c

+2 −2
Original line number Diff line number Diff line
@@ -6370,7 +6370,7 @@ static int msm_init_aux_dev(struct platform_device *pdev, 
			ret = -EINVAL;

			goto err;

		}

		if (soc_find_component(wsa_of_node, NULL)) {

		if (soc_find_component_locked(wsa_of_node, NULL)) {

			/* WSA device registered with ALSA core */

			wsa881x_dev_info[found].of_node = wsa_of_node;

			wsa881x_dev_info[found].index = i;
@@ -6467,7 +6467,7 @@ static int msm_init_aux_dev(struct platform_device *pdev, 
			ret = -EINVAL;

			goto err;

		}

		if (soc_find_component(aux_codec_of_node, NULL)) {

		if (soc_find_component_locked(aux_codec_of_node, NULL)) {

			/* AUX codec registered with ALSA core */

			aux_cdc_dev_info[codecs_found].of_node =

						aux_codec_of_node;

asoc/codecs/bolero/bolero-cdc.c

+2 −3
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ EXPORT_SYMBOL(bolero_tx_mclk_enable); 
 * Returns 0 on success or -EINVAL on error.

 */

int bolero_register_event_listener(struct snd_soc_component *component,

				   bool enable, bool is_dmic_sva)

				   bool enable)

{

	struct bolero_priv *priv = NULL;

	int ret = 0;
@@ -1109,8 +1109,7 @@ int bolero_register_event_listener(struct snd_soc_component *component, 


	if (priv->macro_params[TX_MACRO].reg_evt_listener)

		ret = priv->macro_params[TX_MACRO].reg_evt_listener(component,

								    enable,

								    is_dmic_sva);

								    enable);



	return ret;

}

asoc/codecs/bolero/bolero-cdc.h

+3 −4
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ struct macro_ops { 
			    u32 size, void *data);

	int (*clk_div_get)(struct snd_soc_component *component);

	int (*clk_switch)(struct snd_soc_component *component, int clk_src);

	int (*reg_evt_listener)(struct snd_soc_component *component,

			bool en, bool is_dmic_sva);

	int (*reg_evt_listener)(struct snd_soc_component *component, bool en);

	int (*clk_enable)(struct snd_soc_component *c, bool en);

	char __iomem *io_base;

	u16 clk_id_req;
@@ -117,7 +116,7 @@ int bolero_runtime_suspend(struct device *dev); 
int bolero_set_port_map(struct snd_soc_component *component, u32 size, void *data);

int bolero_tx_clk_switch(struct snd_soc_component *component, int clk_src);

int bolero_register_event_listener(struct snd_soc_component *component,

				   bool enable, bool is_dmic_sva);

				   bool enable);

void bolero_wsa_pa_on(struct device *dev, bool adie_lb);

bool bolero_check_core_votes(struct device *dev);

int bolero_tx_mclk_enable(struct snd_soc_component *c, bool enable);
@@ -191,7 +190,7 @@ static inline int bolero_tx_clk_switch(struct snd_soc_component *component, 


static inline int bolero_register_event_listener(

					struct snd_soc_component *component,

					bool enable, bool is_dmic_sva)

					bool enable)

{

	return 0;

}

asoc/codecs/bolero/rx-macro.c

+0 −2
Original line number Diff line number Diff line
@@ -378,7 +378,6 @@ struct rx_swr_ctrl_platform_data { 
							  void *data),

			  void *swrm_handle,

			  int action);

	int (*pinctrl_setup)(void *handle, bool enable);

};



enum {
@@ -4071,7 +4070,6 @@ static int rx_macro_probe(struct platform_device *pdev) 
	rx_priv->swr_plat_data.clk = rx_swrm_clock;

	rx_priv->swr_plat_data.core_vote = rx_macro_core_vote;

	rx_priv->swr_plat_data.handle_irq = NULL;

	rx_priv->swr_plat_data.pinctrl_setup = NULL;



	ret = of_property_read_u8_array(pdev->dev.of_node,

				"qcom,rx-bcl-pmic-params", bcl_pmic_params,

asoc/codecs/bolero/tx-macro.c

+5 −27
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ struct tx_macro_swr_ctrl_platform_data { 
							  void *data),

			  void *swrm_handle,

			  int action);

	int (*pinctrl_setup)(void *handle, bool enable);

};



enum {
@@ -2388,30 +2387,12 @@ static const struct snd_kcontrol_new tx_macro_snd_controls[] = { 
		       tx_macro_get_bcs, tx_macro_set_bcs),

};



static int tx_macro_pinctrl_setup(void *handle, bool enable)

{

	struct tx_macro_priv *tx_priv = (struct tx_macro_priv *) handle;



	if (tx_priv == NULL) {

		pr_err("%s: tx priv data is NULL\n", __func__);

		return -EINVAL;

	}

	if (enable)

		msm_cdc_pinctrl_set_wakeup_capable(

			tx_priv->tx_swr_gpio_p, true);

	else

		msm_cdc_pinctrl_set_wakeup_capable(

			tx_priv->tx_swr_gpio_p, false);

	return 0;

}



static int tx_macro_register_event_listener(struct snd_soc_component *component,

					    bool enable, bool is_dmic_sva)

					    bool enable)

{

	struct device *tx_dev = NULL;

	struct tx_macro_priv *tx_priv = NULL;

	int ret = 0;

	u32 dmic_sva = is_dmic_sva;



	if (!component)

		return -EINVAL;
@@ -2433,17 +2414,15 @@ static int tx_macro_register_event_listener(struct snd_soc_component *component, 
		if (enable) {

			ret = swrm_wcd_notify(

				tx_priv->swr_ctrl_data[0].tx_swr_pdev,

				SWR_REGISTER_WAKEUP, &dmic_sva);

				SWR_REGISTER_WAKEUP, NULL);

			msm_cdc_pinctrl_set_wakeup_capable(

					tx_priv->tx_swr_gpio_p, false);

		} else {

			/* while teardown we can reset the flag */

			dmic_sva = 0;

			msm_cdc_pinctrl_set_wakeup_capable(

					tx_priv->tx_swr_gpio_p, true);

			ret = swrm_wcd_notify(

				tx_priv->swr_ctrl_data[0].tx_swr_pdev,

				SWR_DEREGISTER_WAKEUP, &dmic_sva);

				SWR_DEREGISTER_WAKEUP, NULL);

		}

	}
@@ -3252,7 +3231,6 @@ static int tx_macro_probe(struct platform_device *pdev) 
		tx_priv->swr_plat_data.clk = tx_macro_swrm_clock;

		tx_priv->swr_plat_data.core_vote = tx_macro_core_vote;

		tx_priv->swr_plat_data.handle_irq = NULL;

		tx_priv->swr_plat_data.pinctrl_setup = tx_macro_pinctrl_setup;

		mutex_init(&tx_priv->swr_clk_lock);

	}

	tx_priv->is_used_tx_swr_gpio = is_used_tx_swr_gpio;